Merge pull request #20741 from brave/wallet_perf

android/brave_java_resources.gni

@@ -881,10 +881,10 @@ brave_java_resources = [
   "java/res/layout/fragment_create_account.xml",
   "java/res/layout/fragment_create_account.xml",
   "java/res/layout/fragment_create_custom_filters.xml",
+  "java/res/layout/fragment_creating_wallet.xml",
   "java/res/layout/fragment_cross_promotional_modal_dialog.xml",
   "java/res/layout/fragment_dapps_message.xml",
   "java/res/layout/fragment_dormant_users_engagement_dialog.xml",
-  "java/res/layout/fragment_download_component_progress.xml",
   "java/res/layout/fragment_encryption_key.xml",
   "java/res/layout/fragment_link_subscription_dialog.xml",
   "java/res/layout/fragment_market.xml",

android/brave_java_sources.gni

@@ -90,7 +90,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/brave_news/models/FeedItemsCard.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsUtil.java",
-  "../../brave/android/java/org/chromium/chrome/browser/component_updater/BraveComponentUpdater.java",
   "../../brave/android/java/org/chromium/chrome/browser/contextmenu/BraveChromeContextMenuPopulator.java",
   "../../brave/android/java/org/chromium/chrome/browser/crash/BravePureJavaExceptionReporter.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/AssetRatioServiceFactory.java",
@@ -158,8 +157,8 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignTransactionFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SiweMessageFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/BackupWalletFragment.java",
+  "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/CreatingWalletFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/CryptoOnboardingFragment.java",
-  "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/DownloadComponentProgressFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/RecoveryPhraseFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/RestoreWalletFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/SecurePasswordFragment.java",
@@ -210,7 +209,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/Validations.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletConstants.java",
-  "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstaller.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstallerUtil.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletUtils.java",

android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java

@@ -44,6 +44,7 @@
 import org.chromium.chrome.browser.crypto_wallet.fragments.PortfolioFragment;
 import org.chromium.chrome.browser.crypto_wallet.fragments.SwapBottomSheetDialogFragment;
 import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.BackupWalletFragment;
+import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.CreatingWalletFragment;
 import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.RecoveryPhraseFragment;
 import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.RestoreWalletFragment;
 import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.SecurePasswordFragment;
@@ -313,13 +314,23 @@ private void replaceNavigationFragments(int type, boolean doNavigate, boolean is
                                 getResources().getString(R.string.restore_crypto_account),
                                 restoreWalletFragment),
                         mCryptoWalletOnboardingViewPager.getCurrentItem() + 1);
+
+                CreatingWalletFragment creatingWalletFragment = new CreatingWalletFragment();
+                creatingWalletFragment.setOnNextPageListener(this);
+                mCryptoWalletOnboardingPagerAdapter.replaceWithNavigationItem(
+                        new NavigationItem(
+                                getResources()
+                                        .getString(R.string.your_wallet_is_restoring_page_title),
+                                creatingWalletFragment),
+                        mCryptoWalletOnboardingPagerAdapter.getCount());
             } else if (type == ONBOARDING_ACTION) {
                 List<NavigationItem> navigationItems = new ArrayList<>();
                 SecurePasswordFragment securePasswordFragment = new SecurePasswordFragment();
                 securePasswordFragment.setOnNextPageListener(this);
                 navigationItems.add(
                         new NavigationItem(getResources().getString(R.string.secure_your_crypto),
                                 securePasswordFragment));
+                addWalletCreatingPage(navigationItems, true);
                 addBackupWalletSequence(navigationItems, true);
                 mCryptoWalletOnboardingPagerAdapter.replaceWithNavigationItems(
                         navigationItems, mCryptoWalletOnboardingViewPager.getCurrentItem() + 1);
@@ -384,12 +395,24 @@ private void addBackupWalletSequence(
                         verifyRecoveryPhraseFragment));
     }
 
+    private void addWalletCreatingPage(List<NavigationItem> navigationItems, boolean isOnboarding) {
+        CreatingWalletFragment creatingWalletFragment = new CreatingWalletFragment();
+        creatingWalletFragment.setOnNextPageListener(this);
+        navigationItems.add(
+                new NavigationItem(
+                        getResources().getString(R.string.your_wallet_is_creating_page_title),
+                        creatingWalletFragment));
+    }
+
     public void showOnboardingLayout() {
         addRemoveSecureFlag(true);
         mCryptoOnboardingLayout.setVisibility(View.VISIBLE);
         mCryptoLayout.setVisibility(View.GONE);
 
         List<NavigationItem> navigationItems = new ArrayList<>();
+        // We don't need addWalletCreatingPage here, as showOnboardingLayout
+        // is invoked only when we didn't back up wallet initially and doing
+        // it later from `Backup your crypto wallet` bubble.
         addBackupWalletSequence(navigationItems, false);
 
         if (mCryptoWalletOnboardingPagerAdapter != null

android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/CreatingWalletFragment.java

@@ -0,0 +1,23 @@
+/* Copyright (c) 2023 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.chromium.chrome.R;
+
+/** Onboarding fragment for Brave Wallet which shows the spinner while wallet is created/restored */
+public class CreatingWalletFragment extends CryptoOnboardingFragment {
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_creating_wallet, container, false);
+        return view;
+    }
+}