fix goto Z-Send tab when wallet is locked and using a URI

PirateNetwork · Jun 3, 2024 · bb9746c · bb9746c
1 parent 4f836fb
commit bb9746c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/src/qt/pirateoceangui.cpp b/src/qt/pirateoceangui.cpp
@@ -1335,17 +1335,13 @@ bool PirateOceanGUI::eventFilter(QObject *object, QEvent *event)
 
 bool PirateOceanGUI::handlePaymentRequest(const SendCoinsRecipient& recipient)
 {
-    // Automatically open the Z-send tab when receiving a Pirate URI
-    showNormalIfMinimized();
-    sleep(1);
-    showNormalIfMinimized();
-    gotoZSendCoinsPage();
-
     // URI has to be valid
     if (walletFrame && walletFrame->handlePaymentRequest(recipient))
     {
-        //showNormalIfMinimized();
-        //gotoSendCoinsPage();
+        // Automatically open the Z-send tab when receiving a Pirate URI
+        showNormalIfMinimized();
+        sleep(1);
+        showNormalIfMinimized();
         printf("handlePaymentRequest() - true");
         return true;
     }

diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -145,7 +145,15 @@ bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient)
     if (!walletView)
         return false;
 
-    return walletView->handlePaymentRequest(recipient);
+    if (walletView->isLocked()) {
+        walletView->unlockWallet();
+    }
+
+    if (!walletView->isLocked()) {
+        return walletView->handlePaymentRequest(recipient);
+    }
+
+    return false;
 }
 
 void WalletFrame::showOutOfSyncWarning(bool fShow)

diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
@@ -338,7 +338,12 @@ void WalletView::gotoVerifyMessageTab(QString addr)
 
 bool WalletView::handlePaymentRequest(const SendCoinsRecipient& recipient)
 {
-    return zsendCoinsPage->handlePaymentRequest(recipient);
+    if (zsendCoinsPage->handlePaymentRequest(recipient)) {
+        setCurrentWidget(zsendCoinsPage);
+        zsendCoinsPage->updatePayFromList();
+        return true;
+    }
+    return false;
 }
 
 void WalletView::showOutOfSyncWarning(bool fShow)
@@ -510,6 +515,18 @@ void WalletView::rescan()
     walletModel->rescan();
 }
 
+bool WalletView::isLocked() {
+
+    if(!walletModel)
+        return true;
+
+    if (walletModel->getEncryptionStatus() == WalletModel::Locked) {
+        return true;
+    }
+
+    return false;
+}
+
 void WalletView::encryptWallet(bool status)
 {
     if(!walletModel)

diff --git a/src/qt/walletview.h b/src/qt/walletview.h
@@ -55,6 +55,8 @@ class WalletView : public QStackedWidget
     */
     void setWalletModel(WalletModel *walletModel);
 
+    bool isLocked();
+
     bool handlePaymentRequest(const SendCoinsRecipient& recipient);
 
     void showOutOfSyncWarning(bool fShow);