Merge pull request #11271 from brave/pr11245_uplift_1.32.x

(uplift 1.32.x) Check decimal number against hex for chain ID (#11245)

Author: kjozwiak

app/brave_generated_resources.grd

@@ -1526,7 +1526,7 @@ Are you sure you want to do this?
         The id of new chain
       </message>
       <message name="IDS_SETTINGS_WALLET_NETWORKS_CHAIN_ID_PLACEHOLDER" desc="The placeholder of the chain id input for the wallet network dialog">
-        A 0x-prefixed hexadecimal string
+        A positive decimal number
       </message>
       <message name="IDS_SETTINGS_WALLET_NETWORKS_CHAIN_NAME_TITLE" desc="The title of the chain name input for the wallet network dialog">
         The name of new chain
@@ -1568,7 +1568,7 @@ Are you sure you want to do this?
         This field cannot be blank.
       </message>
       <message name="IDS_SETTINGS_WALLET_NETWORKS_CHAID_ID_ERROR" desc="The error text of the wallet network dialog for invalid chain id fields">
-        Invalid format, the chain id is a 0x-prefixed hexadecimal string
+        Invalid format, the chain id is a positive number
       </message>
       <message name="IDS_SETTINGS_WALLET_NETWORKS_EXISTS" desc="The error text of the wallet network dialog for existing network">
         This network is already added.

browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html

@@ -22,7 +22,8 @@
   <div slot="body">
     <cr-input id="chainId"
               label="$i18n{walletAddNetworkDialogChainIdTitle}"
-              type="text"
+              type="number"
+              min="1"
               placeholder="$i18n{walletAddNetworkDialogChainIdPlaceholder}"
               spellcheck="false"
               error-message="{{invalidChainIdMessage_}}"

browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.js

@@ -62,7 +62,7 @@ Polymer({
       value: false,
     },
 
-    chainIdValue_: String,
+    chainIdValue_: Number,
     invalidChainIdMessage_: String,
     chainIdInvalid_: {
       type: Boolean,
@@ -105,7 +105,7 @@ Polymer({
   ready: function() {
     if (Object.keys(this.selected).length === 0)
       return
-    this.chainIdValue_ = this.selected.chainId
+    this.chainIdValue_ = parseInt(this.selected.chainId, 16) | 0
     this.chainNameValue_ = this.selected.chainName
     this.currencyNameValue_ = this.selected.nativeCurrency.name
     this.currencySymbolValue_ = this.selected.nativeCurrency.symbol
@@ -135,20 +135,12 @@ Polymer({
 
     return url.protocol === "http:" || url.protocol === "https:"
   },
-  isValidHexValue: function(value) {
-    var parsed = parseInt(value, 16);
-    const processed = value.replace('0x', '').toLowerCase()
-    return (parsed.toString(16) === processed) && value.startsWith('0x');
-  },
   /** @private */
   chainIdChanged_: function(event) {
     const value = event.target.value
-    this.chainIdInvalid_ = !this.isValidHexValue(value)
-    const empty = value.trim() === ''
+    this.chainIdInvalid_ = value <= 0
     if (this.chainIdInvalid_) {
-      const text = empty ? this.i18n('walletAddNetworkMandarotyFieldError')
-                         : this.i18n('walletAddNetworkInvalidChainId')
-      this.invalidChainIdMessage_ = text
+      this.invalidChainIdMessage_ = this.i18n('walletAddNetworkInvalidChainId')
     }
     this.updateSubmitButtonState_()
   },
@@ -198,7 +190,7 @@ Polymer({
         return;
       }
     }
-    if (this.chainIdValue_ === '') {
+    if (this.chainIdValue_ <= 0) {
       this.isSubmitButtonEnabled_ = false
       return;
     }
@@ -287,9 +279,12 @@ Polymer({
         }
       })
   },
+  getHexNumber: function(value) {
+    return '0x' + Number(this.chainIdValue_).toString(16)
+  },
   onAddNetworkTap_: function(item) {
     let payload = Object({
-      chainId: this.chainIdValue_,
+      chainId: this.getHexNumber(),
       chainName: this.chainNameValue_,
     })
     const nativeCurrency = Object({