DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cleanup,confirmation ui fix

Browse Source
This commit is contained in:
DenioD
2020-01-04 09:56:53 +01:00
parent 188053ffa8
commit d4a00f609d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controller.cpp
View File

@@ -89,7 +89,6 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) {
// For each addr/amt/memo, construct the JSON and also build the confirm dialog box // For each addr/amt/memo, construct the JSON and also build the confirm dialog box
for (int i=0; i < tx.toAddrs.size(); i++) { for (int i=0; i < tx.toAddrs.size(); i++) {
auto toAddr = tx.toAddrs[i]; auto toAddr = tx.toAddrs[i];
// auto zdust1 = randomSietchZaddr[i];
// Construct the JSON params // Construct the JSON params
json rec = json::object(); json rec = json::object();
@@ -101,14 +100,12 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) {
json dust5 = json::object(); json dust5 = json::object();
json dust6 = json::object(); json dust6 = json::object();
json dust7 = json::object(); json dust7 = json::object();
rec["address"] = toAddr.addr.toStdString(); rec["address"] = toAddr.addr.toStdString();
rec["amount"] = toAddr.amount.toqint64(); rec["amount"] = toAddr.amount.toqint64();
if (Settings::isZAddress(toAddr.addr) && !toAddr.memo.trimmed().isEmpty()) if (Settings::isZAddress(toAddr.addr) && !toAddr.memo.trimmed().isEmpty())
rec["memo"] = toAddr.memo.toStdString(); rec["memo"] = toAddr.memo.toStdString();
// int decider = 1 + GetRandInt(100); // random int between 1 and 100
//for (int i=0; i < 7; i++) {
// auto zdust12 = zdust12[i];
QString zdust1; QString zdust1;
zdust1 = randomSietchZaddr(); zdust1 = randomSietchZaddr();
@@ -133,6 +130,7 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) {
dust["address"] = zdust1.toStdString(); dust["address"] = zdust1.toStdString();
dust["amount"] = 0; dust["amount"] = 0;
dust1["address"] = zdust2.toStdString(); dust1["address"] = zdust2.toStdString();
dust1["amount"] = 0; dust1["amount"] = 0;
@@ -156,7 +154,7 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) {
allRecepients.push_back(rec); allRecepients.push_back(rec);
} }
;
} }
void Controller::noConnection() { void Controller::noConnection() {

7
src/sendtab.cpp
View File

@@ -513,12 +513,9 @@ Tx MainWindow::createTxFromSendPage() {
} }
bool ok; bool ok;
// CAmount amtbefore;
CAmount amt; CAmount amt;
// Make sure it parses // Make sure it parses
amtStr.toDouble(&ok); amtStr.toDouble(&ok);