From 1796008341f058a55300682eff1d88b8176a9181 Mon Sep 17 00:00:00 2001
From: Pavneet-Sing <psingh@brave.com>
Date: Fri, 16 Sep 2022 16:58:43 +0530
Subject: [PATCH]  fix(wallet): set previous network if no solana account
 created  - fix ratio/duration color on buy-send-swap and portfolio

---
 .../activities/BuySendSwapActivity.java              | 12 ++++++++----
 .../crypto_wallet_radiobutton_color_selector.xml     |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

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 a9e4f1914130..1779b92a49e2 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
@@ -114,6 +114,7 @@ public class BuySendSwapActivity extends BraveWalletBaseActivity
     private int radioSlippageToleranceCheckedId;
     private List<AccountInfo> mAccountInfos;
     private SendModel mSendModel;
+    private NetworkInfo[] mNetworks;
 
     public enum ActivityType {
         BUY(0),
@@ -671,7 +672,7 @@ private void populateBalance(String balance, boolean from) {
             getSendSwapQuota(true, false);
         }
     }
-    private void setSelected(NetworkInfo networkInfo, NetworkInfo[] networkInfos) {
+    private void setSelectedNetowrk(NetworkInfo networkInfo, NetworkInfo[] networkInfos) {
         if (isSameSelectedNetwork(networkInfo)) return;
         mNetworkSpinner.setSelection(getIndexOf(networkInfo, networkInfos));
     }
@@ -1507,14 +1508,14 @@ public void finishNativeInitialization() {
                 this, chainAllNetworksAllNetwork -> {
                     mCurrentChainId = chainAllNetworksAllNetwork.first;
                     mSelectedNetwork = chainAllNetworksAllNetwork.second;
-                    NetworkInfo[] networks = mActivityType != ActivityType.SEND
+                    mNetworks = mActivityType != ActivityType.SEND
                             ? mWalletModel.getCryptoModel()
                                       .getNetworkModel()
                                       .stripNoBuySwapNetworks(chainAllNetworksAllNetwork.third)
                             : chainAllNetworksAllNetwork.third;
 
-                    mNetworkAdapter.setNetworks(networks);
-                    setSelected(mSelectedNetwork, networks);
+                    mNetworkAdapter.setNetworks(mNetworks);
+                    setSelectedNetowrk(mSelectedNetwork, mNetworks);
 
                     mFromAssetText.setText(mSelectedNetwork.symbol);
                     mMarketLimitPriceText.setText(String.format(
@@ -1573,6 +1574,9 @@ mSelectedNetwork.symbol, getResources().getDisplayMetrics().density,
                                                 });
                                     })
                             .setNegativeButton(R.string.wallet_action_no, (dialog, which) -> {
+                                // update mNetworkSpinner to current network
+                                setSelectedNetowrk(mSelectedNetwork, mNetworks);
+
                                 mWalletModel.getCryptoModel()
                                         .getNetworkModel()
                                         .clearCreateAccountState();
diff --git a/android/java/res/color/crypto_wallet_radiobutton_color_selector.xml b/android/java/res/color/crypto_wallet_radiobutton_color_selector.xml
index 25f37f0c9e91..d1c0df35d69d 100644
--- a/android/java/res/color/crypto_wallet_radiobutton_color_selector.xml
+++ b/android/java/res/color/crypto_wallet_radiobutton_color_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:color="#FFFFFF"/>
-    <item android:state_checked="false" android:color="#495057"/>
-</selector>
\ No newline at end of file
+    <item android:state_checked="false" android:color="#84889C"/>
+</selector>