Never disable save button if props chain ID is invalid

MetaMask · Nov 5, 2020 · 929a140 · 929a140
1 parent 3dbf5db
commit 929a140
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/ui/app/pages/settings/networks-tab/network-form/network-form.component.js b/ui/app/pages/settings/networks-tab/network-form/network-form.component.js
@@ -198,7 +198,13 @@ export default class NetworkForm extends PureComponent {
   }
 
   stateIsUnchanged() {
-    const { rpcUrl, ticker, networkName, blockExplorerUrl } = this.props
+    const {
+      rpcUrl,
+      chainId: propsChainId,
+      ticker,
+      networkName,
+      blockExplorerUrl,
+    } = this.props
 
     const {
       rpcUrl: stateRpcUrl,
@@ -208,9 +214,17 @@ export default class NetworkForm extends PureComponent {
       blockExplorerUrl: stateBlockExplorerUrl,
     } = this.state
 
+    // These added conditions are in case the saved chainId is invalid, which
+    // was possible in versions <8.1 of the extension.
+    // Basically, we always want to be able to overwrite an invalid chain ID.
+    const chainIdIsUnchanged =
+      typeof propsChainId === 'string' &&
+      propsChainId.toLowerCase().startsWith('0x') &&
+      stateChainId === this.getDisplayChainIdFromProps()
+
     return (
       stateRpcUrl === rpcUrl &&
-      stateChainId === this.getDisplayChainIdFromProps() &&
+      chainIdIsUnchanged &&
       stateTicker === ticker &&
       stateNetworkName === networkName &&
       stateBlockExplorerUrl === blockExplorerUrl