From 72b03e69aa4de1429b37d4504152407586158231 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 20 Mar 2024 16:21:58 +0200 Subject: [PATCH] fix(wallet) fix namespace clash in wallet RootStore.qml Updates: #13663 --- .../stubs/nim/sectionmocks/WalletSectionAccounts.qml | 9 --------- ui/app/AppLayouts/Wallet/stores/RootStore.qml | 5 +++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/storybook/stubs/nim/sectionmocks/WalletSectionAccounts.qml b/storybook/stubs/nim/sectionmocks/WalletSectionAccounts.qml index f153521422..75c6f5e586 100644 --- a/storybook/stubs/nim/sectionmocks/WalletSectionAccounts.qml +++ b/storybook/stubs/nim/sectionmocks/WalletSectionAccounts.qml @@ -10,13 +10,4 @@ Item { function getNameByAddress(address) { return "Name Mock " + address.substring(0, 5) } - - // - // Silence warnings - readonly property QtObject overview: QtObject { - readonly property string mixedcaseAddress: "" - } - readonly property ListModel mixedcaseAddress: ListModel {} - - signal walletAccountRemoved(string address) } \ No newline at end of file diff --git a/ui/app/AppLayouts/Wallet/stores/RootStore.qml b/ui/app/AppLayouts/Wallet/stores/RootStore.qml index 4476af798f..25a414bfe2 100644 --- a/ui/app/AppLayouts/Wallet/stores/RootStore.qml +++ b/ui/app/AppLayouts/Wallet/stores/RootStore.qml @@ -2,7 +2,8 @@ pragma Singleton import QtQuick 2.13 -import shared.stores 1.0 +// Aliasing not to conflict with the shared.stores.RootStore +import shared.stores 1.0 as Stores import utils 1.0 @@ -486,7 +487,7 @@ QtObject { walletSectionAccounts.updateWatchAccountHiddenFromTotalBalance(address, hideFromTotalBalance) } - property CurrenciesStore currencyStore: CurrenciesStore {} + property Stores.CurrenciesStore currencyStore: Stores.CurrenciesStore {} function addressWasShown(address) { return root.mainModuleInst.addressWasShown(address)