diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml index 1b249e5235..6fcd0d3ea9 100644 --- a/ui/app/AppMain.qml +++ b/ui/app/AppMain.qml @@ -316,16 +316,6 @@ Item { onClicked: appMain.changeAppSection(Constants.browser) }, - StatusNavBarTabButton { - enabled: isExperimental === "1" || localAccountSensitiveSettings.timelineEnabled - visible: enabled - //% "Timeline" - tooltip.text: qsTrId("timeline") - icon.name: "status-update" - checked: appView.currentIndex == Utils.getAppSectionIndex(Constants.timeline) - onClicked: appMain.changeAppSection(Constants.timeline) - }, - StatusNavBarTabButton { enabled: isExperimental === "1" || localAccountSensitiveSettings.nodeManagementEnabled visible: enabled @@ -412,7 +402,7 @@ Item { if(obj === walletV2LayoutContainer){ walletV2LayoutContainer.showSigningPhrasePopup(); } - localAccountSensitiveSettings.lastModeActiveTab = (currentIndex === Utils.getAppSectionIndex(Constants.timeline)) ? 0 : currentIndex + localAccountSensitiveSettings.lastModeActiveTab = currentIndex } ChatLayout { diff --git a/ui/imports/utils/Utils.qml b/ui/imports/utils/Utils.qml index bdf4fa99b8..f15cfb3513 100644 --- a/ui/imports/utils/Utils.qml +++ b/ui/imports/utils/Utils.qml @@ -131,15 +131,15 @@ QtObject { case Constants.chat: sectionId = 0; break; case Constants.wallet: sectionId = 1; break; case Constants.browser: sectionId = 2; break; - case Constants.timeline: sectionId = 3; break; - case Constants.profile: sectionId = 4; break; - case Constants.node: sectionId = 5; break; - case Constants.ui: sectionId = 6; break; - case Constants.walletv2: sectionId = 7; break; + case Constants.profile: sectionId = 3; break; + case Constants.node: sectionId = 4; break; + case Constants.ui: sectionId = 5; break; + case Constants.walletv2: sectionId = 6; break; case Constants.community: sectionId = 99; break; } if (sectionId === -1) { - throw new Exception ("Unknown section name. Check the Constants to know the available ones") + console.warn("Unknown section name. Defaulting to chat section") + return 0 } return sectionId } diff --git a/ui/main.qml b/ui/main.qml index 7601568e65..2993457338 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -421,7 +421,6 @@ StatusWindow { signal droppedOnValidScreen(var drop) property alias droppedUrls: rptDraggedPreviews.model readonly property int chatView: Utils.getAppSectionIndex(Constants.chat) - readonly property int timelineView: Utils.getAppSectionIndex(Constants.timeline) property bool enabled: !drag.source && !!loader.item && !!loader.item.appLayout && ( // in chat view @@ -433,8 +432,6 @@ StatusWindow { chatsModel.channelView.activeChannel.chatType === Constants.chatTypePrivateGroupChat ) ) || - // in timeline view - loader.item.appLayout.appView.currentIndex === timelineView || // In community section loader.item.appLayout.appView.currentIndex === chatsModel.communities.activeCommunity.active )