diff --git a/storybook/pages/StatusChatInputPage.qml b/storybook/pages/StatusChatInputPage.qml index 73253873c8..e030f269a6 100644 --- a/storybook/pages/StatusChatInputPage.qml +++ b/storybook/pages/StatusChatInputPage.qml @@ -96,7 +96,6 @@ SplitView { usersModel: fakeUsersModel sharedStore: SharedStores.RootStore { - property bool isWalletEnabled: true property bool gifUnfurlingEnabled: true property var gifStore: SharedStores.GifStore { diff --git a/storybook/qmlTests/tests/tst_StatusChatInput.qml b/storybook/qmlTests/tests/tst_StatusChatInput.qml index 0fdcef164c..2d01f39d5b 100644 --- a/storybook/qmlTests/tests/tst_StatusChatInput.qml +++ b/storybook/qmlTests/tests/tst_StatusChatInput.qml @@ -29,7 +29,6 @@ Item { usersModel: ListModel {} sharedStore: SharedStores.RootStore { - property bool isWalletEnabled: true property bool gifUnfurlingEnabled: true property var gifStore: SharedStores.GifStore { diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index b796d4b238..d26f239042 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -631,6 +631,8 @@ Item { store: appMain.rootChatStore transactionStore: appMain.transactionStore walletAssetsStore: appMain.walletAssetsStore + + isWalletEnabled: appMain.rootStore.profileSectionStore.profileStore.isWalletEnabled } } diff --git a/ui/imports/shared/status/StatusStickerMarket.qml b/ui/imports/shared/status/StatusStickerMarket.qml index 301271cfd9..372e531ace 100644 --- a/ui/imports/shared/status/StatusStickerMarket.qml +++ b/ui/imports/shared/status/StatusStickerMarket.qml @@ -13,7 +13,6 @@ import shared 1.0 import shared.panels 1.0 import shared.popups 1.0 import shared.status 1.0 -import shared.stores 1.0 as SharedStores import shared.popups.send 1.0 import shared.stores.send 1.0 @@ -30,6 +29,7 @@ Item { required property WalletAssetsStore walletAssetsStore property string packId property bool marketVisible + property bool isWalletEnabled signal backClicked signal uninstallClicked(string packId) @@ -81,7 +81,7 @@ Item { } } - readonly property bool walletEnabled: SharedStores.RootStore.isWalletEnabled + readonly property bool walletEnabled: root.isWalletEnabled onWalletEnabledChanged: { update() } diff --git a/ui/imports/shared/status/StatusStickersPopup.qml b/ui/imports/shared/status/StatusStickersPopup.qml index a36ef8263c..9fbcf70257 100644 --- a/ui/imports/shared/status/StatusStickersPopup.qml +++ b/ui/imports/shared/status/StatusStickersPopup.qml @@ -22,6 +22,8 @@ Popup { required property TransactionStore transactionStore required property WalletAssetsStore walletAssetsStore + property alias isWalletEnabled: stickerMarket.isWalletEnabled + signal stickerSelected(string hashId, string packId, string url) QtObject { @@ -95,6 +97,7 @@ Popup { StatusStickerMarket { id: stickerMarket + visible: false Layout.fillWidth: true Layout.fillHeight: true diff --git a/ui/imports/shared/stores/RootStore.qml b/ui/imports/shared/stores/RootStore.qml index 5a0d2d1804..6c1a04839c 100644 --- a/ui/imports/shared/stores/RootStore.qml +++ b/ui/imports/shared/stores/RootStore.qml @@ -14,7 +14,6 @@ QtObject { property var appSettingsInst: Global.appIsReady && !!appSettings? appSettings : null property var accountSensitiveSettings: Global.appIsReady && !!localAccountSensitiveSettings? localAccountSensitiveSettings : null property real volume: !!appSettingsInst ? appSettingsInst.volume * 0.01 : 0.5 - property bool isWalletEnabled: Global.appIsReady? mainModule.sectionsModel.getItemEnabledBySectionType(Constants.appSection.wallet) : true property bool notificationSoundsEnabled: !!appSettingsInst ? appSettingsInst.notificationSoundsEnabled : true property bool neverAskAboutUnfurlingAgain: !!accountSensitiveSettings ? accountSensitiveSettings.neverAskAboutUnfurlingAgain : false