Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

open-wallet: set network type when using file browser

Browse Source 
Co-authored-by: selsta <selsta@users.noreply.github.com>
This commit is contained in:
plowsof
2022-12-23 08:30:03 +00:00
parent 48393db2c7
commit a01dc06a54
4 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/qt/KeysFiles.cpp
View File

@@ -39,6 +39,7 @@
#include "libwalletqt/WalletManager.h"
#include "NetworkType.h"
#include "qt/utils.h"
#include "main/oshelper.h"
#include "KeysFiles.h"
@@ -121,26 +122,9 @@ void WalletKeysFilesModel::findWallets(const QString &moneroAccountsDir)
}
QString wallet(keysFileinfo.path() + QDir::separator() + keysFileinfo.completeBaseName());
quint8 networkType = NetworkType::MAINNET;
QString address = QString("");
// attempt to retreive wallet address
if(fileExists(wallet + ".address.txt")){
QFile file(wallet + ".address.txt");
file.open(QFile::ReadOnly | QFile::Text);
QString _address = QString(file.readAll());
if(!_address.isEmpty()){
address = _address;
if(address.startsWith("5") || address.startsWith("7")){
networkType = NetworkType::STAGENET;
} else if(address.startsWith("9") || address.startsWith("B")){
networkType = NetworkType::TESTNET;
}
}
file.close();
}
auto networkTypeAndAddress = OSHelper::getNetworkTypeAndAddressFromFile(wallet);
quint8 networkType = networkTypeAndAddress.first;
QString address = networkTypeAndAddress.second;
this->addWalletKeysFile(WalletKeysFiles(wallet, networkType, std::move(address)));
}