Merge pull request #2353

40bdf69 Ledger: improve hw wallet splash screen (selsta)
pull/2/head
luigi1111 5 years ago
commit 17c61f897a
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

@ -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;

@ -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
{

@ -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;

@ -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() {