From c09d4d8e89999d2d5db697cb3bdb2a697bbe05d8 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Thu, 6 Jan 2022 16:46:33 -0500 Subject: [PATCH] Revert "Merge pull request #11669 from brave/reset-wallet" This reverts commit be2402658cf19b7289504d970030e8bf96fd468a, reversing changes made to c1721b6db35eea22fa1b5faa163cee18329f2df7. --- android/brave_java_sources.gni | 1 - .../ERCTokenRegistryFactory.java | 1 + .../observers/KeyringControllerObserver.java | 3 - .../crypto_wallet/util/WalletNativeUtils.java | 21 ------- .../settings/BraveWalletResetPreference.java | 49 ++++++++++++--- app/brave_generated_resources.grd | 3 - browser/brave_wallet/BUILD.gn | 2 - browser/brave_wallet/android/sources.gni | 1 - .../android/wallet_native_utils_android.cc | 24 -------- browser/brave_wallet/brave_wallet_reset.cc | 36 ----------- browser/brave_wallet/brave_wallet_reset.h | 21 ------- .../brave_wallet_service_unittest.cc | 36 ----------- .../keyring_controller_unittest.cc | 16 ++--- .../brave_wallet_page/brave_wallet_page.js | 1 - .../brave_default_extensions_handler.cc | 7 ++- build/android/BUILD.gn | 1 - .../settings_localized_strings_provider.cc | 1 - .../browser/brave_wallet_prefs.cc | 20 ++---- .../brave_wallet/browser/brave_wallet_prefs.h | 5 +- .../browser/brave_wallet_provider_impl.h | 1 - .../browser/brave_wallet_service.cc | 22 +------ .../browser/brave_wallet_service.h | 7 --- .../browser/eth_json_rpc_controller.cc | 16 ----- .../browser/eth_json_rpc_controller.h | 5 -- .../eth_json_rpc_controller_unittest.cc | 61 +++++++------------ .../browser/eth_pending_tx_tracker.cc | 6 -- .../browser/eth_pending_tx_tracker.h | 1 - .../brave_wallet/browser/eth_tx_controller.cc | 13 ---- .../brave_wallet/browser/eth_tx_controller.h | 6 -- .../browser/eth_tx_controller_unittest.cc | 26 -------- .../browser/keyring_controller.cc | 6 +- .../brave_wallet/common/brave_wallet.mojom | 16 +---- .../common/actions/wallet_actions.ts | 1 - .../brave_wallet_ui/common/async/handlers.ts | 4 -- .../common/wallet_api_proxy.ts | 3 - 35 files changed, 78 insertions(+), 365 deletions(-) delete mode 100644 android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java delete mode 100644 browser/brave_wallet/android/wallet_native_utils_android.cc delete mode 100644 browser/brave_wallet/brave_wallet_reset.cc delete mode 100644 browser/brave_wallet/brave_wallet_reset.h diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index a9181518ba58..a5b20343049e 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -117,7 +117,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/TokenUtils.java", "../../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/WalletNativeUtils.java", "../../brave/android/java/org/chromium/chrome/browser/custom_layout/HeightWrappingViewPager.java", "../../brave/android/java/org/chromium/chrome/browser/custom_layout/NonSwipeableViewPager.java", "../../brave/android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java", diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/ERCTokenRegistryFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/ERCTokenRegistryFactory.java index 259e0e00b4e7..b396358c7b0c 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/ERCTokenRegistryFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/ERCTokenRegistryFactory.java @@ -5,6 +5,7 @@ package org.chromium.chrome.browser.crypto_wallet; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.NativeMethods; import org.chromium.brave_wallet.mojom.ErcTokenRegistry; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/observers/KeyringControllerObserver.java b/android/java/org/chromium/chrome/browser/crypto_wallet/observers/KeyringControllerObserver.java index eafb4f2e94d1..460ea17cd959 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/observers/KeyringControllerObserver.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/observers/KeyringControllerObserver.java @@ -16,9 +16,6 @@ default void keyringCreated() {} @Override default void keyringRestored() {} - @Override - default void keyringReset() {} - @Override default void locked() {} diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java deleted file mode 100644 index 5b789eee2156..000000000000 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2021 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 http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.crypto_wallet.util; - -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; - -@JNINamespace("chrome::android") -public class WalletNativeUtils { - public static void resetWallet() { - WalletNativeUtilsJni.get().resetWallet(); - } - - @NativeMethods - interface Natives { - void resetWallet(); - } -} diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java index 9710a0aeb638..fea9539e793e 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java @@ -25,22 +25,26 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Log; +import org.chromium.brave_wallet.mojom.KeyringController; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.app.BraveActivity; +import org.chromium.chrome.browser.crypto_wallet.KeyringControllerFactory; import org.chromium.chrome.browser.crypto_wallet.util.Utils; -import org.chromium.chrome.browser.crypto_wallet.util.WalletNativeUtils; +import org.chromium.mojo.bindings.ConnectionErrorHandler; +import org.chromium.mojo.system.MojoException; import org.chromium.ui.KeyboardVisibilityDelegate; /** * The preference used to reset Brave Wallet. */ public class BraveWalletResetPreference - extends Preference implements Preference.OnPreferenceClickListener { + extends Preference implements Preference.OnPreferenceClickListener, ConnectionErrorHandler { private String TAG = "BraveWalletResetPreference"; private int mPrefAccentColor; private final String mConfirmationPhrase; + private KeyringController mKeyringController; /** * Constructor for BraveWalletResetPreference. @@ -54,6 +58,8 @@ public BraveWalletResetPreference(Context context, AttributeSet attrs) { mConfirmationPhrase = resources.getString(R.string.brave_wallet_reset_settings_confirmation_phrase); setOnPreferenceClickListener(this); + + InitKeyringController(); } @Override @@ -72,6 +78,9 @@ public boolean onPreferenceClick(Preference preference) { @Override public void onDetached() { super.onDetached(); + if (mKeyringController != null) { + mKeyringController.close(); + } } private void showBraveWalletResetDialog() { @@ -88,15 +97,20 @@ private void showBraveWalletResetDialog() { @Override public void onClick(DialogInterface dialog, int button) { if (button == AlertDialog.BUTTON_POSITIVE) { - String inputText = input.getText().toString().trim(); - if (TextUtils.equals(inputText, mConfirmationPhrase)) { - Log.w(TAG, "Reset"); - WalletNativeUtils.resetWallet(); - Utils.setCryptoOnboarding(true); + if (mKeyringController != null) { + String inputText = input.getText().toString().trim(); + if (TextUtils.equals(inputText, mConfirmationPhrase)) { + Log.w(TAG, "Reset"); + mKeyringController.reset(); + Utils.setCryptoOnboarding(true); + } + mKeyringController.close(); + + // Force clear activity stack + launchBraveTabbedActivity(); + } else { + Log.w(TAG, "mKeyringController is null"); } - - // Force clear activity stack - launchBraveTabbedActivity(); } else { dialog.dismiss(); } @@ -139,6 +153,21 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { }); } + @Override + public void onConnectionError(MojoException e) { + mKeyringController.close(); + mKeyringController = null; + InitKeyringController(); + } + + private void InitKeyringController() { + if (mKeyringController != null) { + return; + } + + mKeyringController = KeyringControllerFactory.getInstance().getKeyringController(this); + } + private void launchBraveTabbedActivity() { Intent intent = new Intent(BraveActivity.getChromeTabbedActivity(), ChromeTabbedActivity.class); diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index 2f16a091945b..63c212f64346 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -1000,9 +1000,6 @@ Are you sure you want to do this? Are you sure you want to reset your wallet? If your wallet is not backed up, resetting will cause you to lose all account data (including any associated funds). Type "$1Yes" to confirm. - - Your wallet was reset. - Yes diff --git a/browser/brave_wallet/BUILD.gn b/browser/brave_wallet/BUILD.gn index fd02829954b5..17c127df9240 100644 --- a/browser/brave_wallet/BUILD.gn +++ b/browser/brave_wallet/BUILD.gn @@ -8,8 +8,6 @@ source_set("brave_wallet") { "asset_ratio_controller_factory.h", "brave_wallet_context_utils.cc", "brave_wallet_context_utils.h", - "brave_wallet_reset.cc", - "brave_wallet_reset.h", "brave_wallet_service_factory.cc", "brave_wallet_service_factory.h", "erc_token_images_source.cc", diff --git a/browser/brave_wallet/android/sources.gni b/browser/brave_wallet/android/sources.gni index 76282c68e1a0..c6f5d444afdb 100644 --- a/browser/brave_wallet/android/sources.gni +++ b/browser/brave_wallet/android/sources.gni @@ -6,5 +6,4 @@ brave_browser_brave_wallet_android_sources = [ "//brave/browser/brave_wallet/android/eth_tx_controller_factory_android.cc", "//brave/browser/brave_wallet/android/keyring_controller_factory_android.cc", "//brave/browser/brave_wallet/android/swap_controller_factory_android.cc", - "//brave/browser/brave_wallet/android/wallet_native_utils_android.cc", ] diff --git a/browser/brave_wallet/android/wallet_native_utils_android.cc b/browser/brave_wallet/android/wallet_native_utils_android.cc deleted file mode 100644 index 02568d458407..000000000000 --- a/browser/brave_wallet/android/wallet_native_utils_android.cc +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2021 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 http://mozilla.org/MPL/2.0/. */ - -#include "base/android/jni_android.h" -#include "base/logging.h" -#include "brave/browser/brave_wallet/brave_wallet_reset.h" -#include "brave/build/android/jni_headers/WalletNativeUtils_jni.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/profiles/profile_manager.h" - -namespace chrome { -namespace android { - -static void JNI_WalletNativeUtils_ResetWallet(JNIEnv* env) { - auto* profile = ProfileManager::GetActiveUserProfile(); - DCHECK(profile); - - brave_wallet::ResetWallet(profile); -} - -} // namespace android -} // namespace chrome diff --git a/browser/brave_wallet/brave_wallet_reset.cc b/browser/brave_wallet/brave_wallet_reset.cc deleted file mode 100644 index a97f0817f8d0..000000000000 --- a/browser/brave_wallet/brave_wallet_reset.cc +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (c) 2021 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 http://mozilla.org/MPL/2.0/. */ - -#include "brave/browser/brave_wallet/brave_wallet_reset.h" -#include "brave/browser/brave_wallet/brave_wallet_service_factory.h" -#include "brave/browser/brave_wallet/eth_tx_controller_factory.h" -#include "brave/browser/brave_wallet/keyring_controller_factory.h" -#include "brave/browser/brave_wallet/rpc_controller_factory.h" -#include "brave/components/brave_wallet/browser/brave_wallet_service.h" -#include "brave/components/brave_wallet/browser/eth_json_rpc_controller.h" -#include "brave/components/brave_wallet/browser/eth_tx_controller.h" -#include "brave/components/brave_wallet/browser/keyring_controller.h" - -namespace brave_wallet { - -void ResetWallet(content::BrowserContext* context) { - auto* eth_tx_controller = - brave_wallet::EthTxControllerFactory::GetControllerForContext(context); - eth_tx_controller->Reset(); - - auto* rpc_controller = - brave_wallet::RpcControllerFactory::GetControllerForContext(context); - rpc_controller->Reset(); - - auto* brave_wallet_service = - brave_wallet::BraveWalletServiceFactory::GetServiceForContext(context); - brave_wallet_service->Reset(); - - auto* keyring_controller = - brave_wallet::KeyringControllerFactory::GetControllerForContext(context); - keyring_controller->Reset(); -} - -} // namespace brave_wallet diff --git a/browser/brave_wallet/brave_wallet_reset.h b/browser/brave_wallet/brave_wallet_reset.h deleted file mode 100644 index 8634167aec33..000000000000 --- a/browser/brave_wallet/brave_wallet_reset.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2021 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 http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_RESET_H_ -#define BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_RESET_H_ - -#include "content/public/browser/browser_context.h" - -namespace content { -class BrowserContext; -} // namespace content - -namespace brave_wallet { - -void ResetWallet(content::BrowserContext* context); - -} // namespace brave_wallet - -#endif // BRAVE_BROWSER_BRAVE_WALLET_BRAVE_WALLET_RESET_H_ diff --git a/browser/brave_wallet/brave_wallet_service_unittest.cc b/browser/brave_wallet/brave_wallet_service_unittest.cc index 4cde0919b018..15093b08638d 100644 --- a/browser/brave_wallet/brave_wallet_service_unittest.cc +++ b/browser/brave_wallet/brave_wallet_service_unittest.cc @@ -1525,40 +1525,4 @@ TEST_F(BraveWalletServiceUnitTest, GetUserAsset) { mojom::kRopstenChainId)); } -TEST_F(BraveWalletServiceUnitTest, Reset) { - SetDefaultBaseCurrency("CAD"); - SetDefaultBaseCryptocurrency("ETH"); - mojom::ERCTokenPtr token1 = GetToken1(); - bool callback_called; - bool success; - AddUserAsset(token1.Clone(), "0x1", &callback_called, &success); - EXPECT_TRUE(callback_called); - EXPECT_TRUE(success); - EXPECT_TRUE(GetPrefs()->HasPrefPath(kBraveWalletUserAssets)); - EXPECT_TRUE(GetPrefs()->HasPrefPath(kDefaultBaseCurrency)); - EXPECT_TRUE(GetPrefs()->HasPrefPath(kDefaultBaseCryptocurrency)); - std::string address = "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c"; - std::string message = "0xAB"; - auto request1 = mojom::SignMessageRequest::New( - 1, address, std::string(message.begin(), message.end())); - service_->AddSignMessageRequest( - std::move(request1), - base::BindLambdaForTesting( - [](bool, const std::string&, const std::string&) {})); - mojom::ERCTokenPtr custom_token = - mojom::ERCToken::New("0x6b175474e89094C44Da98b954eEdeAC495271d1e", - "COLOR", "", true, false, "COLOR", 18, true, ""); - AddSuggestToken(custom_token.Clone(), custom_token.Clone(), true); - - service_->Reset(); - - EXPECT_FALSE(GetPrefs()->HasPrefPath(kBraveWalletUserAssets)); - EXPECT_FALSE(GetPrefs()->HasPrefPath(kDefaultBaseCurrency)); - EXPECT_FALSE(GetPrefs()->HasPrefPath(kDefaultBaseCryptocurrency)); - EXPECT_TRUE(service_->sign_message_requests_.empty()); - EXPECT_TRUE(service_->sign_message_callbacks_.empty()); - EXPECT_TRUE(service_->add_suggest_token_callbacks_.empty()); - EXPECT_TRUE(service_->add_suggest_token_requests_.empty()); -} - } // namespace brave_wallet diff --git a/browser/brave_wallet/keyring_controller_unittest.cc b/browser/brave_wallet/keyring_controller_unittest.cc index dbfd300085c7..fb0c2be80fc8 100644 --- a/browser/brave_wallet/keyring_controller_unittest.cc +++ b/browser/brave_wallet/keyring_controller_unittest.cc @@ -60,7 +60,6 @@ class TestKeyringControllerObserver // TODO(bbondy): We should be testing all of these observer events void KeyringCreated() override {} void KeyringRestored() override {} - void KeyringReset() override { keyringResetFired_ = true; } void Locked() override {} void Unlocked() override {} void BackedUp() override {} @@ -74,7 +73,6 @@ class TestKeyringControllerObserver bool AutoLockMinutesChangedFired() { return autoLockMinutesChangedFired_; } bool SelectedAccountChangedFired() { return selectedAccountChangedFired_; } bool AccountsChangedFired() { return accountsChangedFired_; } - bool KeyringResetFired() { return keyringResetFired_; } mojo::PendingRemote GetReceiver() { @@ -85,14 +83,12 @@ class TestKeyringControllerObserver autoLockMinutesChangedFired_ = false; selectedAccountChangedFired_ = false; accountsChangedFired_ = false; - keyringResetFired_ = false; } private: bool autoLockMinutesChangedFired_ = false; bool selectedAccountChangedFired_ = false; bool accountsChangedFired_ = false; - bool keyringResetFired_ = false; mojo::Receiver observer_receiver_{this}; }; @@ -854,9 +850,6 @@ TEST_F(KeyringControllerUnitTest, LockAndUnlock) { TEST_F(KeyringControllerUnitTest, Reset) { KeyringController controller(GetPrefs()); HDKeyring* keyring = controller.CreateKeyring(kDefaultKeyringId, "brave"); - TestKeyringControllerObserver observer; - controller.AddObserver(observer.GetReceiver()); - keyring->AddAccounts(); // Trigger account number saving controller.Lock(); @@ -868,18 +861,17 @@ TEST_F(KeyringControllerUnitTest, Reset) { GetPrefs()->Set(kBraveWalletCustomNetworks, base::ListValue()); GetPrefs()->SetString(kBraveWalletCurrentChainId, brave_wallet::mojom::kMainnetChainId); - EXPECT_TRUE(controller.IsKeyringCreated(kDefaultKeyringId)); + EXPECT_TRUE(GetPrefs()->HasPrefPath(kBraveWalletCustomNetworks)); + EXPECT_TRUE(GetPrefs()->HasPrefPath(kBraveWalletCurrentChainId)); controller.Reset(); EXPECT_FALSE(HasPrefForKeyring(kPasswordEncryptorSalt, "default")); EXPECT_FALSE(HasPrefForKeyring(kPasswordEncryptorNonce, "default")); EXPECT_FALSE(HasPrefForKeyring(kEncryptedMnemonic, "default")); EXPECT_FALSE(GetPrefs()->HasPrefPath(kBraveWalletKeyrings)); + EXPECT_FALSE(GetPrefs()->HasPrefPath(kBraveWalletCustomNetworks)); + EXPECT_FALSE(GetPrefs()->HasPrefPath(kBraveWalletCurrentChainId)); EXPECT_EQ(controller.default_keyring_, nullptr); EXPECT_EQ(controller.encryptor_, nullptr); - EXPECT_FALSE(controller.IsKeyringCreated(kDefaultKeyringId)); - // Keyring observer fire - base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(observer.KeyringResetFired()); } TEST_F(KeyringControllerUnitTest, BackupComplete) { diff --git a/browser/resources/settings/brave_wallet_page/brave_wallet_page.js b/browser/resources/settings/brave_wallet_page/brave_wallet_page.js index c24775c6a474..871bd4e32beb 100644 --- a/browser/resources/settings/brave_wallet_page/brave_wallet_page.js +++ b/browser/resources/settings/brave_wallet_page/brave_wallet_page.js @@ -154,7 +154,6 @@ class SettingsBraveWalletPage extends SettingsBraveWalletPageBase { if (window.prompt(message) !== this.i18n('walletResetConfirmationPhrase')) return this.browserProxy_.resetWallet() - window.alert(this.i18n('walletResetConfirmed')) } } diff --git a/browser/ui/webui/settings/brave_default_extensions_handler.cc b/browser/ui/webui/settings/brave_default_extensions_handler.cc index 43ab98294ae8..d4eddedee10b 100644 --- a/browser/ui/webui/settings/brave_default_extensions_handler.cc +++ b/browser/ui/webui/settings/brave_default_extensions_handler.cc @@ -11,9 +11,10 @@ #include "base/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "brave/browser/brave_wallet/brave_wallet_reset.h" +#include "brave/browser/brave_wallet/keyring_controller_factory.h" #include "brave/browser/extensions/brave_component_loader.h" #include "brave/common/pref_names.h" +#include "brave/components/brave_wallet/browser/keyring_controller.h" #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h" #include "brave/components/decentralized_dns/buildflags/buildflags.h" #include "brave/components/ipfs/buildflags/buildflags.h" @@ -206,7 +207,9 @@ void BraveDefaultExtensionsHandler::GetRestartNeeded( void BraveDefaultExtensionsHandler::ResetWallet( base::Value::ConstListView args) { - brave_wallet::ResetWallet(profile_); + auto* keyring_controller = + brave_wallet::KeyringControllerFactory::GetControllerForContext(profile_); + keyring_controller->Reset(); } void BraveDefaultExtensionsHandler::SetWebTorrentEnabled( diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn index bff2d0c426fe..454f8d288a28 100755 --- a/build/android/BUILD.gn +++ b/build/android/BUILD.gn @@ -189,7 +189,6 @@ generate_jni("jni_headers") { "//brave/android/java/org/chromium/chrome/browser/crypto_wallet/EthTxControllerFactory.java", "//brave/android/java/org/chromium/chrome/browser/crypto_wallet/KeyringControllerFactory.java", "//brave/android/java/org/chromium/chrome/browser/crypto_wallet/SwapControllerFactory.java", - "//brave/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java", "//brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java", "//brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java", "//brave/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java", diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index a077632fd32c..73031b70944d 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -408,7 +408,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, {"ipfsKeyExportError", IDS_SETTINGS_IPNS_KEYS_EXPORT_ERROR}, {"resetWallet", IDS_SETTINGS_WALLET_RESET}, {"walletResetConfirmation", IDS_SETTINGS_WALLET_RESET_CONFIRMATION}, - {"walletResetConfirmed", IDS_SETTINGS_WALLET_RESET_CONFIRMED}, {"walletNetworksLinkTitle", IDS_SETTINGS_WALLET_NETWORKS_ITEM}, {"walletAddNetworkDialogTitle", IDS_SETTINGS_WALLET_ADD_NETWORK_TITLE}, {"walletAddNetworkInvalidURLInput", diff --git a/components/brave_wallet/browser/brave_wallet_prefs.cc b/components/brave_wallet/browser/brave_wallet_prefs.cc index da888e2694b1..6586382b265a 100644 --- a/components/brave_wallet/browser/brave_wallet_prefs.cc +++ b/components/brave_wallet/browser/brave_wallet_prefs.cc @@ -103,28 +103,16 @@ void RegisterProfilePrefsForMigration( static_cast(mojom::DefaultWallet::BraveWalletPreferExtension)); } -void ClearEthJsonRpcControllerProfilePrefs(PrefService* prefs) { +void ClearProfilePrefs(PrefService* prefs) { DCHECK(prefs); prefs->ClearPref(kBraveWalletCustomNetworks); prefs->ClearPref(kBraveWalletCurrentChainId); - prefs->ClearPref(kSupportEip1559OnLocalhostChain); -} - -void ClearKeyringControllerProfilePrefs(PrefService* prefs) { - DCHECK(prefs); + prefs->ClearPref(kBraveWalletTransactions); + prefs->ClearPref(kBraveWalletUserAssets); prefs->ClearPref(kBraveWalletKeyrings); prefs->ClearPref(kBraveWalletAutoLockMinutes); prefs->ClearPref(kBraveWalletSelectedAccount); -} - -void ClearEthTxControllerProfilePrefs(PrefService* prefs) { - DCHECK(prefs); - prefs->ClearPref(kBraveWalletTransactions); -} - -void ClearBraveWalletServicePrefs(PrefService* prefs) { - DCHECK(prefs); - prefs->ClearPref(kBraveWalletUserAssets); + prefs->ClearPref(kSupportEip1559OnLocalhostChain); prefs->ClearPref(kDefaultBaseCurrency); prefs->ClearPref(kDefaultBaseCryptocurrency); } diff --git a/components/brave_wallet/browser/brave_wallet_prefs.h b/components/brave_wallet/browser/brave_wallet_prefs.h index 7a0797184d04..b01516b3c0f7 100644 --- a/components/brave_wallet/browser/brave_wallet_prefs.h +++ b/components/brave_wallet/browser/brave_wallet_prefs.h @@ -17,10 +17,7 @@ namespace brave_wallet { void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); void RegisterProfilePrefsForMigration( user_prefs::PrefRegistrySyncable* registry); -void ClearEthJsonRpcControllerProfilePrefs(PrefService* prefs); -void ClearKeyringControllerProfilePrefs(PrefService* prefs); -void ClearEthTxControllerProfilePrefs(PrefService* prefs); -void ClearBraveWalletServicePrefs(PrefService* prefs); +void ClearProfilePrefs(PrefService* prefs); void MigrateObsoleteProfilePrefs(PrefService* prefs); } // namespace brave_wallet diff --git a/components/brave_wallet/browser/brave_wallet_provider_impl.h b/components/brave_wallet/browser/brave_wallet_provider_impl.h index 1d7f5818e657..683d9c81cad7 100644 --- a/components/brave_wallet/browser/brave_wallet_provider_impl.h +++ b/components/brave_wallet/browser/brave_wallet_provider_impl.h @@ -202,7 +202,6 @@ class BraveWalletProviderImpl final // KeyringControllerObserver void KeyringCreated() override {} void KeyringRestored() override {} - void KeyringReset() override {} void Locked() override; void Unlocked() override; void BackedUp() override {} diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc index 99bb67ef5a26..aa6c4c5ab1f8 100644 --- a/components/brave_wallet/browser/brave_wallet_service.cc +++ b/components/brave_wallet/browser/brave_wallet_service.cc @@ -12,7 +12,6 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "brave/components/brave_stats/browser/brave_stats_updater_util.h" -#include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/erc_token_registry.h" #include "brave/components/brave_wallet/browser/keyring_controller.h" @@ -756,7 +755,7 @@ void BraveWalletService::NotifyAddSuggestTokenRequestsProcessed( } } -void BraveWalletService::CancelAllSuggestedTokenCallbacks() { +void BraveWalletService::OnNetworkChanged() { add_suggest_token_requests_.clear(); // Reject pending suggest token requests when network changed. for (auto& callback : add_suggest_token_callbacks_) @@ -766,23 +765,4 @@ void BraveWalletService::CancelAllSuggestedTokenCallbacks() { add_suggest_token_callbacks_.clear(); } -void BraveWalletService::CancelAllSignMessageCallbacks() { - while (!sign_message_requests_.empty()) { - auto callback = std::move(sign_message_callbacks_.front()); - sign_message_requests_.pop_front(); - sign_message_callbacks_.pop_front(); - std::move(callback).Run(false, std::string(), std::string()); - } -} - -void BraveWalletService::OnNetworkChanged() { - CancelAllSuggestedTokenCallbacks(); -} - -void BraveWalletService::Reset() { - ClearBraveWalletServicePrefs(prefs_); - CancelAllSuggestedTokenCallbacks(); - CancelAllSignMessageCallbacks(); -} - } // namespace brave_wallet diff --git a/components/brave_wallet/browser/brave_wallet_service.h b/components/brave_wallet/browser/brave_wallet_service.h index 5a65376d9f2f..38385f606094 100644 --- a/components/brave_wallet/browser/brave_wallet_service.h +++ b/components/brave_wallet/browser/brave_wallet_service.h @@ -119,10 +119,6 @@ class BraveWalletService : public KeyedService, // BraveWalletServiceDelegate::Observer: void OnActiveOriginChanged(const std::string& origin) override; - // Resets things back to the original state of BraveWalletService. - // To be used when the Wallet is reset / erased - void Reset() override; - void RecordWalletUsage(base::Time wallet_last_used); void AddSignMessageRequest(mojom::SignMessageRequestPtr request, @@ -138,7 +134,6 @@ class BraveWalletService : public KeyedService, FRIEND_TEST_ALL_PREFIXES(BraveWalletServiceUnitTest, AddSuggestToken); FRIEND_TEST_ALL_PREFIXES(BraveWalletServiceUnitTest, GetUserAsset); FRIEND_TEST_ALL_PREFIXES(BraveWalletServiceUnitTest, ImportFromMetaMask); - FRIEND_TEST_ALL_PREFIXES(BraveWalletServiceUnitTest, Reset); void OnDefaultWalletChanged(); void OnDefaultBaseCurrencyChanged(); @@ -169,8 +164,6 @@ class BraveWalletService : public KeyedService, bool is_erc721, const std::string& chain_id); void OnNetworkChanged(); - void CancelAllSuggestedTokenCallbacks(); - void CancelAllSignMessageCallbacks(); base::circular_deque sign_message_requests_; base::circular_deque sign_message_callbacks_; diff --git a/components/brave_wallet/browser/eth_json_rpc_controller.cc b/components/brave_wallet/browser/eth_json_rpc_controller.cc index c2f0bd7ac81e..569751a0efb7 100644 --- a/components/brave_wallet/browser/eth_json_rpc_controller.cc +++ b/components/brave_wallet/browser/eth_json_rpc_controller.cc @@ -11,7 +11,6 @@ #include "base/environment.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" -#include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/eth_data_builder.h" #include "brave/components/brave_wallet/browser/eth_requests.h" @@ -1210,19 +1209,4 @@ bool EthJsonRpcController::AddSwitchEthereumChainRequest( return true; } -void EthJsonRpcController::Reset() { - ClearEthJsonRpcControllerProfilePrefs(prefs_); - SetNetwork(prefs_->GetString(kBraveWalletCurrentChainId)); - - add_chain_pending_requests_.clear(); - switch_chain_requests_.clear(); - // Reject pending suggest token requests when network changed. - for (auto& callback : switch_chain_callbacks_) { - std::move(callback.second) - .Run(mojom::ProviderError::kUserRejectedRequest, - l10n_util::GetStringUTF8(IDS_WALLET_USER_REJECTED_REQUEST)); - } - switch_chain_callbacks_.clear(); -} - } // namespace brave_wallet diff --git a/components/brave_wallet/browser/eth_json_rpc_controller.h b/components/brave_wallet/browser/eth_json_rpc_controller.h index 0535c98d250a..b82119cef6b0 100644 --- a/components/brave_wallet/browser/eth_json_rpc_controller.h +++ b/components/brave_wallet/browser/eth_json_rpc_controller.h @@ -190,10 +190,6 @@ class EthJsonRpcController : public KeyedService, const std::string& account_address, GetERC721TokenBalanceCallback callback) override; - // Resets things back to the original state of BraveWalletService. - // To be used when the Wallet is reset / erased - void Reset() override; - using GetSupportsInterfaceCallback = base::OnceCallback values; + brave_wallet::mojom::EthereumChain chain( + "0x1", "chain_name", {"https://url1.com"}, {"https://url1.com"}, + {"https://url1.com"}, "symbol_name", "symbol", 11, false); + auto chain_ptr = chain.Clone(); + values.push_back(brave_wallet::EthereumChainToValue(chain_ptr)); + UpdateCustomNetworks(prefs(), &values); + + std::vector custom_chains; + GetAllCustomChains(prefs(), &custom_chains); + ASSERT_FALSE(custom_chains.empty()); + custom_chains.clear(); + ASSERT_TRUE(custom_chains.empty()); + + KeyringController controller(prefs()); + controller.Reset(); + GetAllCustomChains(prefs(), &custom_chains); + ASSERT_TRUE(custom_chains.empty()); +} + TEST_F(EthJsonRpcControllerUnitTest, AddEthereumChainApproved) { brave_wallet::mojom::EthereumChain chain( "0x111", "chain_name", {"https://url1.com"}, {"https://url1.com"}, @@ -1519,44 +1540,4 @@ TEST_F(EthJsonRpcControllerUnitTest, GetSupportsInterface) { EXPECT_TRUE(callback_called); } -TEST_F(EthJsonRpcControllerUnitTest, Reset) { - std::vector values; - brave_wallet::mojom::EthereumChain chain( - "0x1", "chain_name", {"https://url1.com"}, {"https://url1.com"}, - {"https://url1.com"}, "symbol_name", "symbol", 11, false); - auto chain_ptr = chain.Clone(); - values.push_back(brave_wallet::EthereumChainToValue(chain_ptr)); - UpdateCustomNetworks(prefs(), &values); - - std::vector custom_chains; - GetAllCustomChains(prefs(), &custom_chains); - ASSERT_FALSE(custom_chains.empty()); - custom_chains.clear(); - ASSERT_TRUE(custom_chains.empty()); - SetNetwork(mojom::kLocalhostChainId); - prefs()->SetBoolean(kSupportEip1559OnLocalhostChain, true); - EXPECT_TRUE(prefs()->HasPrefPath(kBraveWalletCustomNetworks)); - EXPECT_EQ(prefs()->GetString(kBraveWalletCurrentChainId), - mojom::kLocalhostChainId); - // This isn't valid data for these maps but we are just checking to make sure - // it gets cleared - rpc_controller_->add_chain_pending_requests_["1"] = - EthJsonRpcController::EthereumChainRequest(); - rpc_controller_->switch_chain_requests_[GURL()] = ""; - rpc_controller_->switch_chain_callbacks_[GURL()] = base::BindLambdaForTesting( - [&](mojom::ProviderError error, const std::string& error_message) {}); - - rpc_controller_->Reset(); - - GetAllCustomChains(prefs(), &custom_chains); - ASSERT_TRUE(custom_chains.empty()); - EXPECT_FALSE(prefs()->HasPrefPath(kBraveWalletCustomNetworks)); - EXPECT_EQ(prefs()->GetString(kBraveWalletCurrentChainId), - mojom::kMainnetChainId); - EXPECT_FALSE(prefs()->HasPrefPath(kSupportEip1559OnLocalhostChain)); - EXPECT_TRUE(rpc_controller_->add_chain_pending_requests_.empty()); - EXPECT_TRUE(rpc_controller_->switch_chain_requests_.empty()); - EXPECT_TRUE(rpc_controller_->switch_chain_callbacks_.empty()); -} - } // namespace brave_wallet diff --git a/components/brave_wallet/browser/eth_pending_tx_tracker.cc b/components/brave_wallet/browser/eth_pending_tx_tracker.cc index bb2f746955d6..e9f82db3a3d5 100644 --- a/components/brave_wallet/browser/eth_pending_tx_tracker.cc +++ b/components/brave_wallet/browser/eth_pending_tx_tracker.cc @@ -65,11 +65,6 @@ void EthPendingTxTracker::ResubmitPendingTransactions() { } } -void EthPendingTxTracker::Reset() { - network_nonce_map_.clear(); - dropped_blocks_counter_.clear(); -} - void EthPendingTxTracker::OnGetTxReceipt(std::string id, TransactionReceipt receipt, mojom::ProviderError error, @@ -104,7 +99,6 @@ void EthPendingTxTracker::OnGetNetworkNonce(std::string address, const std::string& error_message) { if (error != mojom::ProviderError::kSuccess) return; - network_nonce_map_[address] = result; } diff --git a/components/brave_wallet/browser/eth_pending_tx_tracker.h b/components/brave_wallet/browser/eth_pending_tx_tracker.h index 307ad52a97b2..f15696d3da71 100644 --- a/components/brave_wallet/browser/eth_pending_tx_tracker.h +++ b/components/brave_wallet/browser/eth_pending_tx_tracker.h @@ -30,7 +30,6 @@ class EthPendingTxTracker { bool UpdatePendingTransactions(size_t* num_pending); void ResubmitPendingTransactions(); - void Reset(); private: FRIEND_TEST_ALL_PREFIXES(EthPendingTxTrackerUnitTest, IsNonceTaken); diff --git a/components/brave_wallet/browser/eth_tx_controller.cc b/components/brave_wallet/browser/eth_tx_controller.cc index 16bb1489cab0..65e07cd5e541 100644 --- a/components/brave_wallet/browser/eth_tx_controller.cc +++ b/components/brave_wallet/browser/eth_tx_controller.cc @@ -17,7 +17,6 @@ #include "base/strings/string_util.h" #include "brave/components/brave_wallet/browser/asset_ratio_controller.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" -#include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wallet/browser/eip1559_transaction.h" #include "brave/components/brave_wallet/browser/eth_data_builder.h" #include "brave/components/brave_wallet/browser/eth_data_parser.h" @@ -116,7 +115,6 @@ EthTxController::EthTxController( : rpc_controller_(rpc_controller), keyring_controller_(keyring_controller), asset_ratio_controller_(asset_ratio_controller), - prefs_(prefs), tx_state_manager_(std::move(tx_state_manager)), nonce_tracker_(std::move(nonce_tracker)), pending_tx_tracker_(std::move(pending_tx_tracker)), @@ -867,10 +865,6 @@ void EthTxController::KeyringRestored() { UpdatePendingTransactions(); } -void EthTxController::KeyringReset() { - UpdatePendingTransactions(); -} - void EthTxController::SpeedupOrCancelTransaction( const std::string& tx_meta_id, bool cancel, @@ -1033,11 +1027,4 @@ void EthTxController::RetryTransaction(const std::string& tx_meta_id, mojom::ProviderError::kSuccess, ""); } -void EthTxController::Reset() { - ClearEthTxControllerProfilePrefs(prefs_); - eth_block_tracker_->Stop(); - pending_tx_tracker_->Reset(); - known_no_pending_tx = false; -} - } // namespace brave_wallet diff --git a/components/brave_wallet/browser/eth_tx_controller.h b/components/brave_wallet/browser/eth_tx_controller.h index b7974a515a1e..9325336b3eab 100644 --- a/components/brave_wallet/browser/eth_tx_controller.h +++ b/components/brave_wallet/browser/eth_tx_controller.h @@ -118,9 +118,6 @@ class EthTxController : public KeyedService, GetTransactionMessageToSignCallback callback) override; void AddObserver( ::mojo::PendingRemote observer) override; - // Resets things back to the original state of EthTxController - // To be used when the Wallet is reset / erased - void Reset() override; static bool ValidateTxData(const mojom::TxDataPtr& tx_data, std::string* error); @@ -132,7 +129,6 @@ class EthTxController : public KeyedService, private: FRIEND_TEST_ALL_PREFIXES(EthTxControllerUnitTest, TestSubmittedToConfirmed); FRIEND_TEST_ALL_PREFIXES(EthTxControllerUnitTest, RetryTransaction); - FRIEND_TEST_ALL_PREFIXES(EthTxControllerUnitTest, Reset); friend class EthTxControllerUnitTest; void NotifyUnapprovedTxUpdated(EthTxStateManager::TxMeta* meta); @@ -210,7 +206,6 @@ class EthTxController : public KeyedService, // KeyringControllerObserver: void KeyringCreated() override; void KeyringRestored() override; - void KeyringReset() override; void Locked() override; void Unlocked() override; void BackedUp() override {} @@ -229,7 +224,6 @@ class EthTxController : public KeyedService, EthJsonRpcController* rpc_controller_; // NOT OWNED KeyringController* keyring_controller_; // NOT OWNED AssetRatioController* asset_ratio_controller_; // NOT OWNED - PrefService* prefs_; // NOT OWNED std::unique_ptr tx_state_manager_; std::unique_ptr nonce_tracker_; std::unique_ptr pending_tx_tracker_; diff --git a/components/brave_wallet/browser/eth_tx_controller_unittest.cc b/components/brave_wallet/browser/eth_tx_controller_unittest.cc index 026390017da0..60a561e66c4b 100644 --- a/components/brave_wallet/browser/eth_tx_controller_unittest.cc +++ b/components/brave_wallet/browser/eth_tx_controller_unittest.cc @@ -25,7 +25,6 @@ #include "brave/components/brave_wallet/browser/eth_tx_state_manager.h" #include "brave/components/brave_wallet/browser/hd_keyring.h" #include "brave/components/brave_wallet/browser/keyring_controller.h" -#include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/brave_wallet/common/hex_utils.h" #include "components/prefs/testing_pref_service.h" @@ -258,8 +257,6 @@ class EthTxControllerUnitTest : public testing::Test { EthTxController* eth_tx_controller() { return eth_tx_controller_.get(); } - PrefService* GetPrefs() { return &prefs_; } - void SetInterceptor(const std::string& content) { url_loader_factory_.SetInterceptor(base::BindLambdaForTesting( [&, content](const network::ResourceRequest& request) { @@ -1796,27 +1793,4 @@ TEST_F(EthTxControllerUnitTest, MakeERC721TransferFromDataTxType) { run_loop->Run(); } -TEST_F(EthTxControllerUnitTest, Reset) { - eth_tx_controller()->known_no_pending_tx = true; - eth_tx_controller()->eth_block_tracker_->Start(base::Seconds(10)); - EXPECT_TRUE(eth_tx_controller()->eth_block_tracker_->IsRunning()); - EthTxStateManager::TxMeta meta; - meta.id = "001"; - meta.from = EthAddress::FromHex("0xbe862ad9abfe6f22bcb087716c7d89a26051f74a"); - meta.status = mojom::TransactionStatus::Unapproved; - auto tx_data = mojom::TxData::New( - "0x1", "0x1", "0x0974", "0xbe862ad9abfe6f22bcb087716c7d89a26051f74c", - "0x016345785d8a0000", std::vector()); - auto tx = EthTransaction::FromTxData(tx_data, false); - meta.tx = std::make_unique(*tx); - eth_tx_controller()->tx_state_manager_->AddOrUpdateTx(meta); - EXPECT_TRUE(GetPrefs()->HasPrefPath(kBraveWalletTransactions)); - - eth_tx_controller()->Reset(); - - EXPECT_FALSE(eth_tx_controller()->known_no_pending_tx); - EXPECT_FALSE(eth_tx_controller()->eth_block_tracker_->IsRunning()); - EXPECT_FALSE(GetPrefs()->HasPrefPath(kBraveWalletTransactions)); -} - } // namespace brave_wallet diff --git a/components/brave_wallet/browser/keyring_controller.cc b/components/brave_wallet/browser/keyring_controller.cc index 8b5b9fea3574..a3535ce65232 100644 --- a/components/brave_wallet/browser/keyring_controller.cc +++ b/components/brave_wallet/browser/keyring_controller.cc @@ -1243,11 +1243,7 @@ void KeyringController::Reset() { encryptor_.reset(); default_keyring_.reset(); - ClearKeyringControllerProfilePrefs(prefs_); - - for (const auto& observer : observers_) { - observer->KeyringReset(); - } + ClearProfilePrefs(prefs_); } void KeyringController::StopAutoLockTimer() { diff --git a/components/brave_wallet/common/brave_wallet.mojom b/components/brave_wallet/common/brave_wallet.mojom index b1b4ee63f3a4..0d6143fe224a 100644 --- a/components/brave_wallet/common/brave_wallet.mojom +++ b/components/brave_wallet/common/brave_wallet.mojom @@ -296,9 +296,6 @@ interface KeyringControllerObserver { // Fired when a keyring is restored KeyringRestored(); - // Fired when a keyring is reset - KeyringReset(); - // Fired when a keyring is locked Locked(); @@ -396,11 +393,9 @@ interface KeyringController { // Obtains the keyring information GetDefaultKeyringInfo() => (KeyringInfo keyring); - // Obtains the keyring information GetKeyringInfo(string keyringId) => (KeyringInfo keyring); - - // Resets the keyring and the related preferences + // Resets the keyring and all preferences Reset(); // Adds a KeyringControllerObserver @@ -608,9 +603,6 @@ interface EthJsonRpcController { // Balance is 0x1 if current selected account is the same as token owner's // address, otherwise balance is 0x0. GetERC721TokenBalance(string contract_address, string token_id, string account_address) => (string balance, ProviderError error, string error_message); - - // Resets the keyring and the related preferences - Reset(); }; enum TransactionStatus { @@ -697,9 +689,6 @@ interface EthTxController { GetNonceForHardwareTransaction(string tx_meta_id) => (string? nonce); GetTransactionMessageToSign(string tx_meta_id) => (string? message); ProcessHardwareSignature(string tx_meta_id, string v, string r, string s) => (bool status); - - // Resets the keyring and the related preferences - Reset(); }; interface BraveWalletServiceObserver { @@ -812,9 +801,6 @@ interface BraveWalletService { // Obtain the pending add suggest token requests for current chain, will be // cleared when user switch networks. GetPendingAddSuggestTokenRequests() => (array requests); - - // Resets the keyring and the related preferences - Reset(); }; enum DefaultWallet { diff --git a/components/brave_wallet_ui/common/actions/wallet_actions.ts b/components/brave_wallet_ui/common/actions/wallet_actions.ts index 74fb26501842..1ffea3bd251f 100644 --- a/components/brave_wallet_ui/common/actions/wallet_actions.ts +++ b/components/brave_wallet_ui/common/actions/wallet_actions.ts @@ -63,7 +63,6 @@ export const chainChangedEvent = createAction('cha export const isEip1559Changed = createAction('isEip1559Changed') export const keyringCreated = createAction('keyringCreated') export const keyringRestored = createAction('keyringRestored') -export const keyringReset = createAction('keyringReset') export const locked = createAction('locked') export const unlocked = createAction('unlocked') export const backedUp = createAction('backedUp') diff --git a/components/brave_wallet_ui/common/async/handlers.ts b/components/brave_wallet_ui/common/async/handlers.ts index ba13e363a939..29fb115c7fa3 100644 --- a/components/brave_wallet_ui/common/async/handlers.ts +++ b/components/brave_wallet_ui/common/async/handlers.ts @@ -124,10 +124,6 @@ handler.on(WalletActions.keyringRestored.getType(), async (store) => { await refreshWalletInfo(store) }) -handler.on(WalletActions.keyringReset.getType(), async (store) => { - window.location.reload() -}) - handler.on(WalletActions.locked.getType(), async (store) => { interactionNotifier.stopWatchingForInteraction() await refreshWalletInfo(store) diff --git a/components/brave_wallet_ui/common/wallet_api_proxy.ts b/components/brave_wallet_ui/common/wallet_api_proxy.ts index 69aba02dcb49..8fa9499ed1bc 100644 --- a/components/brave_wallet_ui/common/wallet_api_proxy.ts +++ b/components/brave_wallet_ui/common/wallet_api_proxy.ts @@ -42,9 +42,6 @@ export default class WalletApiProxy { keyringRestored: function () { store.dispatch(WalletActions.keyringRestored()) }, - keyringReset: function () { - store.dispatch(WalletActions.keyringReset()) - }, locked: function () { store.dispatch(WalletActions.locked()) },