diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AssetsPricesHelper.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AssetsPricesHelper.java index 45f134a20ff..f5b0b94f09d 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AssetsPricesHelper.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AssetsPricesHelper.java @@ -14,16 +14,17 @@ import org.chromium.chrome.browser.crypto_wallet.util.AsyncUtils; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Locale; public class AssetsPricesHelper { private static String TAG = "AssetsPricesHelper"; private AssetRatioController mAssetRatioController; - private HashMap mAssets; + private HashSet mAssets; private HashMap mAssetsPrices; - public AssetsPricesHelper( - AssetRatioController assetRatioController, HashMap assets) { + public AssetsPricesHelper(AssetRatioController assetRatioController, HashSet assets) { assert assetRatioController != null; assert assets != null; mAssetRatioController = assetRatioController; @@ -40,8 +41,9 @@ public class AssetsPricesHelper { new AsyncUtils.MultiResponseHandler(mAssets.size()); ArrayList pricesContexts = new ArrayList(); - for (String txId : mAssets.keySet()) { - String asset = mAssets.get(txId); + Iterator iter = mAssets.iterator(); + while (iter.hasNext()) { + String asset = iter.next(); String[] fromAssets = new String[] {asset.toLowerCase(Locale.getDefault())}; String[] toAssets = new String[] {"usd"}; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java index 9bde88fa105..2df214d9a2c 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java @@ -86,6 +86,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -997,7 +998,7 @@ public class Utils { HashMap assets, HashMap assetsDecimals, AssetRatioController assetRatioController) { AssetsPricesHelper assetsPricesHelper = - new AssetsPricesHelper(assetRatioController, assets); + new AssetsPricesHelper(assetRatioController, new HashSet(assets.values())); assetsPricesHelper.fetchPrices(() -> { workWithTransactions(accountInfos, ethPrice, assetPrice, rvTransactions, callback, context, "", 0, pendingTxInfos, assets, assetsDecimals,