From 041a0322561a3cd2a5c0594e840979412b736e7e Mon Sep 17 00:00:00 2001
From: "evgenii.tagiltsev" <tagiltsev.evgenii@gmail.com>
Date: Tue, 15 Oct 2019 15:21:46 +0200
Subject: [PATCH] [*] fixed filling list of tokens
---
.../DapCommandController.cpp | 28 +++++++++----------
.../DapUiQmlWidgetStatusBarComboBoxWallet.qml | 7 ++---
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/CellFrameDashboardGUI/DapCommandController.cpp b/CellFrameDashboardGUI/DapCommandController.cpp
index 2bdd5a377..faea4056a 100755
--- a/CellFrameDashboardGUI/DapCommandController.cpp
+++ b/CellFrameDashboardGUI/DapCommandController.cpp
@@ -153,21 +153,21 @@ void DapCommandController::processGetWalletInfo()
QString name = reply->response().toJsonValue().toVariant().toStringList().at(0);
QString address = reply->response().toJsonValue().toVariant().toStringList().at(1);
QStringList temp = reply->response().toJsonValue().toVariant().toStringList();
- QStringList tokens;
+ QStringList tokens = temp.mid(3, temp.count());
QStringList balance;
- for(int x{2}; x < temp.count(); x++)
- {
- if(x%2)
- {
- tokens.append(temp[x]);
- qDebug() << "TOKKEN " << temp[x];
- }
- else
- {
- balance.append(temp[x]);
- qDebug() << "BALANCE " << temp[x];
- }
- }
+// for(int x{2}; x < temp.count(); x++)
+// {
+// if(x%2)
+// {
+// tokens.append(temp[x]);
+// qDebug() << "TOKKEN " << temp[x];
+// }
+// else
+// {
+// balance.append(temp[x]);
+// qDebug() << "BALANCE " << temp[x];
+// }
+// }
emit sigWalletInfoChanged(name, address, balance, tokens);
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBoxWallet.qml b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBoxWallet.qml
index 61e627fd6..d294cc0cb 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBoxWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBoxWallet.qml
@@ -26,11 +26,8 @@ DapUiQmlWidgetStatusBarComboBoxWalletForm {
onCurrentIndexChanged: {
listToken.model.clear();
- for(var i = 0; i < dapChainWalletsModel.get(currentIndex).count; i++)
- {
- console.debug(dapChainWalletsModel.get(currentIndex).tokens);
- listToken.model.append({"tokenName": dapChainWalletsModel.get(currentIndex).tokens[++i]});
- }
+ for(var i = 2; i < dapChainWalletsModel.get(currentIndex).count; i += 3)
+ listToken.model.append({"tokenName": dapChainWalletsModel.get(currentIndex).tokens[i]});
if(listToken.model.count)
listToken.currentIndex = 0;
}
--
GitLab