From 63963039eb29a45f4a6188498c153bdeb1483ef6 Mon Sep 17 00:00:00 2001 From: Anthony Laibe Date: Fri, 29 Oct 2021 09:50:26 +0200 Subject: [PATCH] fix(@desktop/wallet): make the receive modal use the old wallet as it is not yet migrated --- ui/app/AppLayouts/Wallet/panels/WalletHeader.qml | 2 +- ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml | 2 +- ui/app/AppLayouts/Wallet/stores/RootStore.qml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml index d594f61855..849609eec0 100644 --- a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml +++ b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml @@ -78,7 +78,7 @@ Item { onClosed: { destroy(); } - selectedAccount: currentAccount + selectedAccount: RootStore.leggacyCurrentAccount } } diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml index 601241e3bb..dfb97302b8 100644 --- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml @@ -47,7 +47,7 @@ ModalPopup { id: accountSelector label: "" showAccountDetails: false - accounts: RootStore.accounts + accounts: RootStore.leggacyAccounts currency: RootStore.currentCurrency anchors.top: qrCodeBox.bottom anchors.topMargin: Style.current.padding diff --git a/ui/app/AppLayouts/Wallet/stores/RootStore.qml b/ui/app/AppLayouts/Wallet/stores/RootStore.qml index 1f8073f471..0ac142d929 100644 --- a/ui/app/AppLayouts/Wallet/stores/RootStore.qml +++ b/ui/app/AppLayouts/Wallet/stores/RootStore.qml @@ -5,6 +5,10 @@ import QtQuick 2.13 QtObject { id: root + // TODO: Received modal is not yet migrated + property var leggacyAccounts: walletModel.accountsView.accounts + property var leggacyCurrentAccount: walletModel.accountsView.currentAccount + property var currentAccount: walletSectionCurrent property var accounts: walletSectionAccounts.model