From d4a00f609d38ea3f6651338685dfb47a9360b96e Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Sat, 4 Jan 2020 09:56:53 +0100 Subject: [PATCH] cleanup,confirmation ui fix --- src/controller.cpp | 8 +++----- src/sendtab.cpp | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/controller.cpp b/src/controller.cpp index d123593..5626f9c 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -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 (int i=0; i < tx.toAddrs.size(); i++) { auto toAddr = tx.toAddrs[i]; - // auto zdust1 = randomSietchZaddr[i]; // Construct the JSON params json rec = json::object(); @@ -101,14 +100,12 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) { json dust5 = json::object(); json dust6 = json::object(); json dust7 = json::object(); + rec["address"] = toAddr.addr.toStdString(); rec["amount"] = toAddr.amount.toqint64(); if (Settings::isZAddress(toAddr.addr) && !toAddr.memo.trimmed().isEmpty()) 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; zdust1 = randomSietchZaddr(); @@ -133,6 +130,7 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) { dust["address"] = zdust1.toStdString(); dust["amount"] = 0; + dust1["address"] = zdust2.toStdString(); dust1["amount"] = 0; @@ -156,7 +154,7 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx) { allRecepients.push_back(rec); } - ; + } void Controller::noConnection() { diff --git a/src/sendtab.cpp b/src/sendtab.cpp index f140742..025b69e 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -513,12 +513,9 @@ Tx MainWindow::createTxFromSendPage() { } bool ok; - // CAmount amtbefore; + CAmount amt; - - - - + // Make sure it parses amtStr.toDouble(&ok);