Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(wallet): set previous network if no solana account created #15118

Merged
merged 1 commit into from
Sep 19, 2022
Merged

fix(wallet): set previous network if no solana account created #15118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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));
}
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions android/java/res/color/crypto_wallet_radiobutton_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<item android:state_checked="false" android:color="#84889C"/>
</selector>