feat(wallet): Added Show Test Networks Pref

brave · Apr 25, 2022 · 352a4ea · 352a4ea
1 parent 30a4608
commit 352a4ea
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 0 deletions.
diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -956,6 +956,9 @@ Are you sure you want to do this?
       <message name="IDS_SETTINGS_SHOW_BRAVE_WALLET_ICON_ON_TOOLBAR" desc="The description for showing the Brave wallet panel icon on the toolbar">
         Show Brave Wallet icon on toolbar
       </message>
+      <message name="IDS_SETTINGS_SHOW_BRAVE_WALLET_TEST_NETWORKS" desc="The description for showing the Brave wallet test networks">
+        Show test networks
+      </message>
       <message name="IDS_SETTINGS_HIDE_BRAVE_WALLET_ICON_ON_TOOLBAR" desc="The description for hiding the Brave wallet panel icon on the toolbar">
         Hide Brave Wallet icon on toolbar
       </message>

diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc
@@ -114,6 +114,8 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MiscBravePrefs) {
             brave_wallet::mojom::DefaultWallet::BraveWalletPreferExtension);
   EXPECT_TRUE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean(
       kShowWalletIconOnToolbar));
+  EXPECT_FALSE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean(
+      kShowWalletTestNetworks));
   EXPECT_FALSE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean(
       kBraveWalletBackupComplete));
   EXPECT_FALSE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean(

diff --git a/browser/brave_wallet/brave_wallet_service_unittest.cc b/browser/brave_wallet/brave_wallet_service_unittest.cc
@@ -459,6 +459,17 @@ class BraveWalletServiceUnitTest : public testing::Test {
     return default_cryptocurrency;
   }
 
+  bool GetShowWalletTestNetworks() {
+    base::RunLoop run_loop;
+    bool show_wallet_test_networks;
+    service_->GetShowWalletTestNetworks(base::BindLambdaForTesting([&](bool b) {
+      show_wallet_test_networks = b;
+      run_loop.Quit();
+    }));
+    run_loop.Run();
+    return show_wallet_test_networks;
+  }
+
   void SimulateOnGetImportInfo(const std::string& new_password,
                                bool result,
                                const ImportInfo& info,
@@ -1081,6 +1092,15 @@ TEST_F(BraveWalletServiceUnitTest, GetAndSetDefaultBaseCryptocurrency) {
   EXPECT_EQ(GetDefaultBaseCryptocurrency(), "ETH");
 }
 
+TEST_F(BraveWalletServiceUnitTest, GetShowWalletTestNetworks) {
+  // Default value for kShowWalletTestNetworks should be false
+  EXPECT_FALSE(GetPrefs()->GetBoolean(kShowWalletTestNetworks));
+  EXPECT_FALSE(GetShowWalletTestNetworks());
+
+  GetPrefs()->SetBoolean(kShowWalletTestNetworks, true);
+  EXPECT_TRUE(GetShowWalletTestNetworks());
+}
+
 TEST_F(BraveWalletServiceUnitTest, EthAddRemoveSetUserAssetVisible) {
   mojom::BlockchainTokenPtr eth_0x4_token = GetEthToken();
   eth_0x4_token->chain_id = "0x4";

diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -261,6 +261,8 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_STRING;
   (*s_brave_allowlist)[kShowWalletIconOnToolbar] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+  (*s_brave_allowlist)[kShowWalletTestNetworks] =
+      settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kBraveWalletAutoLockMinutes] =
       settings_api::PrefType::PREF_TYPE_NUMBER;
 

diff --git a/browser/resources/settings/brave_wallet_page/wallet_networks_subpage.html b/browser/resources/settings/brave_wallet_page/wallet_networks_subpage.html
@@ -69,6 +69,11 @@
         </template>
       </iron-list>
     </div>
+    <settings-toggle-button id="showBravewalletTestNetworks"
+      class="cr-row"
+      pref="{{prefs.brave.wallet.show_wallet_test_networks}}"
+      label="$i18n{showBravewalletTestNetworks}">
+    </settings-toggle-button>
   </div>
 </div>
 <template is="dom-if" if="[[showAddWalletNetworkDialog_]]" restamp>

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
@@ -328,6 +328,8 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_DEFAULT_BASE_CRYPTOCURRENCY_DESC},
     {"showBravewalletIconOnToolbar",
      IDS_SETTINGS_SHOW_BRAVE_WALLET_ICON_ON_TOOLBAR},
+    {"showBravewalletTestNetworks",
+     IDS_SETTINGS_SHOW_BRAVE_WALLET_TEST_NETWORKS},
     {"autoLockMinutes", IDS_SETTINGS_AUTO_LOCK_MINUTES},
     {"autoLockMinutesDesc", IDS_SETTINGS_AUTO_LOCK_MINUTES_DESC},
     {"googleLoginForExtensionsDesc", IDS_SETTINGS_GOOGLE_LOGIN_FOR_EXTENSIONS},

diff --git a/components/brave_wallet/browser/brave_wallet_prefs.cc b/components/brave_wallet/browser/brave_wallet_prefs.cc
@@ -53,6 +53,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(kDefaultBaseCurrency, "USD");
   registry->RegisterStringPref(kDefaultBaseCryptocurrency, "BTC");
   registry->RegisterBooleanPref(kShowWalletIconOnToolbar, true);
+  registry->RegisterBooleanPref(kShowWalletTestNetworks, false);
   registry->RegisterDictionaryPref(kBraveWalletTransactions);
   registry->RegisterTimePref(kBraveWalletLastUnlockTime, base::Time());
   registry->RegisterTimePref(kBraveWalletP3ALastReportTime, base::Time());

diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc
@@ -512,6 +512,11 @@ void BraveWalletService::SetDefaultBaseCryptocurrency(
   }
 }
 
+void BraveWalletService::GetShowWalletTestNetworks(
+    GetShowWalletTestNetworksCallback callback) {
+  std::move(callback).Run(::brave_wallet::GetShowWalletTestNetworks(prefs_));
+}
+
 void BraveWalletService::OnDefaultWalletChanged() {
   auto default_wallet = ::brave_wallet::GetDefaultWallet(prefs_);
   for (const auto& observer : observers_) {

diff --git a/components/brave_wallet/browser/brave_wallet_service.h b/components/brave_wallet/browser/brave_wallet_service.h
@@ -101,6 +101,8 @@ class BraveWalletService : public KeyedService,
   void GetDefaultBaseCryptocurrency(
       GetDefaultBaseCryptocurrencyCallback callback) override;
   void SetDefaultBaseCryptocurrency(const std::string& cryptocurrency) override;
+  void GetShowWalletTestNetworks(
+      GetShowWalletTestNetworksCallback callback) override;
   void AddPermission(mojom::CoinType coin,
                      const url::Origin& origin,
                      const std::string& account,

diff --git a/components/brave_wallet/browser/brave_wallet_utils.cc b/components/brave_wallet/browser/brave_wallet_utils.cc
@@ -903,6 +903,10 @@ void SetDefaultBaseCryptocurrency(PrefService* prefs,
   prefs->SetString(kDefaultBaseCryptocurrency, cryptocurrency);
 }
 
+bool GetShowWalletTestNetworks(PrefService* prefs) {
+  return prefs->GetBoolean(kShowWalletTestNetworks);
+}
+
 std::string GetDefaultBaseCryptocurrency(PrefService* prefs) {
   return prefs->GetString(kDefaultBaseCryptocurrency);
 }

diff --git a/components/brave_wallet/browser/brave_wallet_utils.h b/components/brave_wallet/browser/brave_wallet_utils.h
@@ -97,6 +97,7 @@ void SetDefaultBaseCurrency(PrefService* prefs, const std::string& currency);
 std::string GetDefaultBaseCurrency(PrefService* prefs);
 void SetDefaultBaseCryptocurrency(PrefService* prefs,
                                   const std::string& cryptocurrency);
+bool GetShowWalletTestNetworks(PrefService* prefs);
 std::string GetDefaultBaseCryptocurrency(PrefService* prefs);
 std::vector<std::string> GetAllKnownEthNetworkIds();
 std::vector<std::string> GetAllKnownSolNetworkIds();

diff --git a/components/brave_wallet/browser/pref_names.cc b/components/brave_wallet/browser/pref_names.cc
@@ -12,6 +12,7 @@ const char kDefaultBaseCryptocurrency[] =
 const char kBraveWalletTransactions[] = "brave.wallet.transactions";
 const char kShowWalletIconOnToolbar[] =
     "brave.wallet.show_wallet_icon_on_toolbar";
+const char kShowWalletTestNetworks[] = "brave.wallet.show_wallet_test_networks";
 const char kBraveWalletLastUnlockTime[] =
     "brave.wallet.wallet_last_unlock_time_v2";
 const char kBraveWalletPingReportedUnlockTime[] =

diff --git a/components/brave_wallet/browser/pref_names.h b/components/brave_wallet/browser/pref_names.h
@@ -11,6 +11,7 @@ extern const char kDefaultBaseCurrency[];
 extern const char kDefaultBaseCryptocurrency[];
 extern const char kBraveWalletTransactions[];
 extern const char kShowWalletIconOnToolbar[];
+extern const char kShowWalletTestNetworks[];
 extern const char kBraveWalletLastUnlockTime[];
 extern const char kBraveWalletPingReportedUnlockTime[];
 extern const char kBraveWalletP3ALastReportTime[];

diff --git a/components/brave_wallet/common/brave_wallet.mojom b/components/brave_wallet/common/brave_wallet.mojom
@@ -1022,6 +1022,9 @@ interface BraveWalletService {
   // Sets the default base cryptocurrency
   SetDefaultBaseCryptocurrency(string cryptocurrency);
 
+  // Obtains the show test networks user pref from settings
+  GetShowWalletTestNetworks() => (bool isEnabled);
+
   // Adds the permission of coin type for the account
   AddPermission(CoinType coin, url.mojom.Origin origin, string account)
     => (bool success);

diff --git a/components/brave_wallet_ui/common/actions/wallet_actions.ts b/components/brave_wallet_ui/common/actions/wallet_actions.ts
@@ -120,3 +120,4 @@ export const setSelectedCoin = createAction<BraveWallet.CoinType>('setSelectedCo
 export const setDefaultNetworks = createAction<BraveWallet.NetworkInfo[]>('setDefaultNetworks')
 export const setSelectedNetworkFilter = createAction<BraveWallet.NetworkInfo>('setSelectedNetworkFilter')
 export const setDefaultAccounts = createAction<BraveWallet.AccountInfo[]>('setDefaultAccounts')
+export const setShowTestNetworks = createAction<boolean>('setShowTestNetworks')
diff --git a/components/brave_wallet_ui/common/async/handlers.ts b/components/brave_wallet_ui/common/async/handlers.ts
@@ -238,6 +238,8 @@ handler.on(WalletActions.initialized.getType(), async (store: Store, payload: Wa
     crypto: defualtCrypo.cryptocurrency
   }
   store.dispatch(WalletActions.defaultCurrenciesUpdated(defaultCurrencies))
+  const showTestNetworks = await braveWalletService.getShowWalletTestNetworks()
+  store.dispatch(WalletActions.setShowTestNetworks(showTestNetworks.isEnabled))
   // Fetch Balances and Prices
   if (!state.isWalletLocked && state.isWalletCreated) {
     const currentNetwork = await store.dispatch(refreshNetworkInfo())

diff --git a/components/brave_wallet_ui/common/reducers/wallet_reducer.ts b/components/brave_wallet_ui/common/reducers/wallet_reducer.ts
@@ -520,6 +520,13 @@ export const createWalletReducer = (initialState: WalletState) => {
     }
   })
 
+  reducer.on(WalletActions.setShowTestNetworks, (state: WalletState, payload: boolean): WalletState => {
+    return {
+      ...state,
+      isTestNetworksEnabled: payload
+    }
+  })
+
   return reducer
 }