From 78775d3d69ea8124d44834ae07f17a6efe8ccd9c Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 6 May 2024 13:46:48 +0200 Subject: [PATCH] chore(dapps) move wallet connect service code outside popups Updates: #14607 --- storybook/pages/ConnectedDappsButtonPage.qml | 1 + storybook/stubs/shared/stores/DAppsStore.qml | 2 +- .../AppLayouts/Wallet/services/dapps}/WalletConnectSDK.qml | 2 +- ui/app/AppLayouts/Wallet/services/dapps/qmldir | 1 + .../AppLayouts/Wallet/services/dapps}/sdk/README.md | 0 .../AppLayouts/Wallet/services/dapps}/sdk/generated/bundle.js | 0 .../Wallet/services/dapps}/sdk/generated/bundle.js.LICENSE.txt | 0 .../AppLayouts/Wallet/services/dapps}/sdk/package-lock.json | 0 .../AppLayouts/Wallet/services/dapps}/sdk/package.json | 0 .../AppLayouts/Wallet/services/dapps}/sdk/src/index.html | 2 +- .../AppLayouts/Wallet/services/dapps}/sdk/src/index.js | 0 .../AppLayouts/Wallet/services/dapps}/sdk/webpack.config.js | 0 ui/app/mainui/AppMain.qml | 2 +- ui/imports/shared/popups/walletconnect/qmldir | 1 - ui/imports/shared/stores/DAppsStore.qml | 2 +- 15 files changed, 7 insertions(+), 6 deletions(-) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/WalletConnectSDK.qml (99%) create mode 100644 ui/app/AppLayouts/Wallet/services/dapps/qmldir rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/README.md (100%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/generated/bundle.js (100%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/generated/bundle.js.LICENSE.txt (100%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/package-lock.json (100%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/package.json (100%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/src/index.html (71%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/src/index.js (100%) rename ui/{imports/shared/popups/walletconnect => app/AppLayouts/Wallet/services/dapps}/sdk/webpack.config.js (100%) diff --git a/storybook/pages/ConnectedDappsButtonPage.qml b/storybook/pages/ConnectedDappsButtonPage.qml index 0829d8ef00..e4dc076b5b 100644 --- a/storybook/pages/ConnectedDappsButtonPage.qml +++ b/storybook/pages/ConnectedDappsButtonPage.qml @@ -15,6 +15,7 @@ import Models 1.0 import Storybook 1.0 import AppLayouts.Wallet.controls 1.0 +import AppLayouts.Wallet.services.dapps 1.0 import SortFilterProxyModel 0.2 diff --git a/storybook/stubs/shared/stores/DAppsStore.qml b/storybook/stubs/shared/stores/DAppsStore.qml index c9d342cf52..f0a011fa20 100644 --- a/storybook/stubs/shared/stores/DAppsStore.qml +++ b/storybook/stubs/shared/stores/DAppsStore.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 -import shared.popups.walletconnect 1.0 +import AppLayouts.Wallet.services.dapps 1.0 QtObject { id: root diff --git a/ui/imports/shared/popups/walletconnect/WalletConnectSDK.qml b/ui/app/AppLayouts/Wallet/services/dapps/WalletConnectSDK.qml similarity index 99% rename from ui/imports/shared/popups/walletconnect/WalletConnectSDK.qml rename to ui/app/AppLayouts/Wallet/services/dapps/WalletConnectSDK.qml index 44807a45a9..1b77e2a954 100644 --- a/ui/imports/shared/popups/walletconnect/WalletConnectSDK.qml +++ b/ui/app/AppLayouts/Wallet/services/dapps/WalletConnectSDK.qml @@ -537,7 +537,7 @@ Item { anchors.fill: parent - url: "qrc:/imports/shared/popups/walletconnect/sdk/src/index.html" + url: "qrc:/app/AppLayouts/Wallet/services/dapps/sdk/src/index.html" webChannelObjects: [ statusObject ] onPageLoaded: function() { diff --git a/ui/app/AppLayouts/Wallet/services/dapps/qmldir b/ui/app/AppLayouts/Wallet/services/dapps/qmldir new file mode 100644 index 0000000000..b82e73e423 --- /dev/null +++ b/ui/app/AppLayouts/Wallet/services/dapps/qmldir @@ -0,0 +1 @@ +WalletConnectSDK 1.0 WalletConnectSDK.qml \ No newline at end of file diff --git a/ui/imports/shared/popups/walletconnect/sdk/README.md b/ui/app/AppLayouts/Wallet/services/dapps/sdk/README.md similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/README.md rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/README.md diff --git a/ui/imports/shared/popups/walletconnect/sdk/generated/bundle.js b/ui/app/AppLayouts/Wallet/services/dapps/sdk/generated/bundle.js similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/generated/bundle.js rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/generated/bundle.js diff --git a/ui/imports/shared/popups/walletconnect/sdk/generated/bundle.js.LICENSE.txt b/ui/app/AppLayouts/Wallet/services/dapps/sdk/generated/bundle.js.LICENSE.txt similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/generated/bundle.js.LICENSE.txt rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/generated/bundle.js.LICENSE.txt diff --git a/ui/imports/shared/popups/walletconnect/sdk/package-lock.json b/ui/app/AppLayouts/Wallet/services/dapps/sdk/package-lock.json similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/package-lock.json rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/package-lock.json diff --git a/ui/imports/shared/popups/walletconnect/sdk/package.json b/ui/app/AppLayouts/Wallet/services/dapps/sdk/package.json similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/package.json rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/package.json diff --git a/ui/imports/shared/popups/walletconnect/sdk/src/index.html b/ui/app/AppLayouts/Wallet/services/dapps/sdk/src/index.html similarity index 71% rename from ui/imports/shared/popups/walletconnect/sdk/src/index.html rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/src/index.html index be3ffcb54f..059b125234 100644 --- a/ui/imports/shared/popups/walletconnect/sdk/src/index.html +++ b/ui/app/AppLayouts/Wallet/services/dapps/sdk/src/index.html @@ -3,7 +3,7 @@ - + diff --git a/ui/imports/shared/popups/walletconnect/sdk/src/index.js b/ui/app/AppLayouts/Wallet/services/dapps/sdk/src/index.js similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/src/index.js rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/src/index.js diff --git a/ui/imports/shared/popups/walletconnect/sdk/webpack.config.js b/ui/app/AppLayouts/Wallet/services/dapps/sdk/webpack.config.js similarity index 100% rename from ui/imports/shared/popups/walletconnect/sdk/webpack.config.js rename to ui/app/AppLayouts/Wallet/services/dapps/sdk/webpack.config.js diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index 9a90f12ea6..46d18ea061 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -14,6 +14,7 @@ import AppLayouts.Chat 1.0 import AppLayouts.Chat.views 1.0 import AppLayouts.Profile 1.0 import AppLayouts.Communities 1.0 +import AppLayouts.Wallet.services.dapps 1.0 import utils 1.0 import shared 1.0 @@ -27,7 +28,6 @@ import shared.stores 1.0 import shared.popups.send 1.0 import shared.popups.send.views 1.0 import shared.stores.send 1.0 -import shared.popups.walletconnect 1.0 import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 diff --git a/ui/imports/shared/popups/walletconnect/qmldir b/ui/imports/shared/popups/walletconnect/qmldir index e807421262..ae5f7e0b72 100644 --- a/ui/imports/shared/popups/walletconnect/qmldir +++ b/ui/imports/shared/popups/walletconnect/qmldir @@ -1,2 +1 @@ -WalletConnectSDK 1.0 WalletConnectSDK.qml ConnectDappModal 1.0 ConnectDappModal.qml \ No newline at end of file diff --git a/ui/imports/shared/stores/DAppsStore.qml b/ui/imports/shared/stores/DAppsStore.qml index 16991155ac..77a69fe2a8 100644 --- a/ui/imports/shared/stores/DAppsStore.qml +++ b/ui/imports/shared/stores/DAppsStore.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 -import shared.popups.walletconnect 1.0 +import AppLayouts.Wallet.services.dapps 1.0 QtObject { id: root