Do not remove active network (#11234)

brave · Nov 24, 2021 · 2d79b3c · 2d79b3c
1 parent b554622
commit 2d79b3c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/browser/resources/settings/brave_wallet_page/wallet_networks_subpage.html b/browser/resources/settings/brave_wallet_page/wallet_networks_subpage.html
@@ -36,13 +36,14 @@
         <template>
           <div on-dblclick=onItemDoubleClick>
             <div class="settings-box">
-              <div class="flex cr-padded-text hovered">
+              <div class$=[[getNetworkItemClass(item.chainId)]]>
                 <div><span hidden="[[hideNativeCurrencyInfo]]">({{item.nativeCurrency.name}}) </span>{{item.chainName}}</div>
                 <div class="secondary">[[getItemDescritionText(item)]]</div>
               </div>
               <cr-icon-button class="icon-more-vert"
                               on-click="onNetworkMenuTapped_"
                               itemName=[[item.name]]
+                              hidden=[[isDefaultNetwork(item.chainId)]]
                               focus-type="menu">
               </cr-icon-button>
             </div>

diff --git a/browser/resources/settings/brave_wallet_page/wallet_networks_subpage.js b/browser/resources/settings/brave_wallet_page/wallet_networks_subpage.js
@@ -64,6 +64,13 @@ class SettingsWalletNetworksSubpage extends SettingsWalletNetworksSubpageBase {
     this.updateNetworks()
   }
 
+  getNetworkItemClass(chainId) {
+    if (!this.isDefaultNetwork(chainId)) {
+      return "flex cr-padded-text hovered"
+    }
+    return "flex cr-padded-text"
+  }
+
   isDefaultNetwork(chainId) {
     return (chainId ===
         this.getPref('brave.wallet.wallet_current_chain_id').value)
@@ -79,14 +86,20 @@ class SettingsWalletNetworksSubpage extends SettingsWalletNetworksSubpageBase {
   }
 
   onDeleteActionTapped_(event) {
+    const chainId = this.selectedNetwork.chainId
+    const chainName = this.selectedNetwork.chainName
     this.selectedNetwork = {}
     this.$$('cr-action-menu').close();
+    if (this.isDefaultNetwork(chainId)) {
+      this.updateNetworks()
+      return
+    }
     var message = this.i18n('walletDeleteNetworkConfirmation',
-                            event.model.item.chainName)
+                            chainName)
     if (!window.confirm(message))
       return
 
-    this.browserProxy_.removeEthereumChain(event.model.item.chainId).
+    this.browserProxy_.removeEthereumChain(chainId).
         then(success => { this.updateNetworks() })
   }
 
@@ -95,6 +108,10 @@ class SettingsWalletNetworksSubpage extends SettingsWalletNetworksSubpageBase {
   }
 
   onItemDoubleClick(event) {
+    if (this.isDefaultNetwork(event.model.item.chainId)) {
+      this.updateNetworks()
+      return
+    }
     this.selectedNetwork = event.model.item
     this.showAddWalletNetworkDialog_ = true
   }