From 266e10026ded7ea7aebcfba75ab3690d01ff7814 Mon Sep 17 00:00:00 2001 From: Boris Melnik Date: Fri, 17 Jun 2022 12:29:14 +0300 Subject: [PATCH] fix(settings): Fix visibility community settings view Closes: #6100 --- ui/app/AppLayouts/Profile/panels/MenuPanel.qml | 9 +++------ ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml | 2 -- ui/app/AppLayouts/Profile/views/LeftTabView.qml | 2 -- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ui/app/AppLayouts/Profile/panels/MenuPanel.qml b/ui/app/AppLayouts/Profile/panels/MenuPanel.qml index d75b0d628a..2a6b8ff959 100644 --- a/ui/app/AppLayouts/Profile/panels/MenuPanel.qml +++ b/ui/app/AppLayouts/Profile/panels/MenuPanel.qml @@ -19,8 +19,6 @@ Column { property bool browserMenuItemEnabled: false property bool walletMenuItemEnabled: false - property bool appsMenuItemsEnabled: false - property bool communitiesMenuItemEnabled: false signal menuItemClicked(var menu_item) @@ -65,10 +63,9 @@ Column { selected: Global.settingsSubsection === model.subsection onClicked: root.menuItemClicked(model) visible: { - (model.subsection !== Constants.settingsSubsection.browserSettings && model.subsection !== Constants.settingsSubsection.wallet && model.subsection !== Constants.settingsSubsection.communitiesSettings) || - (model.subsection === Constants.settingsSubsection.browserSettings && root.browserMenuItemEnabled) || - (model.subsection === Constants.settingsSubsection.communitiesSettings && root.communitiesMenuItemEnabled) || - (model.subsection === Constants.settingsSubsection.wallet && root.appsMenuItemsEnabled) + (model.subsection !== Constants.settingsSubsection.browserSettings && model.subsection !== Constants.settingsSubsection.wallet) || + (model.subsection === Constants.settingsSubsection.browserSettings && root.browserMenuItemEnabled) || + (model.subsection === Constants.settingsSubsection.wallet && root.walletMenuItemEnabled) } badge.value: { switch (model.subsection) { diff --git a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml index f77af1562b..82b68e8096 100644 --- a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml +++ b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml @@ -62,8 +62,6 @@ QtObject { property bool browserMenuItemEnabled: localAccountSensitiveSettings.isBrowserEnabled property bool walletMenuItemEnabled: localAccountSensitiveSettings.isWalletEnabled - property bool appsMenuItemsEnabled: localAccountSensitiveSettings.isWalletEnabled || localAccountSensitiveSettings.communitiesEnabled - property bool communitiesMenuItemEnabled: localAccountSensitiveSettings.communitiesEnabled property var communitiesModuleInst: communitiesModule property var communitiesList: communitiesModuleInst.model diff --git a/ui/app/AppLayouts/Profile/views/LeftTabView.qml b/ui/app/AppLayouts/Profile/views/LeftTabView.qml index e15ca9603a..7df415ae15 100644 --- a/ui/app/AppLayouts/Profile/views/LeftTabView.qml +++ b/ui/app/AppLayouts/Profile/views/LeftTabView.qml @@ -42,8 +42,6 @@ Item { appsMenuItems: store.appsMenuItems browserMenuItemEnabled: store.browserMenuItemEnabled walletMenuItemEnabled: store.walletMenuItemEnabled - appsMenuItemsEnabled: store.appsMenuItemsEnabled - communitiesMenuItemEnabled: store.communitiesMenuItemEnabled onMenuItemClicked: { if (menu_item.subsection === Constants.settingsSubsection.backUpSeed) {