From 538091acb39161e0cb0b85e9b38fd65259238da7 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Fri, 10 Nov 2023 15:57:06 +0100
Subject: [PATCH] Open web Wallet instead of native version

---
 .../activities/BraveWalletActivity.java       | 32 +------------------
 .../crypto_wallet/util/WalletUtils.java       |  2 +-
 android/java/res/menu/wallet_search.xml       |  5 ---
 .../android/strings/android_brave_strings.grd |  3 --
 4 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java
index 42d2e24b8afd..8918ef82108c 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java
@@ -5,10 +5,6 @@
 
 package org.chromium.chrome.browser.crypto_wallet.activities;
 
-import static org.chromium.chrome.browser.crypto_wallet.adapters.CryptoFragmentPageAdapter.ACCOUNTS_FRAGMENT_POSITION;
-import static org.chromium.chrome.browser.crypto_wallet.adapters.CryptoFragmentPageAdapter.MARKET_FRAGMENT_POSITION;
-import static org.chromium.chrome.browser.crypto_wallet.adapters.CryptoFragmentPageAdapter.PORTFOLIO_FRAGMENT_POSITION;
-import static org.chromium.chrome.browser.crypto_wallet.adapters.CryptoFragmentPageAdapter.TRANSACTIONS_ACTIVITY_FRAGMENT_POSITION;
 import static org.chromium.chrome.browser.crypto_wallet.util.Utils.ONBOARDING_ACTION;
 import static org.chromium.chrome.browser.crypto_wallet.util.Utils.ONBOARDING_FIRST_PAGE_ACTION;
 import static org.chromium.chrome.browser.crypto_wallet.util.Utils.RESTORE_WALLET_ACTION;
@@ -111,8 +107,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             }
         } else if (item.getItemId() == R.id.help_center) {
             WalletUtils.openWalletHelpCenter(this);
-        } else if (item.getItemId() == R.id.open_web_wallet) {
-            WalletUtils.openWebWallet();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -351,31 +345,7 @@ private void showMainLayout() {
         addRemoveSecureFlag(false);
 
         mCryptoOnboardingLayout.setVisibility(View.GONE);
-        mCryptoLayout.setVisibility(View.VISIBLE);
-
-        mBottomNavigationView.setOnItemSelectedListener(menuItem -> {
-            final int menuItemId = menuItem.getItemId();
-            if (menuItemId == R.id.action_wallet_portfolio) {
-                mViewPager.setCurrentItem(PORTFOLIO_FRAGMENT_POSITION, true);
-            } else if (menuItemId == R.id.action_wallet_activity) {
-                mViewPager.setCurrentItem(TRANSACTIONS_ACTIVITY_FRAGMENT_POSITION, true);
-            } else if (menuItemId == R.id.action_wallet_accounts) {
-                mViewPager.setCurrentItem(ACCOUNTS_FRAGMENT_POSITION, true);
-            } else if (menuItemId == R.id.action_wallet_explore) {
-                mViewPager.setCurrentItem(MARKET_FRAGMENT_POSITION, true);
-            }
-            return true;
-        });
-
-        if (mKeyringService != null) {
-            mKeyringService.isWalletBackedUp(backed_up -> {
-                if (!backed_up) {
-                    showWalletBackupBanner();
-                } else {
-                    findViewById(R.id.wallet_backup_banner).setVisibility(View.GONE);
-                }
-            });
-        }
+        WalletUtils.openWebWallet();
     }
 
     private void addBackupWalletSequence(
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletUtils.java
index cd8f0b9a76a0..bcfeb0b88f6a 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletUtils.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletUtils.java
@@ -39,7 +39,7 @@ public class WalletUtils {
     private static final String ACCOUNT_INFO = "accountInfo";
     private static final String BLOCKCHAIN_TOKEN = "blockchainToken";
     private static final String NETWORK_INFO = "networkInfo";
-    private static String TAG = "WalletUtils";
+    private static final String TAG = "WalletUtils";
 
     private static String getNewAccountPrefixForCoin(@CoinType.EnumType int coinType) {
         switch (coinType) {
diff --git a/android/java/res/menu/wallet_search.xml b/android/java/res/menu/wallet_search.xml
index 73ebb56bc6e3..884ced991ce5 100644
--- a/android/java/res/menu/wallet_search.xml
+++ b/android/java/res/menu/wallet_search.xml
@@ -23,9 +23,4 @@
       android:title="@string/brave_wallet_help_center"
       app:iconTint="@color/wallet_text_color"
       app:showAsAction="never" />
-  <item android:id="@+id/open_web_wallet"
-      android:icon="@drawable/ic_crypto_wallets"
-      android:title="@string/open_web_wallet"
-      app:iconTint="@color/wallet_text_color"
-      app:showAsAction="never" />
 </menu>
diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
index 31fd913c128c..ffe2c0de3670 100644
--- a/browser/ui/android/strings/android_brave_strings.grd
+++ b/browser/ui/android/strings/android_brave_strings.grd
@@ -4082,9 +4082,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne
     <message name="IDS_BRAVE_LEO_CONFIRM_TEXT" desc="Text for Leo confirm button text.">
       Confirm
     </message>  
-    <message name="IDS_OPEN_WEB_WALLET" desc="Label for open in browser web wallet action">
-      Open web wallet
-    </message>
     <message name="IDS_ELLIPSIS_TEXT" desc="Generic ellipsis text" translateable="false">
       ...
     </message>