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

merge

Browse Source
This commit is contained in:
DenioD
2019-10-27 20:27:32 +01:00
parent 6914279526 167cfc8bd5
commit 2e48d696f6
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller.cpp
View File

@@ -387,13 +387,11 @@ void Controller::refreshTransactions() {
address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"])); address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
model->markAddressUsed(address); model->markAddressUsed(address);
QString memo; QString memo;
if (!it["memo"].is_null()) { if (!it["memo"].is_null()) {
memo = QString::fromStdString(it["memo"]); memo = QString::fromStdString(it["memo"]);
} }
items.push_back(TransactionItemDetail{ items.push_back(TransactionItemDetail{
address, address,
CAmount::fromqint64(it["amount"].get<json::number_integer_t>()), CAmount::fromqint64(it["amount"].get<json::number_integer_t>()),

2
src/sendtab.cpp
View File

@@ -679,8 +679,6 @@ void MainWindow::sendButton() {
} }
QString MainWindow::doSendTxValidations(Tx tx) { QString MainWindow::doSendTxValidations(Tx tx) {
for (auto toAddr : tx.toAddrs) { for (auto toAddr : tx.toAddrs) {
if (!Settings::isValidAddress(toAddr.addr)) { if (!Settings::isValidAddress(toAddr.addr)) {
QString addr = (toAddr.addr.length() > 100 ? toAddr.addr.left(100) + "..." : toAddr.addr); QString addr = (toAddr.addr.length() > 100 ? toAddr.addr.left(100) + "..." : toAddr.addr);

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "0.7.9" #define APP_VERSION "1.0-beta1"