Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make asset the default swap from token; disallow swap to and from the same token

Browse Source
This commit is contained in:
wchen342
2022-01-11 13:57:03 +02:00
parent 15a1e53a5c
commit f420daf2f0
3 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/crypto_wallet/activities/AssetDetailActivity.java
+2 -2
View File
@@ -151,8 +151,8 @@ public class AssetDetailActivity extends AsyncInitializationActivity
btnSwap.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Utils.openBuySendSwapActivity(
AssetDetailActivity.this, BuySendSwapActivity.ActivityType.SWAP);
Utils.openBuySendSwapActivity(AssetDetailActivity.this,
BuySendSwapActivity.ActivityType.SWAP, mAssetSymbol);
}
});
android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java
+38 -19
View File
@@ -239,21 +239,18 @@ public class BuySendSwapActivity extends AsyncInitializationActivity
TextView fromBalanceText = findViewById(R.id.from_balance_text);
TextView fromAssetText = findViewById(R.id.from_asset_text);
fromAssetText.setText("ETH");
TextView toBalanceText = findViewById(R.id.to_balance_text);
TextView toAssetText = findViewById(R.id.to_asset_text);
toAssetText.setText("BAT");
TextView marketPriceValueText = findViewById(R.id.market_price_value_text);
mSlippageToleranceText = findViewById(R.id.slippage_tolerance_dropdown);
onInitialLayoutInflationComplete();
mInitialLayoutInflationComplete = true;
adjustControls();
mInitialLayoutInflationComplete = true;
}
private class BuySendSwapUiInfo {
@@ -496,6 +493,38 @@ public class BuySendSwapActivity extends AsyncInitializationActivity
checkBalanceShowError(response, errorResponse);
}
private void initSwapFromToAssets() {
final BlockchainToken eth = Utils.createEthereumBlockchainToken();
if (mBlockchainRegistry != null && mCustomAccountAdapter != null
&& mActivityType == ActivityType.SWAP && mInitialLayoutInflationComplete) {
String swapToAsset = "BAT";
// Swap from
String swapFromAssetSymbol = getIntent().getStringExtra("swapFromAssetSymbol");
if (swapFromAssetSymbol == null
|| swapFromAssetSymbol.equals(eth.symbol)) { // default swap from ETH
updateBuySendAsset(eth.symbol, eth);
} else {
mBlockchainRegistry.getTokenBySymbol(swapFromAssetSymbol, token -> {
if (token != null) {
updateBuySendAsset(token.symbol, token);
}
});
}
// Swap to
if (swapToAsset.equals(swapFromAssetSymbol)) { // swap from BAT
updateSwapToAsset(eth.symbol, eth);
} else {
mBlockchainRegistry.getTokenBySymbol(swapToAsset, token -> {
if (token != null) {
updateSwapToAsset(token.symbol, token);
}
});
}
}
}
private void checkBalanceShowError(SwapResponse response, String errorResponse) {
final Button btnBuySendSwap = findViewById(R.id.btn_buy_send_swap);
EditText fromValueText = findViewById(R.id.from_value_text);
@@ -909,13 +938,7 @@ public class BuySendSwapActivity extends AsyncInitializationActivity
TabUtils.openUrlInNewTab(false, Utils.DEX_AGGREGATOR_URL);
TabUtils.bringChromeTabbedActivityToTheTop(this);
});
if (mBlockchainRegistry != null && mCustomAccountAdapter != null) {
mBlockchainRegistry.getTokenBySymbol("BAT", token -> {
if (token != null) {
updateSwapToAsset(token.symbol, token);
}
});
}
initSwapFromToAssets();
}
btnBuySendSwap.setOnClickListener(v -> {
@@ -1420,6 +1443,9 @@ public class BuySendSwapActivity extends AsyncInitializationActivity
}
public void updateSwapToAsset(String asset, BlockchainToken blockchainToken) {
if (mCurrentBlockchainToken != null
&& mCurrentBlockchainToken.symbol.equals(blockchainToken.symbol))
return;
TextView assetToDropDown = findViewById(R.id.to_asset_text);
assetToDropDown.setText(asset);
mCurrentSwapToBlockchainToken = blockchainToken;
@@ -1636,14 +1662,7 @@ public class BuySendSwapActivity extends AsyncInitializationActivity
}
// updateSwapToAsset needs mCustomAccountAdapter to be initialized
if (mBlockchainRegistry != null && mActivityType == ActivityType.SWAP
&& mInitialLayoutInflationComplete) {
mBlockchainRegistry.getTokenBySymbol("BAT", token -> {
if (token != null) {
updateSwapToAsset(token.symbol, token);
}
});
}
initSwapFromToAssets();
});
}
}
android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
+8 -2
View File
@@ -192,14 +192,20 @@ public class Utils {
if (focusedView != null) imm.hideSoftInputFromWindow(focusedView.getWindowToken(), 0);
}
public static void openBuySendSwapActivity(
Activity activity, BuySendSwapActivity.ActivityType activityType) {
public static void openBuySendSwapActivity(Activity activity,
BuySendSwapActivity.ActivityType activityType, String swapFromAssetSymbol) {
assert activity != null;
Intent buySendSwapActivityIntent = new Intent(activity, BuySendSwapActivity.class);
buySendSwapActivityIntent.putExtra("activityType", activityType.getValue());
buySendSwapActivityIntent.putExtra("swapFromAssetSymbol", swapFromAssetSymbol);
activity.startActivity(buySendSwapActivityIntent);
}
public static void openBuySendSwapActivity(
Activity activity, BuySendSwapActivity.ActivityType activityType) {
openBuySendSwapActivity(activity, activityType, null);
}
public static void openAssetDetailsActivity(Activity activity, String chainId,
String assetSymbol, String assetName, String contractAddress, String assetLogo,
int assetDecimals) {