diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml index 3c70e658ac..b0eff2c57f 100644 --- a/ui/app/AppLayouts/Profile/ProfileLayout.qml +++ b/ui/app/AppLayouts/Profile/ProfileLayout.qml @@ -247,16 +247,19 @@ StatusSectionLayout { sourceComponent: WalletView { implicitWidth: parent.width implicitHeight: parent.height - myPublicKey: root.store.contactsStore.myPublicKey - currencySymbol: root.sharedRootStore.currencyStore.currentCurrency + contentWidth: d.contentWidth + rootStore: root.store tokensStore: root.tokensStore networkConnectionStore: root.networkConnectionStore assetsStore: root.walletAssetsStore collectiblesStore: root.collectiblesStore + + myPublicKey: root.store.contactsStore.myPublicKey + currencySymbol: root.sharedRootStore.currencyStore.currentCurrency emojiPopup: root.emojiPopup + sendModalPopup: root.sendModalPopup sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.wallet) - contentWidth: d.contentWidth } onLoaded: root.store.backButtonName = "" } diff --git a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml index ececf33a28..9fcc8ae8bd 100644 --- a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml +++ b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml @@ -18,8 +18,6 @@ QtObject { property var mainModuleInst: mainModule property var profileSectionModuleInst: profileSectionModule - property var sendModalPopup - readonly property bool fetchingUpdate: aboutModuleInst.fetching property ContactsStore contactsStore: ContactsStore { diff --git a/ui/app/AppLayouts/Profile/views/WalletView.qml b/ui/app/AppLayouts/Profile/views/WalletView.qml index 114582dc57..0f7833ddd0 100644 --- a/ui/app/AppLayouts/Profile/views/WalletView.qml +++ b/ui/app/AppLayouts/Profile/views/WalletView.qml @@ -41,6 +41,8 @@ SettingsContentBase { required property WalletAssetsStore assetsStore required property CollectiblesStore collectiblesStore + required property var sendModalPopup + readonly property int mainViewIndex: 0 readonly property int networksViewIndex: 1 readonly property int editNetworksViewIndex: 2 @@ -367,7 +369,7 @@ SettingsContentBase { id: savedAddressesView contactsStore: root.rootStore.contactsStore networkConnectionStore: root.networkConnectionStore - sendModal: root.rootStore.sendModalPopup + sendModal: root.sendModalPopup } Component { diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index 7a631a49f4..cf7703ea35 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -59,9 +59,8 @@ Item { currencyStore: appMain.currencyStore } - property AppStores.RootStore rootStore: AppStores.RootStore { - profileSectionStore.sendModalPopup: sendModal - } + property AppStores.RootStore rootStore: AppStores.RootStore {} + property ChatStores.RootStore rootChatStore: ChatStores.RootStore { contactsStore: appMain.rootStore.contactStore currencyStore: appMain.currencyStore