From 7275099e3b945374dd1f578e19e3df7c7a38f6c5 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 12 Nov 2021 18:47:27 -0500 Subject: [PATCH] HUSH --- src/mainwindow.cpp | 2 +- src/sendtab.cpp | 4 ++-- src/settings.cpp | 2 +- src/settings.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2204923..090b49b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1655,7 +1655,7 @@ void MainWindow::setupReceiveTab() { } ui->rcvLabel->setText(label); - ui->rcvBal->setText(Settings::getZECUSDDisplayFormat(rpc->getAllBalances()->value(addr))); + ui->rcvBal->setText(Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(addr))); ui->txtReceive->setPlainText(addr); ui->qrcodeDisplay->setQrcodeString(addr); if (rpc->getUsedAddresses()->value(addr, false)) { diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 3b1e593..6c5e11f 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -663,9 +663,9 @@ bool MainWindow::confirmTx(Tx tx) { // And FromAddress in the confirm dialog confirm.sendFrom->setText(fnSplitAddressForWrap(tx.fromAddr)); QString tooltip = tr("Current balance : ") + - Settings::getZECUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr)); + Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr)); tooltip += "\n" + tr("Balance after this Tx: ") + - Settings::getZECUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr) - totalSpending); + Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr) - totalSpending); confirm.sendFrom->setToolTip(tooltip); // Show the dialog and submit it if the user confirms diff --git a/src/settings.cpp b/src/settings.cpp index 79a4185..07eb0b1 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -302,7 +302,7 @@ QString Settings::getDisplayFormat(double bal) { return getDecimalString(bal) % " " % Settings::getTokenName(); } -QString Settings::getZECUSDDisplayFormat(double bal) { +QString Settings::getHUSHUSDDisplayFormat(double bal) { auto usdFormat = getUSDFormat(bal); if (!usdFormat.isEmpty()) return getDisplayFormat(bal) % " (" % getUSDFormat(bal) % ")"; diff --git a/src/settings.h b/src/settings.h index 0bd94b4..d71d26f 100644 --- a/src/settings.h +++ b/src/settings.h @@ -123,7 +123,7 @@ public: static QString getDecimalString(double amt); static QString getUSDFormat(double bal); static QString getDisplayFormat(double bal); - static QString getZECUSDDisplayFormat(double bal); + static QString getHUSHUSDDisplayFormat(double bal); static QString getTokenName(); static QString getDonationAddr();