Ledger Nano S Plus

diff --git a/src/wizard/PageHardwareDevice.cpp b/src/wizard/PageHardwareDevice.cpp
index dde571f93652531fddf2878e1c567b0c4069200a..43ec9d2dc2af49e5c2a3a3b01de4f9eb2c13be98 100644 (file)
--- 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 434a0473d40ed42e7e967fe6cb669ffa88112d9c..2edaecf3e8aee41c070af468eab5cf56212da0ab 100644 (file)
--- 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 32f90e7480bf02fcf6539d7ff43caa49af52a1c9..deaab505a847c9839bc843d6b9be60469a091b8e 100644 (file)
--- 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 7a15364c9e95729605f22558ea3a45fe95cc5217..57ae9fc1fa8818458e73b93de844fc3ee8d7bec1 100644 (file)
--- 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 {