CAsset: GetIdentifier to get label or hex id

ElementsProject · Apr 9, 2019 · 047799c · 047799c
1 parent d81c9f7
commit 047799c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/assetsdir.cpp b/src/assetsdir.cpp
@@ -72,6 +72,13 @@ std::string CAssetsDir::GetLabel(const CAsset& asset) const
     return GetMetadata(asset).GetLabel();
 }
 
+std::string CAssetsDir::GetIdentifier(const CAsset& asset) const
+{
+    const std::string label = GetMetadata(asset).GetLabel();
+    if (!label.empty()) return label;
+    return asset.GetHex();
+}
+
 std::vector<CAsset> CAssetsDir::GetKnownAssets() const
 {
     std::vector<CAsset> knownAssets;

diff --git a/src/assetsdir.h b/src/assetsdir.h
@@ -40,6 +40,9 @@ class CAssetsDir
     /** @return the label associated to the asset id */
     std::string GetLabel(const CAsset& asset) const;
 
+    /** @return the label associated to the asset id, or some other identifier */
+    std::string GetIdentifier(const CAsset& asset) const;
+
     std::vector<CAsset> GetKnownAssets() const;
 };
 

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -790,12 +790,8 @@ QString formatAssetAmount(const CAsset& asset, const CAmount& amount, const int
     if (fraction) {
         str += QString(".%1").arg(fraction, 8, 10, QLatin1Char('0'));
     }
-    std::string asset_label = gAssetsDir.GetLabel(asset);
-    if (asset_label.empty()) {
-        asset_label = asset.GetHex();
-    }
     if (include_asset_name) {
-        str += QString(" ") + QString::fromStdString(asset_label);
+        str += QString(" ") + QString::fromStdString(gAssetsDir.GetIdentifier(asset));
     }
     return str;
 }