refactor: `ProfileSectionsStore` refactor and modularization pass and remove `ContactsStore` from `MessageView` hierarchy #18314

noeliaSD · 2025-07-06T07:56:35Z

What does the PR do

This pull request includes a collection of 15 targeted commits focused on refactoring and modularizing the profile-related stores and their integration across the app. The changes are interrelated but intentionally broken down into small, logical units for clarity and easier review.

🔍 Recommendation: Review commit-by-commit

Each commit has been written to be self-contained, with clear messages and rationales. Reviewing sequentially will help understand the full context and progression.

Summary of Changes

Naming Consistency & Cleanup

ProfileStore: Rename pubkey → pubKey for consistency.
ProfileStore: Remove redundant privacyStore already provided via ProfileSectionStore.

Decoupling & Scope Isolation

ProfileSectionStore: Eliminate indirection by replacing access to child stores with direct references.
ProfileLayout: Move isWalletEnabled to WalletStore.
WalletView: Remove dependency on ProfileSectionStore in WalletView and children.
RootStore: Move production context flag out of UI and into RootStore scope.
AboutStore: Extract AboutStore from ProfileSectionStore; simplify and isolate AboutView logic.
ProfileLayout: Remove ProfileSectionStore dependency entirely; migrate remaining logic to ProfileStore.

Structural Preparation for Modularization

RootStore: Add clarifying comments and reorganize structure by domain (Wallet, Chat, Onboarding, etc.).
RootStore: Encapsulate mainModuleInst as private (internal) to reduce external coupling.

Store Responsibility Reassignments

Move contact showcase logic from ProfileSectionsStore to ContactsStore and community logic to CommunitiesStore.
Rename MessagingStore to MessagingSettingsStore, move to global scope, and improve property encapsulation.
Promote ContactsStore to top-level store and unify references throughout the app.
Move ContactsStore dependency to AppMain; remove from MessageView hierarchy for better modularity.

Rationale

Many of these changes were discovered progressively—cleaning up one piece revealed tight couplings or outdated patterns in others. This PR:

Reduces unnecessary indirection and coupling between stores
Makes domain boundaries clearer (e.g., Wallet, About, Messaging, Contacts)
Prepares RootStore for future modular breakdowns

Affected areas

Settings and Chat

Architecture compliance

I am familiar with the application architecture and agreed good practices.
My PR is consistent with this document: QML Architecture Guidelines

Impact on end user

No impact. It improves and prepares code base for next refactor iterations.

How to test

Perform critical Chat related scenarios test.
Perform critical Settings related scenarios test.

Risk

This PR touches multiple interrelated stores and view hierarchies. Although changes are largely refactorings and scoped per commit, there is moderate risk of regressions in the following areas:

Chat flows: due to changes in MessageView and ContactsStore
Settings-related views: due to the restructuring of ProfileSectionStore, migration of the messaging and about stores, and changes in how store data is accessed

…ileStore` Just a property rename for improving consistency.

…m `profileStore` Since `ProfileSectionStore` already includes an instance of `PrivacyStore`, the separate `privacyStore` property inside `profileStore` was redundant. This commit removes the duplicate reference to simplify state structure and avoid potential confusion or desynchronization.

…rection through `ProfileSectionStore` usage Replaced all indirect access to specific stores via `ProfileSectionStore` with direct references to each store. This change improves readability, reduces unnecessary indirection, and clarifies ownership and dependency paths in the codebase.

…Store` Moved and cleaned up `isWalletEnabled` property from `profileSectionStore` to profile `WalletStore` to improve readability and consistency.

…o view Moved view related property to view component. Cleanup related components.

Cleanup `profileSectionStore` dependency on `WalletView` and children components.

…nents to `RootStore` Moved the `production` context property from UI components to the `RootStore` to ensure global accessibility and decouple environment logic from the view layer.

status-im-auto · 2025-07-06T08:04:10Z

Jenkins Builds

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`2689937`	#1	2025-07-06 08:04:09	~7 min	`tests/nim`	📄`log`
✔️	`2689937`	#1	2025-07-06 08:07:55	~10 min	`macos/aarch64`	🍎`dmg`
❌	`2689937`	#1	2025-07-06 08:08:06	~11 min	`tests/ui`	📄`log`
✔️	`2689937`	#1	2025-07-06 08:13:46	~16 min	`linux/x86_64`	📦`tgz`
✔️	`2689937`	#1	2025-07-06 08:20:02	~22 min	`windows/x86_64`	💿`exe`

✔️	`c51283f`	#2	2025-07-06 10:06:03	~6 min	`macos/aarch64`	🍎`dmg`
✔️	`c51283f`	#2	2025-07-06 10:06:07	~6 min	`tests/nim`	📄`log`
✔️	`c51283f`	#2	2025-07-06 10:09:57	~10 min	`tests/ui`	📄`log`
✔️	`c51283f`	#2	2025-07-06 10:12:18	~13 min	`linux/x86_64`	📦`tgz`
✔️	`c51283f`	#2	2025-07-06 10:20:55	~21 min	`windows/x86_64`	💿`exe`

…onStore` - Created a new `AboutStore` and moved all about-related logic into it. - Removed the corresponding about code from `ProfileSectionStore`, simplifying its responsibilities. - Improved `AboutView`'s API to be more explicit and easier to consume. This refactor improves separation of concerns, clarifies ownership of about-related data, and makes the `About` module more self-contained and maintainable.

- Cleanup `profileSectionStore` dependency on `ProfileLayout` and children components (`CommunitiesView`). - Moved `profile store` related code from `ProfileSectionsStore` to `ProfileStore`.

… for future modularization - Added structured section comments to delineate responsibilities across modules (e.g., SettingsRootStore, ChatRootStore, WalletRootStore, etc.). - Annotated context properties and module instances with TODO, WIP, and clarification notes to guide future cleanup. - Reorganized properties and function blocks to group by domain (Profile, Settings, Onboarding, Chat, Communities, Wallet). - Added notes about deprecated or temporary usage of module instances that should eventually become private/internal to each store. - No logic changes introduced; purely preparatory work for upcoming RootStore decomposition. This improves readability, maintains legacy compatibility, and prepares the file for targeted refactoring into more modular root stores.

…Store` - Moved `mainModuleInst` under `internal` (private) inside `RootStore` to reduce external coupling. - Replaced all occurrences of `rootStore.mainModuleInst` with `internal.mainModuleInst` within `RootStore` itself. - Ensured access to all required data (`isOnline`, `sectionsModel`, `activeSection`, etc.) via computed readonly properties. - Updated all signal handlers using `Connections { target: internal.mainModuleInst }` to preserve behavior while hiding direct module access. - Declared new `RootStore` signals to expose relevant updates externally without leaking `mainModuleInst`. This refactoring is part of a broader modularization effort and paves the way for making `mainModuleInst` fully private and internal to `RootStore`.

…actsStore` and community logic to `CommunitiesStore` - Migrated contacts showcase logic from `ProfileSectionsStore` to `ContactsStore`. - Migrated community-related logic from `ProfileSectionsStore` to `CommunitiesStore`. - Updated affected components and references accordingly.

…ngsStore`, move it to global scope, and improve encapsulation - Renamed `MessagingStore` to `MessagingSettingsStore` - Moved it out of `Profile` scope to a global location - Improved internal structure: used `readonly` and private properties where appropriate - Updated all usages across the codebase - `ProfileSectionsStore` no longer contains the messaging store

…unify references - Moved `ContactsStore` out of `ProfileSectionsStore` to a higher-level location, as it's now considered cross-domain. - Removed redundant references to `ContactsStore`. - Unified all code to reference the store consistently from the new location.

…nd remove from `MessageView` hierarchy - Lifted `ContactsStore` dependency to `AppMain` for centralized access. - Removed previous references to `ContactsStore` from `MessageView` and its component hierarchy. - Improved coupling and modularization by reducing deep dependencies.

jrainville

Very nice clean up!
I had a couple of suggestions and questions

ui/app/AppLayouts/stores/RootStore.qml

jrainville · 2025-07-07T16:59:18Z

ui/app/AppLayouts/stores/RootStore.qml

    property string latestVersion
    property string downloadURL

+    function setLatestVersionInfo(newVersionAvailable, latestVersion, downloadURL) {


I don't think this code is used anymore. The new version updater never really worked

Indeed, there is some to-do here:

Connections { target: rootStore.aboutModuleInst function onAppVersionFetched(available: bool, version: string, url: string) { rootStore.setLatestVersionInfo(available, version, url); // TODO when we re-implement check for updates, uncomment this // bannersLayout.processUpdateAvailable() } }

Should I remove this code?

I think so. If we re-add an updater, it will be in a while and will have to be re-thought

jrainville · 2025-07-07T17:07:08Z

ui/app/AppLayouts/Chat/stores/RootStore.qml

@@ -50,6 +69,9 @@ QtObject {

    readonly property var sectionDetails: d.sectionDetailsInstantiator.count ? d.sectionDetailsInstantiator.objectAt(0) : null

+    // TODO: Review if `mainModuleInst.activeSection` is indeed the same as `sectionDetails` here. If yes, this is redundant
+    readonly property bool joined: root.mainModuleInst.activeSection.joined


This Store is created for each Chat I think. So it's weird that joined here would be using the ActiveSection and not the section it is from.

So this should probably be chatCommunitySectionModule.joined

That's right! I'll check it again. I just moved this rootStore.mainModuleInst.activeSection.joined to Chat.RootStore and added a to-do to check it again, since it seemed strange to me too.

As you say I think it should be chatCommunitySectionModule.joined but I need to check all MessageView usages since maybe there are some corner cases to consider, like maybe CommunityMemberMessagesPopup.

jrainville · 2025-07-07T17:21:13Z

ui/app/AppLayouts/Communities/stores/CommunitiesStore.qml

@@ -230,6 +237,14 @@ QtObject {
        return communitiesModuleInst.isDisplayNameDupeOfCommunityMember(displayName)
    }

+    function leaveCommunity(communityId) {
+        d.profileSectionModuleInst.communitiesModule.leaveCommunity(communityId)


Going through the profile module to call a community function sounds wrong.

We can move the leaveCommunity from the profile module to the community module in nim and use communitiesModuleInst instead

I agree. On this first step, I just moved things around to have a better clarity. Next steps will be, reviewing again, the specific stores, and clean them up properly! I'll take this comment into account! Thanks

jrainville · 2025-07-07T17:21:19Z

ui/app/AppLayouts/Communities/stores/CommunitiesStore.qml

+    }
+
+    function setCommunityMuted(communityId, mutedType) {
+        d.profileSectionModuleInst.communitiesModule.setCommunityMuted(communityId, mutedType)


Actually, if we wanted a very thorough cleanup, we could remove those two function from the chat section as well and rely on the communities module instead. We just have to pass the communityId

I agree. I'm planning to do something similar in the qml level, since now Chat.RootStore contains chat + community specific stuff. I'll work on it on following prs. I'll also add this nim code idea.

Cool, feel free to open an issue with my comment(s)

caybro · 2025-07-08T08:19:14Z

ui/app/AppLayouts/stores/RootStore.qml

+
+    // Here define the needed properties that access to `Context Properties`:
+    readonly property QtObject _internal: QtObject{
+        id: internal // Rename to `d` when cleanup done


Rename to d? :)

I'll do it in some of the following prs, since here I just separated the code to easily see what is from where and don't want to mix the properties that are now in the existing d, since it will be moved to another context. This is just an intermediate state! Hope it makes sense 🫣

Yeah but since it's still the same store, it makes sense to finish the cleanup here?

as it affects only that file, it should be easy to replace internal. with d. indeed.

I can mix them yes, but at this point I will not remove the code that is currently on d and should not be on this store. This store cleanup doesn't ends on this pr and what I did is just separation of code as a simple step to continue with the cleanup on another pr. If I mix it with the rest of d props, we will need to do again the exercise of understanding what should be here and what should be moved to another store.

ui/app/AppLayouts/stores/RootStore.qml

caybro · 2025-07-08T08:38:11Z

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

@@ -21,7 +21,7 @@ import "../panels"
 import "../popups"
 import AppLayouts.Chat.stores 1.0
 import AppLayouts.Communities.popups 1.0
-import AppLayouts.Profile.stores 1.0
+import AppLayouts.stores 1.0 as AppLayoutStores


Is this import even needed then? There's no other change in this file that would reference it

caybro · 2025-07-08T08:39:00Z

ui/app/AppLayouts/Chat/ChatLayout.qml

@@ -17,6 +17,7 @@ import AppLayouts.Communities.stores 1.0 as CommunitiesStores
 import AppLayouts.Chat.stores 1.0 as ChatStores
 import AppLayouts.Profile.stores 1.0 as ProfileStores
 import AppLayouts.Wallet.stores 1.0 as WalletStore
+import AppLayouts.stores 1.0 as AppLayoutStores


You changed this import but never reference it in this diff?

caybro · 2025-07-08T08:39:17Z

storybook/stubs/AppLayouts/Profile/stores/AboutStore.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.14


Suggested change

import QtQuick 2.14

import QtCore

caybro · 2025-07-08T08:39:42Z

storybook/stubs/AppLayouts/Profile/stores/AboutStore.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.14
+
+Item {


Suggested change

Item {

QtObject {

caybro · 2025-07-08T08:39:52Z

storybook/stubs/AppLayouts/Chat/stores/RootStore.qml

@@ -3,4 +3,6 @@ import QtQuick 2.15
 QtObject {
    property var chatCommunitySectionModule
    property var contactsStore
+    property bool isChatSectionModule
+    property var communityId


Suggested change

property var communityId

property string communityId

micieslak

Great job! I deeply believe it's important to do refactors like this to reach stability in long term. Looks good in general, some minor comments mainly.

micieslak · 2025-07-09T11:20:19Z

ui/app/AppLayouts/Profile/ProfileLayout.qml

@@ -42,7 +42,20 @@ StatusSectionLayout {

    property SharedStores.RootStore sharedRootStore
    property SharedStores.UtilsStore utilsStore
-    property ProfileStores.ProfileSectionStore store
+
+    property ProfileStores.ProfileSectionStore store // TO BE REMOVED


shouldn't those properties be marked as required?

micieslak · 2025-07-09T11:45:48Z

ui/app/AppLayouts/Profile/views/WalletView.qml

@@ -36,6 +36,7 @@ SettingsContentBase {
    property alias currencySymbol: manageTokensView.currencySymbol

    property int settingsSubSubsection
+    property string backButtonName: ""


within this property we only write to that property, so setting it from outside makes no sense. Therefore it should be readonly. The writable counterpart we can keep in d object and write to that one. And a top level we can expose readonly alias readonly property alias backButtonName: d.backButtonName.

micieslak · 2025-07-09T11:46:33Z

ui/app/AppLayouts/Profile/ProfileLayout.qml

@@ -328,8 +330,11 @@ StatusSectionLayout {
                currencySymbol: root.sharedRootStore.currencyStore.currentCurrency
                emojiPopup: root.emojiPopup
                sectionTitle: settingsEntriesModel.getNameForSubsection(Constants.settingsSubsection.wallet)
+                backButtonName: d.backButtonName


this assignment probably is not needed there

micieslak · 2025-07-09T12:16:51Z

ui/app/mainui/AppMain.qml

@@ -2139,6 +2139,8 @@ Item {
                            dismissedReceivedRequestContactsModel: contactsModelAdaptor.dimissedReceivedRequestContacts
                            isKeycardEnabled: featureFlagsStore.keycardEnabled

+                            fnAddressWasShown: WalletStores.RootStore.addressWasShown


in that case UI components should just emit addresssShown signal. And then we could have

onAddressShown: (address) => WalletStores.RootStore.addressWasShown(address)

It's cleaner and safer bc in signals we have explicitly specified, typed arguments.

micieslak · 2025-07-09T12:20:09Z

ui/app/AppLayouts/stores/RootStore.qml

@@ -12,6 +12,7 @@ import AppLayouts.Wallet.stores 1.0 as WalletStore
 QtObject {
    id: root

+    readonly property var isProduction: production


why not bool?

micieslak · 2025-07-09T12:40:55Z

storybook/pages/AboutViewPage.qml

+            currentVersion: getCurrentVersion()
+            gitCommit: getGitCommit()
+            statusGoVersion: getStatusGoVersion()
+            qtRuntimeVersion: qtRuntimeVersion()


There is no need to keep those methods now. Please remove them and assign values directly :)

micieslak · 2025-07-09T13:35:20Z

ui/app/AppLayouts/stores/RootStore.qml

+
+    // Here define the needed properties that access to `Context Properties`:
+    readonly property QtObject _internal: QtObject{
+        id: internal // Rename to `d` when cleanup done


as it affects only that file, it should be easy to replace internal. with d. indeed.

micieslak · 2025-07-09T13:38:15Z

ui/app/AppLayouts/stores/RootStore.qml

@@ -73,8 +162,8 @@ QtObject {
        id: d

        readonly property var userProfileInst: userProfile
-        readonly property Connections mainModuleConnections: Connections {
-            target: root.mainModuleInst
+        readonly property Connections _settingRelatedMainModuleConnections: Connections {


instead of setting property names that are not used at all it's handy to change parent from QtObject to our utility QObject and then you can put children directly, no need to assign to property (Connections {}).

It's also valid and useful for top level component :)

micieslak · 2025-07-09T14:39:56Z

ui/app/AppLayouts/Profile/stores/ContactsStore.qml

+    readonly property alias contactShowcaseSocialLinksModel: contactShowcaseModels.adaptedSocialLinksSourceModel
+
+    readonly property SQUtils.QObject adaptors: SQUtils.QObject {
+        ProfileShowcaseModelAdapter {


I know that's intermediate step, but next we should move that adaptor outside the store.

micieslak · 2025-07-09T14:56:39Z

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

@@ -285,6 +294,12 @@ Item {

                        onOpenGifPopupRequest: root.openGifPopupRequest(params, cbOnGifSelected, cbOnClose)

+                        // Contacts related requests:
+                        onChangeContactNicknameRequest: root.changeContactNicknameRequest(pubKey, nickname, displayName, isEdit)


basically qt 6 forces to use function-based syntax:

onChangeContactNicknameRequest: (pubKey, nickname, displayName, isEdit) => { root.changeContactNicknameRequest(pubKey, nickname, displayName, isEdit) }

otherwise it prints warnings.

Alternative solution is to forward signals in Component.onCompleted:

Component.onCompleted: { removeTrustStatusRequest.connect(root.removeTrustStatusRequest) }

noeliaSD added 7 commits July 5, 2025 14:31

refactor(ProfileStore): Rename property pubkey to pubKey on `Prof…

ebb92e6

…ileStore` Just a property rename for improving consistency.

refactor(ProfileLayout): Moved isWalletEnabled from `profileSection…

c582cf3

…Store` Moved and cleaned up `isWalletEnabled` property from `profileSectionStore` to profile `WalletStore` to improve readability and consistency.

refactor(ProfileLayout): Moved backButtonName property from store t…

0eeb5de

…o view Moved view related property to view component. Cleanup related components.

refactor(WalletView): Removed profileSectionStore dependency

f718789

Cleanup `profileSectionStore` dependency on `WalletView` and children components.

refactor(RootStore): Move production context property from UI compo…

54386e8

…nents to `RootStore` Moved the `production` context property from UI components to the `RootStore` to ensure global accessibility and decouple environment logic from the view layer.

noeliaSD self-assigned this Jul 6, 2025

noeliaSD added do not merge refactor labels Jul 6, 2025

noeliaSD added 8 commits July 6, 2025 11:58

refactor(ProfileLayout): Removed profileSectionStore dependency

d3fc442

- Cleanup `profileSectionStore` dependency on `ProfileLayout` and children components (`CommunitiesView`). - Moved `profile store` related code from `ProfileSectionsStore` to `ProfileStore`.

noeliaSD force-pushed the refactor/issue-18117 branch from 2689937 to c51283f Compare July 6, 2025 09:58

noeliaSD removed the do not merge label Jul 7, 2025

noeliaSD marked this pull request as ready for review July 7, 2025 07:40

noeliaSD requested review from micieslak, a team, caybro and alexjba as code owners July 7, 2025 07:40

noeliaSD requested review from vkjr and Khushboo-dev-cpp and removed request for a team July 7, 2025 07:40

noeliaSD requested review from jrainville and removed request for vkjr and a team July 7, 2025 07:41

jrainville reviewed Jul 7, 2025

View reviewed changes

caybro reviewed Jul 8, 2025

View reviewed changes

micieslak reviewed Jul 9, 2025

View reviewed changes

refactor: ProfileSectionsStore refactor and modularization pass and remove ContactsStore from MessageView hierarchy #18314

Are you sure you want to change the base?

refactor: ProfileSectionsStore refactor and modularization pass and remove ContactsStore from MessageView hierarchy #18314

Uh oh!

Conversation

noeliaSD commented Jul 6, 2025

What does the PR do

🔍 Recommendation: Review commit-by-commit

Summary of Changes

Rationale

Affected areas

Architecture compliance

Impact on end user

How to test

Risk

Uh oh!

status-im-auto commented Jul 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Jenkins Builds

Uh oh!

jrainville left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

micieslak left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

refactor: `ProfileSectionsStore` refactor and modularization pass and remove `ContactsStore` from `MessageView` hierarchy #18314

refactor: `ProfileSectionsStore` refactor and modularization pass and remove `ContactsStore` from `MessageView` hierarchy #18314

status-im-auto commented Jul 6, 2025 •

edited

Loading