From: tobtoht <thotbot@protonmail.com>
Date: Mon, 23 May 2022 08:56:11 +0000 (+0200)
Subject: Ledger Nano S Plus
X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=070a074e6fe07ccfe889b509a9a923d930c0fe7c;p=gamesguru%2Ffeather.git

Ledger Nano S Plus
---

diff --git a/src/wizard/PageHardwareDevice.cpp b/src/wizard/PageHardwareDevice.cpp
index dde571f9..43ec9d2d 100644
--- a/src/wizard/PageHardwareDevice.cpp
+++ b/src/wizard/PageHardwareDevice.cpp
@@ -14,9 +14,8 @@ PageHardwareDevice::PageHardwareDevice(WizardFields *fields, QWidget *parent)
 {
     ui->setupUi(this);
 
-    ui->combo_deviceType->addItem("Ledger Nano S", DeviceType::LEDGER_NANO_S);
-    ui->combo_deviceType->addItem("Ledger Nano X", DeviceType::LEDGER_NANO_X);
-    ui->combo_deviceType->addItem("Trezor Model T", DeviceType::TREZOR_MODEL_T);
+    ui->combo_deviceType->addItem("Ledger Nano S (PLUS) / X", DeviceType::LEDGER);
+    ui->combo_deviceType->addItem("Trezor Model T", DeviceType::TREZOR);
 }
 
 void PageHardwareDevice::initializePage() {
diff --git a/src/wizard/PageWalletFile.cpp b/src/wizard/PageWalletFile.cpp
index 434a0473..2edaecf3 100644
--- a/src/wizard/PageWalletFile.cpp
+++ b/src/wizard/PageWalletFile.cpp
@@ -99,11 +99,10 @@ QString PageWalletFile::defaultWalletName() {
         QString walletStr = QString("wallet_%1");
         if (m_fields->mode == WizardMode::CreateWalletFromDevice) {
             switch (m_fields->deviceType) {
-                case DeviceType::LEDGER_NANO_S:
-                case DeviceType::LEDGER_NANO_X:
+                case DeviceType::LEDGER:
                     walletStr = QString("ledger_%1");
                     break;
-                case DeviceType::TREZOR_MODEL_T:
+                case DeviceType::TREZOR:
                     walletStr = QString("trezor_%1");
             }
         }
diff --git a/src/wizard/WalletWizard.cpp b/src/wizard/WalletWizard.cpp
index 32f90e74..deaab505 100644
--- a/src/wizard/WalletWizard.cpp
+++ b/src/wizard/WalletWizard.cpp
@@ -95,11 +95,10 @@ void WalletWizard::onCreateWallet() {
 
         QString deviceName;
         switch (m_wizardFields.deviceType) {
-            case DeviceType::LEDGER_NANO_S:
-            case DeviceType::LEDGER_NANO_X:
+            case DeviceType::LEDGER:
                 deviceName = "Ledger";
                 break;
-            case DeviceType::TREZOR_MODEL_T:
+            case DeviceType::TREZOR:
                 deviceName = "Trezor";
         }
 
diff --git a/src/wizard/WalletWizard.h b/src/wizard/WalletWizard.h
index 7a15364c..57ae9fc1 100644
--- a/src/wizard/WalletWizard.h
+++ b/src/wizard/WalletWizard.h
@@ -23,9 +23,8 @@ enum WizardMode {
 };
 
 enum DeviceType {
-    LEDGER_NANO_S = 0,
-    LEDGER_NANO_X,
-    TREZOR_MODEL_T
+    LEDGER = 0,
+    TREZOR
 };
 
 struct WizardFields {