Merge pull request #2353

40bdf69 Ledger: improve hw wallet splash screen (selsta)

4 files changed, 12 insertions, 2 deletions

diff --git a/main.qml b/main.qml
index 700bad24..92b0f033 100644
--- a/main.qml
+++ b/main.qml
@@ -859,7 +859,9 @@ ApplicationWindow {
                     ", priority: ", priority,
                     ", description: ", description);
 
-        showProcessingSplash("Creating transaction");
+        var splashMsg = qsTr("Creating transaction...");
+        splashMsg += appWindow.currentWallet.isLedger() ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
+        showProcessingSplash(splashMsg);
 
         transactionDescription = description;
 
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index adc7d35a..592559e2 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -258,6 +258,11 @@ bool Wallet::isHwBacked() const
     return m_walletImpl->getDeviceType() != Monero::Wallet::Device_Software;
 }
 
+bool Wallet::isLedger() const
+{
+    return m_walletImpl->getDeviceType() == Monero::Wallet::Device_Ledger;
+}
+
 //! create a view only wallet
 bool Wallet::createViewOnly(const QString &path, const QString &password) const
 {
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index e25e0353..4d60b060 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -180,6 +180,7 @@ public:
 
     //! hw-device backed wallets
     Q_INVOKABLE bool isHwBacked() const;
+    Q_INVOKABLE bool isLedger() const;
 
     //! returns if view only wallet
     Q_INVOKABLE bool viewOnly() const;
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index c62a327f..7d5b662f 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -448,7 +448,9 @@ Rectangle {
     }
 
     function creatingWalletDeviceSplash(){
-        appWindow.showProcessingSplash(qsTr("Creating wallet from device..."));
+        var splashMsg = qsTr("Creating wallet from device...");
+        splashMsg += wizardController.walletOptionsDeviceName === "Ledger" ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
+        appWindow.showProcessingSplash(splashMsg);
     }
 
     function createWalletFromDevice() {