From e7747b27837ab1c4e05bdd46a8a839079ac5273d Mon Sep 17 00:00:00 2001 From: johnny9 <985648+johnny9@users.noreply.github.com> Date: Sat, 24 Aug 2024 00:41:11 -0400 Subject: [PATCH] qml: Start AddWallet flow when AddWalletButton is clicked --- src/qml/pages/main.qml | 10 +++++++--- src/qml/pages/wallet/DesktopWallets.qml | 6 ++++++ src/qml/pages/wallet/WalletSelect.qml | 6 ++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml index 67526c80ae..7bfbf452b6 100644 --- a/src/qml/pages/main.qml +++ b/src/qml/pages/main.qml @@ -81,7 +81,7 @@ ApplicationWindow { optionsModel.onboard() if (AppMode.walletEnabled && AppMode.isDesktop) { main.push(desktopWallets) - main.push(addWallet) + main.push(addWalletFlow) } else { main.push(node) } @@ -91,11 +91,15 @@ ApplicationWindow { Component { id: desktopWallets - DesktopWallets {} + DesktopWallets { + onAddWallet: { + main.push(addWalletFlow) + } + } } Component { - id: addWallet + id: addWalletFlow AddWallet { onFinished: { main.pop() diff --git a/src/qml/pages/wallet/DesktopWallets.qml b/src/qml/pages/wallet/DesktopWallets.qml index 59a7ac15e4..f823623989 100644 --- a/src/qml/pages/wallet/DesktopWallets.qml +++ b/src/qml/pages/wallet/DesktopWallets.qml @@ -19,6 +19,8 @@ Page { ButtonGroup { id: navigationTabs } + signal addWallet() + header: NavigationBar2 { id: navBar leftItem: WalletBadge { @@ -40,6 +42,10 @@ Page { closePolicy: Popup.CloseOnPressOutside x: 0 y: parent.height + + onAddWallet: { + root.addWallet() + } } } centerItem: RowLayout { diff --git a/src/qml/pages/wallet/WalletSelect.qml b/src/qml/pages/wallet/WalletSelect.qml index 26180c326f..fa0961ad22 100644 --- a/src/qml/pages/wallet/WalletSelect.qml +++ b/src/qml/pages/wallet/WalletSelect.qml @@ -16,6 +16,8 @@ Popup { implicitWidth: 250 clip: true + signal addWallet() + background: Item { anchors.fill: parent Rectangle { @@ -89,6 +91,10 @@ Popup { AddWalletButton { id: addWallet + onClicked: { + root.addWallet() + root.close() + } } } }