Merge remote-tracking branch 'remotes/origin/groovy_gluon_7.2RC' into…

… mainnet
BeamMW · Nov 8, 2022 · d09aca0 · d09aca0
2 parents 0a328ff + e134316
commit d09aca0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/beam b/beam
diff --git a/ui/model/assets_manager.cpp b/ui/model/assets_manager.cpp
@@ -393,9 +393,10 @@ QMap<QString, QVariant> AssetsManager::getAssetProps(beam::Asset::ID assetId)
 
     beam::wallet::Currency assetCurr(assetId);
     const bool isBEAM = assetId == beam::Asset::s_BeamID;
-
+    auto unitName = getUnitName(assetId, AssetsManager::NoShorten);
     asset.insert("isBEAM",     isBEAM);
-    asset.insert("unitName",   getUnitName(assetId, AssetsManager::NoShorten));
+    asset.insert("unitName",   unitName);
+    asset.insert("unitNameWithId", isBEAM ? unitName : QString("%1 <font color='#8da1ad'>(%2)</font>").arg(unitName).arg(assetId));
     asset.insert("rate",       beamui::AmountToUIString(_rates->getRate(assetCurr)));
     asset.insert("rateUnit",   getRateUnit());
     asset.insert("assetId",    static_cast<int>(assetId));

diff --git a/ui/view/controls/AmountInput.qml b/ui/view/controls/AmountInput.qml
@@ -21,7 +21,9 @@ ColumnLayout {
     readonly property bool     isValid: error.length == 0
 
     property int                currencyIdx:   currCombo.currentIndex
-    readonly property string    currencyUnit:  currencies[currencyIdx].unitName
+    readonly property string    currencyUnitNoId:  currencies[currencyIdx].unitName
+    readonly property string    currencyUnit:  currencies[currencyIdx].unitName + 
+                                    ((currencies[currencyIdx].assetId > 0) ? " (%1)".arg(currencies[currencyIdx].assetId) : "")
     readonly property bool      isBeam:        !!currencies[currencyIdx].isBEAM
 
     property string   rate:     currencies[currencyIdx].rate
@@ -37,7 +39,7 @@ ColumnLayout {
     property bool     readOnlyA:    false
     property bool     resetAmount:  true
     property var      amountInput:  ainput
-    property bool     showRate:     control.rateUnit != "" && control.rateUnit != control.currencyUnit
+    property bool     showRate:     control.rateUnit != "" && control.rateUnit != control.currencyUnitNoId
     readonly property bool isExchangeRateAvailable: control.rate != "0"
 
     SFText {
@@ -129,7 +131,7 @@ ColumnLayout {
                 enabled:             multi
                 colorConst:          true
                 model:               control.currencies
-                textRole:            "unitName"
+                textRole:            "unitNameWithId"
                 textMaxLenDrop:      10
                 enableScroll:        true
                 showBackground:      false

diff --git a/ui/viewmodel/dex/dex_orders_list.cpp b/ui/viewmodel/dex/dex_orders_list.cpp
@@ -19,6 +19,16 @@
 #include "viewmodel/ui_helpers.h"
 #include <QDateTime>
 
+namespace
+{
+    QString FormatAmount(beam::Amount amount, const std::string& unitName, beam::Asset::ID assetId)
+    {
+        return beamui::AmountToUIString(amount) +
+            " " + QString::fromStdString(unitName) +
+            (assetId > 0 ? QString("<font color='#8da1ad'> (%1)</font>").arg(assetId) : "");
+    }
+}
+
 DexOrdersList::DexOrdersList()
     : m_amgr(AppModel::getInstance().getAssets())
     , m_wallet(AppModel::getInstance().getWalletModel())
@@ -74,15 +84,15 @@ QVariant DexOrdersList::data(const QModelIndex &index, int role) const
         }
         case Roles::RSend:
         {
-            return beamui::AmountToUIString(order.getSendAmount()) + " " + QString::fromStdString(order.getSendAssetSName());
+            return FormatAmount(order.getSendAmount(), order.getSendAssetSName(), order.getSendAssetId());
         }
         case Roles::RSendSort:
         {
             return QVariant::fromValue(order.getSendAmount());
         }
         case Roles::RReceive:
         {
-            return beamui::AmountToUIString(order.getReceiveAmount()) + " " + QString::fromStdString(order.getReceiveAssetSName());
+            return FormatAmount(order.getReceiveAmount(), order.getReceiveAssetSName(), order.getReceiveAssetId());
         }
         case Roles::RReceiveSort:
         {
+24 −0		bvm/ManagerStd.cpp
+1 −0		bvm/ManagerStd.h
+33 −0		bvm/bvm2.cpp
+2 −0		bvm/bvm2.h
+7 −0		bvm/bvm2_opcodes.h
+10 −0		bvm/bvm2_shared.h
+5 −0		node/db.cpp
+6 −0		node/processor.cpp