localAccountSensitiveSettings usages removed from ChatView

Now the usage of that ctx property is centralized in a single place in AppMain

Author: micieslak

ui/app/AppLayouts/Chat/ChatLayout.qml

@@ -67,6 +67,7 @@ StackLayout {
     readonly property int isInvitationPending: root.rootStore.chatCommunitySectionModule.requestToJoinState !== Constants.RequestToJoinState.None
 
     property bool communitySettingsDisabled
+    property bool showUsersList
 
     property bool sendViaPersonalChatEnabled
     property string disabledTooltipText
@@ -106,9 +107,11 @@ StackLayout {
     signal removeTrustStatusRequest(string pubKey)
     signal dismissContactRequest(string chatId, string contactRequestId)
     signal acceptContactRequest(string chatId, string contactRequestId)
-
     onIsPrivilegedUserChanged: if (root.currentIndex === 1) root.currentIndex = 0
 
+    // Navigation
+    signal showUsersListRequested(bool show)
+
     onCurrentIndexChanged: {
         Global.closeCreateChatView()
     }
@@ -217,6 +220,7 @@ StackLayout {
             sendViaPersonalChatEnabled: root.sendViaPersonalChatEnabled
             disabledTooltipText: root.disabledTooltipText
             paymentRequestFeatureEnabled: root.paymentRequestFeatureEnabled
+            showUsersList: root.showUsersList
 
             hasUnrestrictedViewOnlyPermission: {
                 viewOnlyUnrestrictedPermissionHelper.revision
@@ -342,6 +346,8 @@ StackLayout {
             onSpectateCommunityRequested: (communityId) => {
                 root.communityAccessStore.spectateCommunity(communityId)
             }
+
+            onShowUsersListRequested: show => root.showUsersListRequested(show)
         }
     }
 

ui/app/AppLayouts/Chat/views/ChatView.qml

@@ -68,6 +68,7 @@ StatusSectionLayout {
     property bool amIMember: false
     property bool amISectionAdmin: false
     property bool allChannelsAreHiddenBecauseNotPermitted: false
+    property bool showUsersList: false
 
     property int requestToJoinState: Constants.RequestToJoinState.None
 
@@ -163,6 +164,9 @@ StatusSectionLayout {
     // Community access related requests:
     signal spectateCommunityRequested(string communityId)
 
+    // Navigation
+    signal showUsersListRequested(bool show)
+
     Connections {
         target: root.rootStore.stickersStore.stickersModule
 
@@ -200,18 +204,10 @@ StatusSectionLayout {
     }
 
     showRightPanel: {
-        if (root.contentLocked) {
+        if (root.contentLocked || root.rootStore.openCreateChat ||
+                !root.showUsersList || !root.chatContentModule)
             return false
-        }
-
-        if (root.rootStore.openCreateChat ||
-                !localAccountSensitiveSettings.expandUsersList) {
-            return false
-        }
 
-        if (!root.chatContentModule) {
-            return false
-        }
         // Check if user list is available as an option for particular chat content module
         return root.chatContentModule.chatDetails.isUsersListAvailable
     }
@@ -264,7 +260,7 @@ StatusSectionLayout {
 
             usersModel: root.usersModel
             amIChatAdmin: root.amIChatAdmin
-            showMembersButtonHighlighted: localAccountSensitiveSettings.expandUsersList
+            showMembersButtonHighlighted: root.showUsersList
 
             onSearchButtonClicked: root.openAppSearch()
             onDisplayEditChannelPopup: {
@@ -283,11 +279,7 @@ StatusSectionLayout {
             }
 
             onGroupMembersUpdateRequested: root.groupMembersUpdateRequested(membersPubKeysList)
-
-            onToggleShowMembersRequested: {
-                localAccountSensitiveSettings.expandUsersList =
-                        !localAccountSensitiveSettings.expandUsersList;
-            }
+            onToggleShowMembersRequested: root.showUsersListRequested(!root.showUsersList)
         }
     }
 
@@ -428,17 +420,6 @@ StatusSectionLayout {
         }
     }
 
-    Connections {
-        target: localAccountSensitiveSettings
-
-        function onExpandUsersListChanged() {
-            Qt.callLater(() => {
-                if (localAccountSensitiveSettings.expandUsersList)
-                    goToNextPanel()
-            })
-        }
-    }
-
     onSwiped: (previous, current) => {
         if (previous !== StatusSectionLayout.RightPanel)
             return
@@ -447,8 +428,14 @@ StatusSectionLayout {
         // is needed because SwipeView doesn't expose any API to detect completed
         // swipe action
         Backpressure.setTimeout(this, 300, () => {
-            localAccountSensitiveSettings.expandUsersList
-                = !localAccountSensitiveSettings.expandUsersList
+            root.showUsersList = false
+        })
+    }
+
+    onShowUsersListChanged: {
+        Qt.callLater(() => {
+            if (root.showUsersList)
+                goToNextPanel()
         })
     }
 

ui/app/mainui/AppMain.qml

@@ -822,9 +822,12 @@ Item {
         id: d
 
         readonly property int activeSectionType: appMain.rootStore.activeSectionType
-
         readonly property bool isBrowserEnabled: featureFlagsStore.browserEnabled && localAccountSensitiveSettings.isBrowserEnabled
 
+        property bool showUsersList: localAccountSensitiveSettings.expandUsersList
+
+        onShowUsersListChanged: localAccountSensitiveSettings.expandUsersList = showUsersList
+
         function openHomePage() {
             appMain.rootStore.setActiveSectionBySectionType(Constants.appSection.homePage)
             homePageLoader.item.focusSearch()
@@ -1895,6 +1898,9 @@ Item {
                         ChatLayout {
                             id: chatLayoutContainer
 
+                            showUsersList: d.showUsersList
+                            onShowUsersListRequested: show => d.showUsersList = show
+
                             isChatView: true
                             navBar: appMain.navBar
                             rootStore: ChatStores.RootStore {
@@ -2285,6 +2291,9 @@ Item {
                                 }
                             }
 
+                            showUsersList: d.showUsersList
+                            onShowUsersListRequested: show => d.showUsersList = show
+
                             isChatView: false // This will be a community view
                             navBar: appMain.navBar
                             emojiPopup: statusEmojiPopup.item