wip good

diff --git a/src/model/WalletKeysFilesModel.cpp b/src/model/WalletKeysFilesModel.cpp
index 343ad1812b674c6f229854be64653433c77b5245..72ea124bc0554e7d1dafd4d9ae74ed1345458dd1 100644 (file)
--- a/src/model/WalletKeysFilesModel.cpp
+++ b/src/model/WalletKeysFilesModel.cpp
@@ -93,6 +93,7 @@ void WalletKeysFilesModel::findWallets() {
         const QString baseName = fileInfo.baseName();
         const QString basePath = QString("%1/%2").arg(path).arg(baseName);
         QString addr = QString("");
+        // Assume mainnet by default, set otherwise if needed
         quint8 networkType = NetworkType::MAINNET;
 
         if (Utils::fileExists(basePath + ".address.txt")) {
@@ -104,7 +105,7 @@ void WalletKeysFilesModel::findWallets() {
                 addr = _address;
                 if (addr.startsWith("5") || addr.startsWith("7"))
                     networkType = NetworkType::STAGENET;
-                else if (addr.startsWith("9") || addr.startsWith("B"))
+                else if (addr.startsWith("9") || addr.startsWith("A") || addr.startsWith("B"))
                     networkType = NetworkType::TESTNET;
             }
             file.close();

diff --git a/src/wizard/PageOpenWallet.cpp b/src/wizard/PageOpenWallet.cpp
index 90a961cd8577b938d7a895f7713822102367dbc4..2f16c71b2c1ea20dd9ea22dde81f0d3498285337 100644 (file)
--- a/src/wizard/PageOpenWallet.cpp
+++ b/src/wizard/PageOpenWallet.cpp
@@ -27,7 +27,9 @@ PageOpenWallet::PageOpenWallet(WalletKeysFilesModel *wallets, QWidget *parent)
     ui->walletTable->setSelectionBehavior(QAbstractItemView::SelectRows);
     ui->walletTable->setContextMenuPolicy(Qt::CustomContextMenu);
     ui->walletTable->setModel(m_keysProxy);
-    ui->walletTable->hideColumn(WalletKeysFilesModel::NetworkType);
+    // Only show 'wallet type' column in stagenet or testnet mode
+    if (constants::networkType == NetworkType::MAINNET)
+        ui->walletTable->hideColumn(WalletKeysFilesModel::NetworkType);
     ui->walletTable->hideColumn(WalletKeysFilesModel::Path);
     ui->walletTable->hideColumn(WalletKeysFilesModel::Modified);
     ui->walletTable->header()->setSectionResizeMode(WalletKeysFilesModel::FileName, QHeaderView::Stretch);