chore(Qt5.15): Fix qml warnings after qt 5.15 migration

Fixing QML Connections warnings due to deprecated onFoo handlers. Now we're using function onFoo(params). Fixing QML compilation error due to js filename format. Fixing cyclic dependencies between qml components.
status-im · Jan 31, 2023 · 81a4d70 · 81a4d70
1 parent db3b63e
commit 81a4d70
Show file tree

Hide file tree

Showing 43 changed files with 125 additions and 119 deletions.
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusSeedPhraseInput.qml b/ui/StatusQ/src/StatusQ/Controls/StatusSeedPhraseInput.qml
@@ -176,7 +176,7 @@ Item {
         // Consider word inserted if input looses focus while a valid word is present ("user" clicks outside)
         Connections {
             target: seedWordInput.input.edit
-            onActiveFocusChanged: {
+            function onActiveFocusChanged() {
                 if (!seedWordInput.input.edit.activeFocus && d.isInputValidWord) {
                     // There are so many side effects regarding focus and doneInsertingWord that we need to reset this flag not to be processed again.
                     d.isInputValidWord = false

diff --git a/ui/app/AppLayouts/Browser/BrowserLayout.qml b/ui/app/AppLayouts/Browser/BrowserLayout.qml
@@ -596,22 +596,22 @@ StatusSectionLayout {
 
     Connections {
         target: _internal.currentWebView
-        onUrlChanged: {
+        function onUrlChanged() {
             browserHeader.addressBar.text = Web3ProviderStore.obtainAddress(_internal.currentWebView.url)
             RootStore.currentTabConnected = Web3ProviderStore.hasWalletConnected(Utils.getHostname(_internal.currentWebView.url))
         }
     }
 
     Connections {
         target: BookmarksStore.bookmarksModel
-        onModelChanged: {
+        function onModelChanged() {
             browserHeader.currentFavorite = Qt.binding(function () {return BookmarksStore.getCurrentFavorite(_internal.currentWebView.url)})
         }
     }
 
     Connections {
         target: browserSection
-        onOpenUrl: {
+        function onOpenUrl(url: string) {
             root.openUrlInNewTab(url);
         }
     }

diff --git a/ui/app/AppLayouts/Browser/panels/DownloadBar.qml b/ui/app/AppLayouts/Browser/panels/DownloadBar.qml
@@ -85,7 +85,7 @@ Rectangle {
                 }
                 Connections {
                     target: downloadsMenu
-                    onCancelClicked: {
+                    function onCancelClicked() {
                         isCanceled = true
                     }
                 }

diff --git a/ui/app/AppLayouts/Browser/panels/DownloadView.qml b/ui/app/AppLayouts/Browser/panels/DownloadView.qml
@@ -61,7 +61,7 @@ import "../controls"
             }
             Connections {
                 target: downloadsMenu
-                onCancelClicked: {
+                function onCancelClicked() {
                     isCanceled = true
                 }
             }

diff --git a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
@@ -102,7 +102,7 @@ Popup {
 
     Connections {
         target: WalletStore.dappBrowserAccount
-        onConnectedAccountDeleted: {
+        function onConnectedAccountDeleted() {
             popup.reload()
             // This is done because when an account is deleted and the account is updated to default one,
             // only the properties are updated and we need to listen to those events and update the selected account

diff --git a/ui/app/AppLayouts/Browser/views/WebProviderObj.qml b/ui/app/AppLayouts/Browser/views/WebProviderObj.qml
@@ -30,7 +30,7 @@ QtObject {
     property Connections conn: Connections {
         target: Web3ProviderStore.web3ProviderInst
 
-        onPostMessageResult: {
+        function onPostMessageResult(payloadMethod: string, result: string, chainId: string) {
             web3Response(result)
             const isSign = ["eth_sign", "personal_sign", "eth_signTypedData", "eth_signTypedData_v3"].indexOf(payloadMethod) > -1
             const isTx = payloadMethod === "eth_sendTransaction"

diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
@@ -65,11 +65,11 @@ StatusDialog {
         enabled: root.opened && root.emojiPopupOpened
         target: emojiPopup
 
-        onEmojiSelected: function (emojiText, atCursor) {
+        function onEmojiSelected(emojiText: string, atCursor: bool) {
             nameInput.input.asset.isLetterIdenticon = false;
             nameInput.input.asset.emoji = emojiText
         }
-        onClosed: {
+        function onClosed() {
             root.emojiPopupOpened = false
         }
     }

diff --git a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml b/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
@@ -124,7 +124,7 @@ Item {
 
         Connections {
             target: root.store.communitiesModuleInst
-            onCommunityAccessRequested: function (communityId) {
+            function onCommunityAccessRequested(communityId: string) {
                 if (communityId === communityData.id) {
                     joinCommunityButton.invitationPending = root.store.isCommunityRequestPending(communityData.id)
                 }
@@ -608,7 +608,7 @@ Item {
     Connections {
         target: root.store.mainModuleInst
 
-        onOpenCommunityMembershipRequestsPopup:{
+        function onOpenCommunityMembershipRequestsPopup(sectionId: string) {
             if(root.store.getMySectionId() != sectionId)
                 return
 

diff --git a/ui/app/AppLayouts/Chat/views/MembersSelectorView.qml b/ui/app/AppLayouts/Chat/views/MembersSelectorView.qml
@@ -88,7 +88,7 @@ MembersSelectorBase {
     Connections {
         enabled: root.visible
         target: root.rootStore.contactsStore.mainModuleInst
-        onResolvedENS: {
+        function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
             if (resolvedPubKey === "") {
                 root.suggestionsDialog.forceHide = false
                 return

diff --git a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml
@@ -138,7 +138,7 @@ OnboardingBasePage {
 
     Connections {
         target: root.startupStore.startupModuleInst
-        onStartupError: {
+        function onStartupError(error: string, errType: int) {
             msgDialog.errType = errType
             if (errType === Constants.startupErrorType.setupAccError) {
                 if (error === Constants.existingAccountError) {
@@ -172,10 +172,10 @@ following the \"Add existing Status user\" flow, using your seed phrase.")
             msgDialog.open()
         }
 
-        onDisplayKeycardSharedModuleFlow: {
+        function onDisplayKeycardSharedModuleFlow() {
             keycardPopup.active = true
         }
-        onDestroyKeycardSharedModuleFlow: {
+        function onDestroyKeycardSharedModuleFlow() {
             keycardPopup.active = false
         }
     }

diff --git a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
@@ -142,7 +142,7 @@ Item {
 
     Connections {
         target: RootStore.privacyModule
-        onPasswordChanged: {
+        function onPasswordChanged(success: bool, errorMsg: string) {
             if (success) {
                 submitBtn.loading = false
                 root.exit();

diff --git a/ui/app/AppLayouts/Onboarding/views/LoginView.qml b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
@@ -105,7 +105,7 @@ Item {
     Connections{
         target: root.startupStore.startupModuleInst
 
-        onObtainingPasswordError: {
+        function onObtainingPasswordError(errorDescription: string, errorType: string) {
             if (errorType === Constants.keychain.errorType.authentication) {
                 // We are notifying user only about keychain errors.
                 return
@@ -120,7 +120,7 @@ Item {
             obtainingPasswordErrorNotification.open()
         }
 
-        onObtainingPasswordSuccess: {
+        function onObtainingPasswordSuccess(password: string) {
             if(localAccountSettings.storeToKeychainValue !== Constants.keychain.storedValue.store)
                 return
 
@@ -132,7 +132,7 @@ Item {
             }
         }
 
-        onAccountLoginError: {
+        function onAccountLoginError(error: string) {
             if (error) {
                 if (!root.startupStore.selectedLoginAccount.keycardCreatedAccount) {
                     // SQLITE_NOTADB: "file is not a database"

diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import shared 1.0
 import shared.panels 1.0
+import shared.stores 1.0 as SharedStores
 
 import "stores"
 import "popups"
@@ -193,7 +194,7 @@ StatusSectionLayout {
                 implicitHeight: parent.height
 
                 languageStore: root.store.languageStore
-                currencyStore: root.store.walletStore.currencyStore
+                currencyStore: SharedStores.RootStore.currencyStore
                 sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.language)
                 contentWidth: d.contentWidth
             }

diff --git a/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml b/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml
@@ -55,7 +55,9 @@ StatusModal {
 
     Connections {
         target: root.privacyStore.privacyModule
-        onPasswordChanged: onChangePasswordResponse(success, errorMsg)
+        function onPasswordChanged(success: bool, errorMsg: string) {
+            onChangePasswordResponse(success, errorMsg)
+        }
     }
 
     width: 480

diff --git a/ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml b/ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml
@@ -34,7 +34,7 @@ StatusModal {
     Connections {
         enabled: popup.opened
         target: emojiPopup
-        onEmojiSelected: function (emojiText, atCursor) {
+        function onEmojiSelected(emojiText: string, atCursor: bool) {
             popup.contentItem.accountNameInput.input.asset.emoji = emojiText
         }
     }

diff --git a/ui/app/AppLayouts/Profile/popups/SendContactRequestModal.qml b/ui/app/AppLayouts/Profile/popups/SendContactRequestModal.qml
@@ -65,7 +65,7 @@ StatusModal {
 
     Connections {
         target: contactsStore.mainModuleInst
-        onResolvedENS: {
+        function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
             if(!d.showChatKeyValidationIndicator){
                 d.showPasteButton = false
                 d.showChatKeyValidationIndicator = true

diff --git a/ui/app/AppLayouts/Profile/stores/WalletStore.qml b/ui/app/AppLayouts/Profile/stores/WalletStore.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.13
 
-import shared.stores 1.0 as SharedStore
 import "../../Wallet/stores"
 
 QtObject {
@@ -21,9 +20,7 @@ QtObject {
     property var importedAccounts: walletSectionAccounts.imported
     property var generatedAccounts: walletSectionAccounts.generated
     property var watchOnlyAccounts: walletSectionAccounts.watchOnly
-
-    property var currencyStore: SharedStore.RootStore.currencyStore
-
+
     property var currentAccount: walletSectionCurrent
 
     function switchAccountByAddress(address) {

diff --git a/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml b/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
@@ -57,7 +57,7 @@ Item {
 
     Connections {
         target: root.ensUsernamesStore.ensUsernamesModule
-        onDetailsObtained: {
+        function onDetailsObtained(ensName: string, address: string, pubkey: string, isStatus: bool, expirationTime: int) {
             if(username != (isStatus ? ensName + ".stateofus.eth" : ensName))
                 return;
             walletAddressLbl.subTitle = address;
@@ -71,7 +71,7 @@ Item {
                                  && root.ensUsernamesStore.preferredUsername !== username
             d.expirationTimestamp = expirationTime * 1000
         }
-        onLoading: {
+        function onLoading(isLoading: bool) {
             loadingImg.active = isLoading
             if (!isLoading)
                 return;
@@ -152,7 +152,7 @@ Item {
             }
             Connections {
                 target: root.ensUsernamesStore.ensUsernamesModule
-                onTransactionWasSent: {
+                function onTransactionWasSent(txResult: string) {
                     try {
                         let response = JSON.parse(txResult)
                         if (!response.success) {

diff --git a/ui/app/AppLayouts/Profile/views/EnsListView.qml b/ui/app/AppLayouts/Profile/views/EnsListView.qml
@@ -43,7 +43,7 @@ Item {
 
     Connections {
         target: root.ensUsernamesStore.ensUsernamesModule
-        onUsernameConfirmed: {
+        function onUsernameConfirmed(username: string) {
             d.updateNumberOfPendingEnsUsernames()
             chatSettingsLabel.visible = true
         }

diff --git a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
@@ -98,7 +98,7 @@ Item {
             }
             Connections {
                 target: root.ensUsernamesStore.ensUsernamesModule
-                onTransactionWasSent: {
+                function onTransactionWasSent(txResult: string) {
                     try {
                         let response = JSON.parse(txResult)
                         if (!response.success) {
@@ -189,7 +189,7 @@ Item {
 
             Connections {
                 target: root.ensUsernamesStore.ensUsernamesModule
-                onUsernameAvailabilityChecked: {
+                function onUsernameAvailabilityChecked(availabilityStatus: string) {
                     if(!validate(ensUsername.text)) return;
                     valid = false;
                     loading = false;

diff --git a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
@@ -85,7 +85,7 @@ Item {
             }
             Connections {
                 target: root.ensUsernamesStore.ensUsernamesModule
-                onTransactionWasSent: {
+                function onTransactionWasSent(txResult: string) {
                     try {
                         let response = JSON.parse(txResult)
                         if (!response.success) {

diff --git a/ui/app/AppLayouts/Profile/views/EnsView.qml b/ui/app/AppLayouts/Profile/views/EnsView.qml
@@ -315,14 +315,14 @@ Item {
 
     Connections {
         target: ensView
-        onConnect: {
+        function onConnect(ensUsername: string) {
             addedUsername = ensUsername;
         }
     }
 
     Connections {
         target: ensView.ensUsernamesStore.ensUsernamesModule
-        onTransactionCompleted: {
+        function onTransactionCompleted(success: bool, txHash: string, username: string, trxType: string, revertReason: string) {
             let title = ""
             switch(trxType){
             case "RegisterENS":

diff --git a/ui/app/AppLayouts/Profile/views/KeycardView.qml b/ui/app/AppLayouts/Profile/views/KeycardView.qml
@@ -89,10 +89,10 @@ SettingsContentBase {
         Connections {
             target: root.keycardStore.keycardModule
 
-            onDisplayKeycardSharedModuleFlow: {
+            function onDisplayKeycardSharedModuleFlow() {
                 keycardPopup.active = true
             }
-            onDestroyKeycardSharedModuleFlow: {
+            function onDestroyKeycardSharedModuleFlow() {
                 keycardPopup.active = false
             }
             onSharedModuleBusy: {

diff --git a/ui/app/AppLayouts/Profile/views/MessagingView.qml b/ui/app/AppLayouts/Profile/views/MessagingView.qml
@@ -238,7 +238,9 @@ SettingsContentBase {
 
             Connections {
                 target: localAccountSensitiveSettings
-                onWhitelistedUnfurlingSitesChanged: generalColumn.populatePreviewableSites()
+                function onWhitelistedUnfurlingSitesChanged() {
+                    generalColumn.populatePreviewableSites()
+                }
             }
 
             // Manually add switch for the image unfurling

diff --git a/ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml b/ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml
@@ -15,7 +15,7 @@ import "../stores"
 Item {
     id: derivedAddresses
 
-    property int selectedAccountType: RootStore.defaultSelectedType
+    property int selectedAccountType: Constants.AddAccountType.GenerateNew
     property string selectedKeyUid: RootStore.defaultSelectedKeyUid
     property bool selectedKeyUidMigratedToKeycard: RootStore.defaultSelectedKeyUidMigratedToKeycard
     property string selectedPath: ""
@@ -52,8 +52,8 @@ Item {
         id: _internal
 
         readonly property bool showEnterPinPassButton: !RootStore.loggedInUserAuthenticated &&
-                                                       derivedAddresses.selectedAccountType !== SelectGeneratedAccount.AddAccountType.ImportSeedPhrase &&
-                                                       derivedAddresses.selectedAccountType !== SelectGeneratedAccount.AddAccountType.ImportPrivateKey
+                                                       derivedAddresses.selectedAccountType !== Constants.AddAccountType.ImportSeedPhrase &&
+                                                       derivedAddresses.selectedAccountType !== Constants.AddAccountType.ImportPrivateKey
         property int pageSize: 6
         property int noOfPages: Math.ceil(RootStore.derivedAddressesList.count/pageSize)
         property int lastPageSize: RootStore.derivedAddressesList.count - ((noOfPages -1) * pageSize)
@@ -85,7 +85,7 @@ Item {
 
     Connections {
         target: RootStore.derivedAddressesList
-        onModelReset: {
+        function onModelReset() {
             _internal.pageSize = 0
             _internal.pageSize = 6
             _internal.nextSelectableAddressIndex = -1