From 5c87a28dd4c15377235d5455fa08b0c60d24cdad Mon Sep 17 00:00:00 2001 From: wchen342 Date: Mon, 6 Dec 2021 12:38:17 +0200 Subject: [PATCH] Change default token in swap to BAT --- .../activities/BuySendSwapActivity.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java index c256cc35670..d1a97a33988 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java @@ -105,6 +105,7 @@ public class BuySendSwapActivity extends AsyncInitializationActivity private CameraSource mCameraSource; private CameraSourcePreview mCameraSourcePreview; + private boolean mInitialLayoutInflationComplete = false; public enum ActivityType { BUY(0), @@ -228,13 +229,15 @@ public class BuySendSwapActivity extends AsyncInitializationActivity TextView toBalanceText = findViewById(R.id.to_balance_text); TextView toAssetText = findViewById(R.id.to_asset_text); - toAssetText.setText("ETH"); + toAssetText.setText("BAT"); TextView marketPriceValueText = findViewById(R.id.market_price_value_text); onInitialLayoutInflationComplete(); adjustControls(); + + mInitialLayoutInflationComplete = true; } private class BuySendSwapUiInfo { @@ -773,6 +776,13 @@ public class BuySendSwapActivity extends AsyncInitializationActivity TabUtils.openUrlInNewTab(false, Utils.DEX_AGGREGATOR_URL); TabUtils.bringChromeTabbedActivityToTheTop(this); }); + if (mErcTokenRegistry != null && mCustomAccountAdapter != null) { + mErcTokenRegistry.getTokenBySymbol("BAT", token -> { + if (token != null) { + updateSwapToAsset(token.symbol, token); + } + }); + } } btnBuySendSwap.setOnClickListener(v -> { @@ -1381,6 +1391,16 @@ public class BuySendSwapActivity extends AsyncInitializationActivity updateBalance(accountTitles[0], false); } } + + // updateSwapToAsset needs mCustomAccountAdapter to be initialized + if (mErcTokenRegistry != null && mActivityType == ActivityType.SWAP + && mInitialLayoutInflationComplete) { + mErcTokenRegistry.getTokenBySymbol("BAT", token -> { + if (token != null) { + updateSwapToAsset(token.symbol, token); + } + }); + } }); } }