fix(Stored): Make stores typed

adding types instead of var for stores used in qml components fixes: #14801
status-im · Jun 10, 2024 · 4ae51ad · 4ae51ad
1 parent 551ae70
commit 4ae51ad
Show file tree

Hide file tree

Showing 173 changed files with 665 additions and 334 deletions.
diff --git a/storybook/pages/ActivityNotificationCommunityTokenReceivedPage.qml b/storybook/pages/ActivityNotificationCommunityTokenReceivedPage.qml
@@ -8,6 +8,9 @@ import mainui 1.0
 import Storybook 1.0
 import Models 1.0
 
+import AppLayouts.stores 1.0 as AppLayoutStores
+import shared.stores 1.0
+
 SplitView {
     id: root
 
@@ -20,8 +23,8 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
-        communityTokensStore: QtObject {}
+        rootStore: AppLayoutStores.RootStore {}
+        communityTokensStore: CommunityTokensStore {}
     }
 
     QtObject {

diff --git a/storybook/pages/AddEditSavedAddressPopupPage.qml b/storybook/pages/AddEditSavedAddressPopupPage.qml
@@ -6,6 +6,7 @@ import SortFilterProxyModel 0.2
 
 import Storybook 1.0
 import Models 1.0
+import AppLayouts.stores 1.0
 import AppLayouts.Wallet.popups 1.0
 
 import utils 1.0

diff --git a/storybook/pages/AssetsViewPage.qml b/storybook/pages/AssetsViewPage.qml
@@ -21,10 +21,10 @@ import shared.stores 1.0
 import Storybook 1.0
 import Models 1.0
 
+import AppLayouts.stores 1.0 as AppLayoutStores
 import AppLayouts.Wallet.views 1.0
 import AppLayouts.Wallet.stores 1.0
 
-
 SplitView {
     id: root
 
@@ -79,8 +79,8 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
-        communityTokensStore: QtObject {}
+        rootStore: AppLayoutStores.RootStore
+        communityTokensStore: CommunityTokensStore {}
         walletAssetsStore: d.walletAssetStore
     }
 

diff --git a/storybook/pages/ChangePasswordViewPage.qml b/storybook/pages/ChangePasswordViewPage.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
 import QtQuick.Extras 1.4
 
 import shared.views 1.0
+import AppLayouts.Profile.stores 1.0
 import AppLayouts.Profile.views 1.0
 
 import utils 1.0
@@ -31,7 +32,7 @@ SplitView {
 
             passwordStrengthScoreFunction: (newPass) => Math.min(newPass.length, 4)
 
-            privacyStore: QtObject{
+            privacyStore: PrivacyStore {
                  property QtObject privacyModule: QtObject {
                     signal passwordChanged(success: bool, errorMsg: string)
                     signal storeToKeychainError(errorDescription: string)

diff --git a/storybook/pages/CollectibleDetailViewPage.qml b/storybook/pages/CollectibleDetailViewPage.qml
@@ -4,14 +4,15 @@ import QtQuick.Layouts 1.15
 
 import Storybook 1.0
 
+import AppLayouts.Communities.stores 1.0 as CommunitiesStores
 import AppLayouts.Wallet 1.0
 import AppLayouts.Wallet.stores 1.0 as WalletStores
 import AppLayouts.Wallet.views.collectibles 1.0
 
 import StatusQ.Core.Utils 0.1
 
 import shared.controls 1.0
-import shared.stores 1.0
+import shared.stores 1.0 as SharedStores
 
 import Models 1.0
 import utils 1.0
@@ -85,8 +86,8 @@ SplitView {
                     isCollectibleLoading: isLoadingCheckbox.checked
                     activityModel: d.transactionsModel
                     addressFilters: d.addressesSelected
-                    rootStore: QtObject {
-                        readonly property string currentCurrency: "EUR"
+                    rootStore: SharedStores.RootStore {
+                        currentCurrency: "EUR"
 
                         function getFiatValue(cryptoValue, symbol) {
                             return cryptoValue * 0.1;
@@ -96,7 +97,7 @@ SplitView {
                             return "%L1 %2".arg(cryptoValue).arg(symbol)
                         }
                     }
-                    walletRootStore: QtObject {
+                    walletRootStore: WalletStores.RootStore {
                         function getNameForAddress(address) {
                             return "NAMEFOR: %1".arg(address)
                         }
@@ -127,7 +128,7 @@ SplitView {
                             return "%1/assets/%2/%3/%4".arg(baseLink).arg(networkShortName).arg(contractAddress).arg(tokenId)
                         }
                     }
-                    communitiesStore: QtObject {
+                    communitiesStore: CommunitiesStores.CommunitiesStore {
                         function getCommunityDetailsAsJson(communityId) {
                             if (communityId.indexOf("unknown") >= 0) {
                                 return { name : "", image : "", color : "" }

diff --git a/storybook/pages/CollectiblesViewPage.qml b/storybook/pages/CollectiblesViewPage.qml
@@ -12,9 +12,12 @@ import StatusQ.Core.Utils 0.1 as SQUtils
 import mainui 1.0
 import utils 1.0
 
+import AppLayouts.stores 1.0 as AppLayoutStores
+import AppLayouts.Communities.stores 1.0 as CommunitiesStore
 import AppLayouts.Wallet.views 1.0
 import AppLayouts.Wallet.stores 1.0
 
+import shared.stores 1.0
 import shared.views 1.0
 
 import Storybook 1.0
@@ -47,8 +50,8 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
-        communityTokensStore: QtObject {}
+        rootStore: AppLayoutStores.RootStore
+        communityTokensStore: CommunityTokensStore {}
         walletCollectiblesStore: CollectiblesStore {
             collectiblesController: collectiblesView.controller
         }

diff --git a/storybook/pages/CommunitiesPortalLayoutPage.qml b/storybook/pages/CommunitiesPortalLayoutPage.qml
@@ -1,9 +1,11 @@
 import QtQuick 2.14
 import QtQuick.Controls 2.14
 
+import AppLayouts.stores 1.0 as AppLayoutStores
 import AppLayouts.Communities 1.0
 import AppLayouts.Communities.stores 1.0
 
+import StatusQ 0.1
 import SortFilterProxyModel 0.2
 
 import Storybook 1.0
@@ -19,7 +21,7 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
+        rootStore: AppLayoutStores.RootStore
         communityTokensStore: CommunityTokensStore {}
     }
 

diff --git a/storybook/pages/CommunitiesViewPage.qml b/storybook/pages/CommunitiesViewPage.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
 
 import StatusQ.Core 0.1
 
+import AppLayouts.stores 1.0 as AppLayoutsStores
 import AppLayouts.Profile.views 1.0
 import AppLayouts.Wallet.stores 1.0
 import AppLayouts.Profile.stores 1.0
@@ -28,7 +29,7 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
+        rootStore: AppLayoutsStores.RootStore
         communityTokensStore: CommunityTokensStore {}
     }
 
@@ -56,7 +57,7 @@ SplitView {
             }
             property var communitiesList: ctrlEmptyView.checked ? emptyModel : communitiesModel
         }
-        rootStore: QtObject {
+        rootStore: AppLayoutsStores.RootStore {
             function isMyCommunityRequestPending(communityId) {
                 return communityId === "0x0006"
             }

diff --git a/storybook/pages/CreateChannelPopupPage.qml b/storybook/pages/CreateChannelPopupPage.qml
@@ -10,6 +10,7 @@ import Storybook 1.0
 import Models 1.0
 
 import AppLayouts.Communities.popups 1.0
+import AppLayouts.Communities.stores 1.0 as CommunitiesStores
 
 SplitView {
     id: root
@@ -77,7 +78,7 @@ SplitView {
                     }
                 }
 
-                communitiesStore: QtObject {
+                communitiesStore: CommunitiesStores.CommunitiesStore {
                     property string discordImportChannelName
                     readonly property bool discordImportInProgress: false
                     readonly property bool discordDataExtractionInProgress: false

diff --git a/storybook/pages/EditSettingsPanelPage.qml b/storybook/pages/EditSettingsPanelPage.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
 
 import mainui 1.0
 import shared.stores 1.0
+import AppLayouts.stores 1.0 as AppLayoutsStores
 import AppLayouts.Communities.panels 1.0
 
 import Storybook 1.0
@@ -14,7 +15,7 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
+        rootStore: AppLayoutsStores.RootStore {}
         communityTokensStore: CommunityTokensStore {}
     }
 

diff --git a/storybook/pages/ExportControlNodePopupPage.qml b/storybook/pages/ExportControlNodePopupPage.qml
@@ -2,6 +2,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 
 import AppLayouts.Communities.popups 1.0
+import AppLayouts.Profile.stores 1.0 as ProfileStores
 
 import utils 1.0
 
@@ -91,7 +92,7 @@ SplitView {
                 property string image: Style.png("tokens/UNI")
                 property string color: "orchid"
             }
-            devicesStore: QtObject {
+            devicesStore: ProfileStores.DevicesStore {
                 function loadDevices() {}
 
                 property bool isDeviceSetup: true

diff --git a/storybook/pages/FirstTokenReceivedPopupPage.qml b/storybook/pages/FirstTokenReceivedPopupPage.qml
@@ -7,6 +7,7 @@ import Models 1.0
 
 import AppLayouts.Communities.popups 1.0
 import AppLayouts.Communities.helpers 1.0
+import AppLayouts.Communities.stores 1.0 as CommunitiesStores
 
 import utils 1.0
 
@@ -43,7 +44,7 @@ SplitView {
                 communityId: "123"
                 communityName: communityNameText.text
                 communityLogo: ModelsData.collectibles.doodles
-                communitiesStore: QtObject {
+                communitiesStore: CommunitiesStores.CommunitiesStore {
                     function navigateToCommunity(id) {
                         logs.logEvent("FirstTokenReceivedPopup::onNavigateToCommunity: " + id)
                     }

diff --git a/storybook/pages/InviteFriendsToCommunityPopupPage.qml b/storybook/pages/InviteFriendsToCommunityPopupPage.qml
@@ -1,7 +1,9 @@
 import QtQuick 2.14
 import QtQuick.Controls 2.14
 
+import AppLayouts.stores 1.0 as AppLayoutStores
 import AppLayouts.Communities.popups 1.0
+import AppLayouts.Profile.stores 1.0 as ProfileStores
 import utils 1.0
 
 import Storybook 1.0
@@ -106,7 +108,7 @@ SplitView {
                     name: "community-name"
                 })
 
-                rootStore: QtObject {
+                rootStore: AppLayoutStores.RootStore {
                     function communityHasMember(communityId, pubKey) {
                         return false
                     }
@@ -119,7 +121,7 @@ SplitView {
                     }
                 }
 
-                contactsStore: QtObject {
+                contactsStore: ProfileStores.ContactsStore {
                     readonly property ListModel myContactsModel: ListModel {
                         Component.onCompleted: {
                             for (let i = 0; i < 20; i++) {

diff --git a/storybook/pages/LanguageViewPage.qml b/storybook/pages/LanguageViewPage.qml
@@ -2,6 +2,7 @@ import QtQuick 2.14
 import QtQuick.Controls 2.14
 import QtQuick.Layouts 1.14
 
+import AppLayouts.stores 1.0 as AppLayoutStores
 import AppLayouts.Profile.views 1.0
 import AppLayouts.Profile.stores 1.0
 
@@ -10,15 +11,17 @@ import Storybook 1.0
 import utils 1.0
 import mainui 1.0
 
+import shared.stores 1.0
+
 SplitView {
     id: root
 
     Logs { id: logs }
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
-        communityTokensStore: QtObject {}
+        rootStore: AppLayoutStores.RootStore {}
+        communityTokensStore: CommunityTokensStore {}
     }
 
     SplitView {
@@ -67,7 +70,7 @@ SplitView {
                 }
             }
 
-            currencyStore: QtObject {
+            currencyStore: CurrenciesStore {
                 property string currentCurrency: "USD"
                 property string currentCurrencySymbol: "$"
 

diff --git a/storybook/pages/MembersSelectorPage.qml b/storybook/pages/MembersSelectorPage.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.14
 import QtQuick.Layouts 1.14
 
 import AppLayouts.Chat.views 1.0
+import AppLayouts.Chat.stores 1.0 as ChatStores
 
 import Storybook 1.0
 import utils 1.0
@@ -63,7 +64,7 @@ SplitView {
         }
     }
 
-    QtObject {
+    ChatStores.RootStore {
         id: rootStoreMock
 
         readonly property var contactsModel: ListModel {

diff --git a/storybook/pages/OverviewSettingsPanelPage.qml b/storybook/pages/OverviewSettingsPanelPage.qml
@@ -3,16 +3,19 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 
 import mainui 1.0
+import AppLayouts.stores 1.0 as AppLayoutStores
 import AppLayouts.Communities.panels 1.0
 
+import shared.stores 1.0
+
 SplitView {
     id: root
     SplitView.fillWidth: true
 
     Popups {
         popupParent: root
-        rootStore: QtObject {}
-        communityTokensStore: QtObject {}
+        rootStore: AppLayoutStores.RootStore {}
+        communityTokensStore: CommunityTokensStore {}
     }
 
     OverviewSettingsPanel {

diff --git a/storybook/pages/ProfileDialogViewPage.qml b/storybook/pages/ProfileDialogViewPage.qml
@@ -10,6 +10,8 @@ import mainui 1.0
 import StatusQ 0.1
 import StatusQ.Core.Utils 0.1 as StatusQUtils
 
+import AppLayouts.stores 1.0 as AppLayoutStores
+import AppLayouts.Profile.stores 1.0 as ProfileStores
 import AppLayouts.Wallet.stores 1.0
 
 import Storybook 1.0
@@ -174,7 +176,7 @@ SplitView {
 
     Popups {
         popupParent: root
-        rootStore: QtObject {
+        rootStore: AppLayoutStores.RootStore {
             property var contactStore: QtObject {
                 property var contactsModule: null
 
@@ -352,7 +354,7 @@ SplitView {
                         assetsModel: AssetsModel {}
                         collectiblesModel: CollectiblesModel {}
 
-                        profileStore: QtObject {
+                        profileStore: ProfileStores.ProfileStore {
                             readonly property string pubkey: "0xdeadbeef"
                             readonly property string ensName: name.text
 
@@ -364,7 +366,7 @@ SplitView {
                             }
                         }
 
-                        contactsStore: QtObject {
+                        contactsStore: ProfileStores.ContactsStore {
                             readonly property string myPublicKey: "0xdeadbeef"
 
                             function joinPrivateChat(publicKey) {