Fix donation address warning
This commit is contained in:
parent
918408cc6e
commit
208d37580d
|
@ -642,8 +642,7 @@ void MainWindow::donate() {
|
|||
// Set up a donation to me :)
|
||||
clearSendForm();
|
||||
|
||||
ui->Address1->setText(Settings::getDonationAddr(
|
||||
Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText())));
|
||||
ui->Address1->setText(Settings::getDonationAddr());
|
||||
ui->Address1->setCursorPosition(0);
|
||||
ui->Amount1->setText("0.01");
|
||||
ui->MemoTxt1->setText(tr("Thanks for supporting ZecWallet!"));
|
||||
|
@ -715,12 +714,12 @@ void MainWindow::postToZBoard() {
|
|||
|
||||
QMap<QString, QString> topics;
|
||||
// Insert the main topic automatically
|
||||
topics.insert("#Main_Area", Settings::getInstance()->isTestnet() ? Settings::getDonationAddr(true) : Settings::getZboardAddr());
|
||||
topics.insert("#Main_Area", Settings::getInstance()->isTestnet() ? Settings::getDonationAddr() : Settings::getZboardAddr());
|
||||
zb.topicsList->addItem(topics.firstKey());
|
||||
// Then call the API to get topics, and if it returns successfully, then add the rest of the topics
|
||||
rpc->getZboardTopics([&](QMap<QString, QString> topicsMap) {
|
||||
for (auto t : topicsMap.keys()) {
|
||||
topics.insert(t, Settings::getInstance()->isTestnet() ? Settings::getDonationAddr(true) : topicsMap[t]);
|
||||
topics.insert(t, Settings::getInstance()->isTestnet() ? Settings::getDonationAddr() : topicsMap[t]);
|
||||
zb.topicsList->addItem(t);
|
||||
}
|
||||
});
|
||||
|
|
|
@ -251,17 +251,12 @@ QString Settings::getTokenName() {
|
|||
}
|
||||
}
|
||||
|
||||
QString Settings::getDonationAddr(bool sapling) {
|
||||
QString Settings::getDonationAddr() {
|
||||
if (Settings::getInstance()->isTestnet())
|
||||
if (sapling)
|
||||
return "ztestsapling1wn6889vznyu42wzmkakl2effhllhpe4azhu696edg2x6me4kfsnmqwpglaxzs7tmqsq7kudemp5";
|
||||
else
|
||||
return "ztn6fYKBii4Fp4vbGhkPgrtLU4XjXp4ZBMZgShtopmDGbn1L2JLTYbBp2b7SSkNr9F3rQeNZ9idmoR7s4JCVUZ7iiM5byhF";
|
||||
else
|
||||
if (sapling)
|
||||
return "zs1gv64eu0v2wx7raxqxlmj354y9ycznwaau9kduljzczxztvs4qcl00kn2sjxtejvrxnkucw5xx9u";
|
||||
else
|
||||
return "zcEgrceTwvoiFdEvPWcsJHAMrpLsprMF6aRJiQa3fan5ZphyXLPuHghnEPrEPRoEVzUy65GnMVyCTRdkT6BYBepnXh6NBYs";
|
||||
|
||||
}
|
||||
|
||||
bool Settings::addToZcashConf(QString confLocation, QString line) {
|
||||
|
@ -321,7 +316,7 @@ double Settings::getZboardAmount() {
|
|||
|
||||
QString Settings::getZboardAddr() {
|
||||
if (Settings::getInstance()->isTestnet()) {
|
||||
return getDonationAddr(true);
|
||||
return getDonationAddr();
|
||||
}
|
||||
else {
|
||||
return "zs10m00rvkhfm4f7n23e4sxsx275r7ptnggx39ygl0vy46j9mdll5c97gl6dxgpk0njuptg2mn9w5s";
|
||||
|
|
|
@ -103,7 +103,7 @@ public:
|
|||
static QString getZECUSDDisplayFormat(double bal);
|
||||
|
||||
static QString getTokenName();
|
||||
static QString getDonationAddr(bool sapling);
|
||||
static QString getDonationAddr();
|
||||
|
||||
static double getMinerFee();
|
||||
static double getZboardAmount();
|
||||
|
|
Loading…
Reference in New Issue