qml: Show Add Wallet in WalletBadge if none are found

Author: johnny9

src/qml/pages/wallet/DesktopWallets.qml

@@ -30,13 +30,20 @@ Page {
             text: walletController.selectedWallet.name
             balance: walletController.selectedWallet.balance
             loading: !walletController.initialized
-            noWalletAvailable: !walletController.isWalletLoaded
+            noWalletLoaded: !walletController.isWalletLoaded
+            noWalletsFound: walletController.noWalletsFound
 
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    walletListModel.listWalletDir()
-                    walletSelect.opened ? walletSelect.close() : walletSelect.open()
+                    if (walletController.initialized) {
+                        walletListModel.listWalletDir()
+                        if (walletController.noWalletsFound) {
+                            root.addWallet()
+                        } else {
+                            walletSelect.opened ? walletSelect.close() : walletSelect.open()
+                        }
+                    }
                 }
             }
 

src/qml/pages/wallet/WalletBadge.qml

@@ -23,7 +23,8 @@ Button {
     property bool showIcon: true
     property string balance: "0.0 000 000"
     property bool loading: false
-    property bool noWalletAvailable: false
+    property bool noWalletLoaded: false
+    property bool noWalletsFound: false
 
     checkable: true
     hoverEnabled: AppMode.isDesktop
@@ -70,7 +71,7 @@ Button {
         }
 
         RowLayout {
-            visible: !root.loading && root.noWalletAvailable
+            visible: !root.loading && root.noWalletLoaded
 
             opacity: visible ? 1 : 0
 
@@ -85,25 +86,25 @@ Button {
             spacing: 5
             Icon {
                 visible: root.showIcon
-                source: "image://images/caret-down-medium-filled"
+                source: root.noWalletsFound ? "image://images/plus" : "image://images/caret-down-medium-filled"
                 color: Theme.color.neutral8
                 size: 30
-                Layout.minimumWidth: 30
-                Layout.preferredWidth: 30
-                Layout.maximumWidth: 30
+                Layout.minimumWidth: 25
+                Layout.preferredWidth: 25
+                Layout.maximumWidth: 25
             }
             CoreText {
                 horizontalAlignment: Text.AlignLeft
                 Layout.fillWidth: true
                 wrap: false
                 font.pixelSize: 15
-                text: qsTr("Select Wallet")
+                text: root.noWalletsFound ? qsTr("Add Wallet") : qsTr("Select Wallet")
                 color: root.textColor
             }
         }
 
         RowLayout {
-            visible: !root.loading && !root.noWalletAvailable
+            visible: !root.loading && !root.noWalletLoaded
 
             opacity: visible ? 1 : 0
 

src/qml/walletqmlcontroller.cpp

@@ -79,6 +79,7 @@ void WalletQmlController::createSingleSigWallet(const QString &name, const QStri
     if (wallet) {
         m_selected_wallet = new WalletQmlModel(std::move(*wallet));
         m_wallets.push_back(m_selected_wallet);
+        setNoWalletsFound(false);
         Q_EMIT selectedWalletChanged();
     } else {
         m_error_message = util::ErrorString(wallet);
@@ -124,6 +125,12 @@ void WalletQmlController::initialize()
         Q_EMIT selectedWalletChanged();
     }
 
+    if (m_node.walletLoader().listWalletDir().size() == 0) {
+        setNoWalletsFound(true);
+    } else {
+        setNoWalletsFound(false);
+    }
+
     m_initialized = true;
     Q_EMIT initializedChanged();
 }
@@ -135,3 +142,11 @@ void WalletQmlController::setWalletLoaded(bool loaded)
         Q_EMIT isWalletLoadedChanged();
     }
 }
+
+void WalletQmlController::setNoWalletsFound(bool no_wallets_found)
+{
+    if (m_no_wallets_found != no_wallets_found) {
+        m_no_wallets_found = no_wallets_found;
+        Q_EMIT noWalletsFoundChanged();
+    }
+}

src/qml/walletqmlcontroller.h

@@ -23,6 +23,7 @@ class WalletQmlController : public QObject
     Q_PROPERTY(WalletQmlModel* selectedWallet READ selectedWallet NOTIFY selectedWalletChanged)
     Q_PROPERTY(bool initialized READ initialized NOTIFY initializedChanged)
     Q_PROPERTY(bool isWalletLoaded READ isWalletLoaded NOTIFY isWalletLoadedChanged)
+    Q_PROPERTY(bool noWalletsFound READ noWalletsFound NOTIFY noWalletsFoundChanged)
 
 public:
     explicit WalletQmlController(interfaces::Node& node, QObject *parent = nullptr);
@@ -36,11 +37,14 @@ class WalletQmlController : public QObject
     bool initialized() const { return m_initialized; }
     bool isWalletLoaded() const { return m_is_wallet_loaded; }
     void setWalletLoaded(bool loaded);
+    bool noWalletsFound() const { return m_no_wallets_found; }
+    void setNoWalletsFound(bool no_wallets_found);
 
 Q_SIGNALS:
     void selectedWalletChanged();
     void initializedChanged();
     void isWalletLoadedChanged();
+    void noWalletsFoundChanged();
 
 public Q_SLOTS:
     void initialize();
@@ -57,6 +61,7 @@ public Q_SLOTS:
     std::vector<WalletQmlModel*> m_wallets;
     std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
     bool m_is_wallet_loaded{false};
+    bool m_no_wallets_found{false};
 
     bilingual_str m_error_message;
     std::vector<bilingual_str> m_warning_messages;