[*] moved convertor of currency

CellFrameDashboardGUI/DapScreenHistoryModel.cpp

@@ -26,22 +26,6 @@ QHash<int, QByteArray> DapScreenHistoryModel::roleNames() const
     return names;
 }
 
-QString DapScreenHistoryModel::toConvertCurrency(const QString& aMoney) const
-{
-    QString money;
-
-    QStringList major = aMoney.split(".");
-    if(!major.isEmpty()) money = major.at(0);
-    else money = aMoney;
-
-    for (int i = money.size() - 3; i >= 1; i -= 3)
-        money.insert(i, ' ');
-
-    if(major.count() > 1) money.append("." + major.at(1));
-
-    return money;
-}
-
 void DapScreenHistoryModel::receiveNewData(const QVariant& aData)
 {
     if(!aData.isValid())
@@ -88,7 +72,7 @@ void DapScreenHistoryModel::receiveNewData(const QVariant& aData)
             default: break;
         }
 
-        item.Cryptocurrency = toConvertCurrency(item.Cryptocurrency);
+        item.Cryptocurrency = DapChainConvertor::getInstance().toConvertCurrency(item.Cryptocurrency);
         item.Cryptocurrency += " " + item.TokenName;
         item.Currency.append(" USD");
 

CellFrameDashboardGUI/DapScreenHistoryModel.h

@@ -8,6 +8,7 @@
 #include <QDateTime>
 #include <QTimer>
 #include "DapHistoryType.h"
+#include "DapChainConvertor.h"
 
 #define MASK_FOR_MODEL QString("MMMM, dd")
 
@@ -43,8 +44,6 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-    Q_INVOKABLE QString toConvertCurrency(const QString& aMoney) const;
-
 public slots:
     /// Receive new tx history
     /// @param QList<QStringList> data

CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml

@@ -4,8 +4,6 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.12
 
 Rectangle {
-//    width:  dapListView.width
-//    height: 30 * pt
     color: "#C2CAD1"
 
     Text {

CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml

 import QtQuick 2.0
 import QtQuick.Controls 2.5
 import QtQuick.Controls.Styles 1.4
+import DapTransactionHistory 1.0
 
 Rectangle {
 
@@ -63,7 +64,10 @@ Rectangle {
                 if(currentIndex === -1)
                     fieldWalletBalance.text = 0;
                 else
-                    fieldWalletBalance.text = dapChainWalletsModel.get(comboboxWallet.currentIndex).tokens[currentIndex * 2];
+                {
+                    var money = dapChainWalletsModel.get(comboboxWallet.currentIndex).tokens[currentIndex * 2];
+                    fieldWalletBalance.text = dapChainConvertor.toConvertCurrency(money);
+                }
             }
         }
 

CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBox.qml

@@ -4,24 +4,6 @@ import QtQuick.Controls.Styles 1.4
 
 ComboBox {
     width: 100 * pt
-
-//    id: comboboxWallet
-//    anchors.left: parent.left
-//    anchors.top: parent.top
-//    anchors.bottom: parent.bottom
-//    anchors.leftMargin: 30 * pt
-//    anchors.topMargin: 10 * pt
-//    anchors.bottomMargin: 10 * pt
-//    width: 100 * pt
-//    model: dapChainWalletsModel
-//    textRole: "name"
-
-
-//    delegate: ItemDelegate {
-//        width: parent.width
-//        highlighted: parent.highlightedIndex === index
-//    }
-
     indicator: Image {
         source: parent.popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up.png" : "qrc:/Resources/Icons/ic_arrow_drop_down.png"
         width: 24 * pt

CellFrameDashboardGUI/main.cpp

@@ -24,6 +24,7 @@
 #include "DapChainNodeNetworkExplorer.h"
 #include "DapScreenHistoryFilterModel.h"
 #include "DapConsoleModel.h"
+#include "DapChainConvertor.h"
 
 #include <QRegExp>
 
@@ -75,6 +76,7 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("dapNodeNetworkModel", &DapChainNodeNetworkModel::getInstance());
     engine.rootContext()->setContextProperty("dapConsoleModel", &DapConsoleModel::getInstance());
     engine.rootContext()->setContextProperty("dapHistoryModel", &DapScreenHistoryFilterModel::getInstance());
+    engine.rootContext()->setContextProperty("dapChainConvertor", &DapChainConvertor::getInstance());
     engine.rootContext()->setContextProperty("pt", 1.3);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     

libCellFrameDashboardCommon/DapChainConvertor.cpp

+#include "DapChainConvertor.h"
+
+DapChainConvertor::DapChainConvertor(QObject *parent) : QObject(parent)
+{
+
+}
+
+DapChainConvertor& DapChainConvertor::getInstance()
+{
+    static DapChainConvertor instance;
+    return instance;
+}
+
+QString DapChainConvertor::toConvertCurrency(const QString& aMoney)
+{
+    QString money;
+
+    QStringList major = aMoney.split(".");
+    if(!major.isEmpty()) money = major.at(0);
+    else money = aMoney;
+
+    for (int i = money.size() - 3; i >= 1; i -= 3)
+        money.insert(i, ' ');
+
+    if(major.count() > 1) money.append("." + major.at(1));
+
+    return money;
+}

libCellFrameDashboardCommon/DapChainConvertor.h

+#ifndef DAPCHAINCONVERTOR_H
+#define DAPCHAINCONVERTOR_H
+
+#include <QObject>
+
+class DapChainConvertor : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit DapChainConvertor(QObject *parent = nullptr);
+    /// Get instance of this class
+    /// @param instance of this class
+    static DapChainConvertor &getInstance();
+
+public slots:
+    Q_INVOKABLE QString toConvertCurrency(const QString& aMoney);
+};
+
+#endif // DAPCHAINCONVERTOR_H

libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri

@@ -13,6 +13,7 @@ QT += quick quickwidgets
 CONFIG += c++11
 
 SOURCES +=\
+    $$PWD/DapChainConvertor.cpp \
     $$PWD/DapHalper.cpp \
     $$PWD/DapHistoryType.cpp \
     $$PWD/DapSettings.cpp \
@@ -22,6 +23,7 @@ SOURCES +=\
     $$PWD/DapChainWallet.cpp
 
 HEADERS +=\
+    $$PWD/DapChainConvertor.h \
     $$PWD/DapHalper.h \
     $$PWD/DapHistoryType.h \
     $$PWD/DapSettings.h \