qt: Disable 'Verify Address On Hardware Wallet' when wallet is not li…

…nked to a hw device.
particl · Feb 26, 2020 · 888a84f · 888a84f
1 parent 388e826
commit 888a84f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -116,25 +116,25 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
     QAction *copyAddressAction = new QAction(tr("&Copy Address"), this);
     QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
     QAction *editAction = new QAction(tr("&Edit"), this);
-    QAction *verifyAddressOnHWAction = new QAction(tr("&Verify Address On Hardware Wallet"), this);
+    hwVerifyAction = new QAction(tr("&Verify Address On Hardware Wallet"), this);
     deleteAction = new QAction(ui->deleteAddress->text(), this);
 
     // Build context menu
     contextMenu = new QMenu(this);
     contextMenu->addAction(copyAddressAction);
     contextMenu->addAction(copyLabelAction);
     contextMenu->addAction(editAction);
-    if(tab == SendingTab) 
+    if(tab == SendingTab)
         contextMenu->addAction(deleteAction);
     else if(tab == ReceivingTab)
-        contextMenu->addAction(verifyAddressOnHWAction);
+        contextMenu->addAction(hwVerifyAction);
     contextMenu->addSeparator();
 
     // Connect signals for context menu actions
     connect(copyAddressAction, &QAction::triggered, this, &AddressBookPage::on_copyAddress_clicked);
     connect(copyLabelAction, &QAction::triggered, this, &AddressBookPage::onCopyLabelAction);
     connect(editAction, &QAction::triggered, this, &AddressBookPage::onEditAction);
-    connect(verifyAddressOnHWAction, &QAction::triggered, this, &AddressBookPage::onVerifyAddressOnHWAction);
+    connect(hwVerifyAction, &QAction::triggered, this, &AddressBookPage::onVerifyAddressOnHWAction);
     connect(deleteAction, &QAction::triggered, this, &AddressBookPage::on_deleteAddress_clicked);
 
     connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);
@@ -285,6 +285,12 @@ void AddressBookPage::selectionChanged()
         ui->deleteAddress->setEnabled(false);
         ui->copyAddress->setEnabled(false);
     }
+
+    if (model && model->isHardwareLinked()) {
+        hwVerifyAction->setEnabled(true);
+    } else {
+        hwVerifyAction->setEnabled(false);
+    }
 }
 
 void AddressBookPage::done(int retval)

diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h
@@ -56,6 +56,7 @@ public Q_SLOTS:
     AddressBookSortFilterProxyModel *proxyModel;
     QMenu *contextMenu;
     QAction *deleteAction; // to be able to explicitly disable it
+    QAction *hwVerifyAction; // to be able to explicitly disable it
     QString newAddressToSelect;
 
 private Q_SLOTS:

diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
@@ -481,7 +481,7 @@ void AddressTableModel::emitDataChanged(int idx)
 
 void AddressTableModel::verifyOnHardwareDevice(QString path)
 {
-    if (walletModel->isHardwareLinkedWallet()) {
+    if (isHardwareLinked()) {
         // Clean up the path, remove the m/ in front of it.
         path.remove(0, 2);
 
@@ -491,6 +491,10 @@ void AddressTableModel::verifyOnHardwareDevice(QString path)
         if (!walletModel->tryCallRpc(sCommandDisplay, rv)) {
             return;
         }
-
     }
-}
+}
+
+bool AddressTableModel::isHardwareLinked()
+{
+    return walletModel && walletModel->isHardwareLinkedWallet();
+};
diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h
@@ -93,6 +93,7 @@ class AddressTableModel : public QAbstractTableModel
 
     OutputType GetDefaultAddressType() const;
     void verifyOnHardwareDevice(QString address);
+    bool isHardwareLinked();
 
 private:
     WalletModel* const walletModel;