From 2966283fb6bc0cd90e5f4f496170ba899c4ee4f5 Mon Sep 17 00:00:00 2001
From: Sergey <spylogsster@gmail.com>
Date: Tue, 30 Nov 2021 22:04:48 +0300
Subject: [PATCH] Fix deletion of urls (#11338)

---
 .../brave_wallet_page/add_wallet_network_dialog.html   |  1 -
 .../brave_wallet_page/add_wallet_network_dialog.js     | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html b/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html
index e3e9ec6f952e..0341cf2dd938 100644
--- a/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html
+++ b/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.html
@@ -98,7 +98,6 @@
                     spellcheck="false"
                     on-input=urlChangedRpc_
                     value="{{item.value}}"
-                    class="mandatory"
                     autofocus>
           </cr-input>
         </template>
diff --git a/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.js b/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.js
index 8c395404d45f..f59b0c954eb3 100644
--- a/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.js
+++ b/browser/resources/settings/brave_wallet_page/add_wallet_network_dialog.js
@@ -182,7 +182,7 @@ Polymer({
   },
   updateSubmitButtonState_: function() {
     for (const input of this.shadowRoot.querySelectorAll('.mandatory')) {
-      if (input && (input.invalid || !input.value || input.value.trim() === '')) {
+      if (input && (input.invalid || !input.value || (input.value.trim && input.value.trim() === ''))) {
         this.isSubmitButtonEnabled_ = false
         return;
       }
@@ -202,8 +202,7 @@ Polymer({
       this.isSubmitButtonEnabled_ = false
       return;
     }
-    
-    if (!this.rpcUrls.find(element => element.value !== '')) {
+    if (!this.hasValidRPCUrls()) {
       this.isSubmitButtonEnabled_ = false
       return;
     }
@@ -221,7 +220,7 @@ Polymer({
     this.updateSubmitButtonState_()
     const empty = element.value.trim() === ''
     if (list == 'rpc' && element.invalid) {
-      const text = empty ? this.i18n('walletAddNetworkMandarotyFieldError')
+      const text = empty && !this.hasValidRPCUrls() ? this.i18n('walletAddNetworkMandarotyFieldError')
                          : this.i18n('walletAddNetworkInvalidURLInput')
       element.setAttribute('error-message', text)
     }
@@ -229,6 +228,9 @@ Polymer({
       this.updatePlusButtonState(list)
     }
   },
+  hasValidRPCUrls: function() {
+    return this.rpcUrls.find(element => this.validateURL(element.value))
+  },
   urlChangedIcons_: function(event) {
     return this.urlChangedImpl_(event.target, 'icon')
   },