chore(wallet): remove legacy network settings options (#18955)

* e2e: removed unused element

---------

Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>

src/legacy/status_im/browser/core.cljs

@@ -3,7 +3,6 @@
  ["eth-phishing-detect" :as eth-phishing-detect]
  [clojure.string :as string]
  [legacy.status-im.bottom-sheet.events :as bottom-sheet]
- [legacy.status-im.browser.eip3085 :as eip3085]
  [legacy.status-im.browser.eip3326 :as eip3326]
  [legacy.status-im.browser.permissions :as browser.permissions]
  [legacy.status-im.browser.webview-ref :as webview-ref]
@@ -443,9 +442,6 @@
  (= method "wallet_switchEthereumChain")
  (eip3326/handle-switch-ethereum-chain cofx dapp-name id message-id (first params))
 
- (= method "wallet_addEthereumChain")
- (eip3085/handle-add-ethereum-chain cofx dapp-name id message-id (first params))
-
  :else
  {:browser/call-rpc [payload
  #(re-frame/dispatch [:browser.callback/call-rpc

src/legacy/status_im/browser/eip3085.cljs

@@ -2,10 +2,6 @@
 ;(`wallet_addEthereumChain`)
 (ns legacy.status-im.browser.eip3085
  (:require
- [clojure.string :as string]
- [legacy.status-im.network.core :as network]
- [legacy.status-im.ui.screens.browser.eip3085.sheet :as sheet]
- [legacy.status-im.utils.random :as random]
  [re-frame.core :as re-frame]
  [status-im.constants :as constants]
  [taoensso.timbre :as log]
@@ -40,37 +36,3 @@
  :message "User rejected the request."}}
  :dispatch [:bottom-sheet/hide-old]})
 
-(rf/defn handle-add-ethereum-chain
- {:events [:eip3085/handle-add-ethereum-chain]}
- [{{:networks/keys [networks] :as db} :db :as cofx}
- dapp-name id message-id
- {:keys [chainId blockExplorerUrls chainName iconUrls nativeCurrency rpcUrls] :as params}]
- (let [manage {:name {:value chainName}
- :symbol {:value (:symbol nativeCurrency)}
- :url {:value (first rpcUrls)}
- :network-id {:value chainId}
- :chain {:value :custom}}]
- (if (network/valid-manage? manage)
- (let [{:keys [name url chain network-id symbol]} manage
- random-id (string/replace (random/id) "-" "")
- network (network/new-network random-id
- (:value name)
- (:value symbol)
- (:value url)
- (:value chain)
- (:value network-id))
- new-networks (assoc networks random-id network)
- params (assoc params
- :new-networks new-networks
- :id id
- :new-network network)]
- (if (network/chain-id-available? networks network)
- {:dispatch [:bottom-sheet/show-sheet-old
- {:content (fn []
- [sheet/permissions-panel dapp-name message-id params])}]}
- (send-success-call-to-bridge cofx id message-id)))
- {:browser/send-to-bridge {:type constants/web3-send-async-callback
- :messageId message-id
- :error {:code -32602
- :message "invalid network parameters"}}})))
-

src/legacy/status_im/network/core.cljs

@@ -1,11 +1,6 @@
 (ns legacy.status-im.network.core
  (:require
- [clojure.string :as string]
- [re-frame.core :as re-frame]
- [status-im.navigation.events :as navigation]
- [utils.ethereum.chain :as chain]
- [utils.i18n :as i18n]
- [utils.re-frame :as rf]))
+ [clojure.string :as string]))
 
 (def url-regex
  #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -14,12 +9,6 @@
  [url]
  (boolean (re-matches url-regex (str url))))
 
-(def default-manage
- {:name {:value ""}
- :url {:value ""}
- :symbol {:value ""}
- :chain {:value :mainnet}})
-
 (defn validate-string
  [{:keys [value]}]
  {:value value
@@ -56,123 +45,3 @@
  [current-networks network]
  (let [chain-id (get-in network [:config :NetworkId])]
  (every? #(not= chain-id (get-in % [1 :config :NetworkId])) current-networks)))
-
-(defn get-network
- [{:keys [db]} network-id]
- (get-in db [:networks/networks network-id]))
-
-(rf/defn set-input
- {:events [::input-changed]}
- [{:keys [db]} input-key value]
- {:db (-> db
- (update-in [:networks/manage input-key] assoc :value value)
- (update-in [:networks/manage] validate-manage))})
-
-;; No edit functionality actually implemented
-(rf/defn edit
- {:events [::add-network-pressed]}
- [{db :db}]
- {:db (assoc db :networks/manage (validate-manage default-manage))
- :dispatch [:navigate-to :edit-network]})
-
-(rf/defn connect-success
- {:events [::connect-success]}
- [_ network-id]
- {:ui/show-confirmation
- {:title (i18n/label :t/close-app-title)
- :content (i18n/label :t/logout-app-content)
- :confirm-button-text (i18n/label :t/close-app-button)
- :on-accept #(re-frame/dispatch [::save-network-settings-pressed network-id])
- :on-cancel nil}})
-
-(rf/defn connect-failure
- {:events [::connect-failure]}
- [_ reason]
- {:effects.utils/show-popup
- {:title (i18n/label :t/error)
- :content (str reason)}})
-
-(rf/defn connect
- {:events [::connect-network-pressed]}
- [{:keys [db] :as cofx} network-id]
- (if (get-in db [:networks/networks network-id :config])
- (connect-success cofx network-id)
- (connect-failure cofx "A network with the specified id doesn't exist")))
-
-(rf/defn delete
- {:events [::delete-network-pressed]}
- [{:keys [db]} network]
- (let [current-network? (= (:networks/current-network db) network)]
- (if (or current-network?
- (not (get-in db [:networks/networks network])))
- {:ui/show-error (i18n/label :t/delete-network-error)}
- {:ui/show-confirmation {:title (i18n/label :t/delete-network-title)
- :content (i18n/label :t/delete-network-confirmation)
- :confirm-button-text (i18n/label :t/delete)
- :on-accept #(re-frame/dispatch [::remove-network-confirmed
- network])
- :on-cancel nil}})))
-
-(rf/defn save-network-settings
- {:events [::save-network-settings-pressed]}
- [{:keys [db] :as cofx} network]
- {:db (assoc db :networks/current-network network)
- :json-rpc/call [{:method "settings_saveSetting"
- :params [:networks/current-network network]
- :on-success #(re-frame/dispatch [:logout])}]})
-
-(rf/defn remove-network
- {:events [::remove-network-confirmed]}
- [{:keys [db] :as cofx} network]
- (let [networks (dissoc (:networks/networks db) network)]
- {:db (assoc db :networks/networks networks)
- :json-rpc/call [{:method "settings_saveSetting"
- :params [:networks/networks (vals networks)]
- :on-success #(re-frame/dispatch [:navigate-back])}]}))
-
-(defn new-network
- [random-id network-name sym upstream-url chain-type chain-id]
- (let [data-dir (str "/ethereum/" (name chain-type) "_rpc")
- config {:NetworkId (or (when chain-id (int chain-id))
- (chain/chain-keyword->chain-id chain-type))
- :DataDir data-dir
- :UpstreamConfig {:Enabled true
- :URL upstream-url}}]
- {:id random-id
- :name network-name
- :symbol sym
- :config config}))
-
-(rf/defn save
- {:events [::save-network-pressed]
- :interceptors [(re-frame/inject-cofx :random-id-generator)]}
- [{{:networks/keys [manage networks] :as db} :db
- random-id-generator :random-id-generator
- :as cofx}]
- (if (valid-manage? manage)
- ;; rename network-id from UI to chain-id
- (let [{:keys [name url chain network-id symbol]} manage
- random-id (string/replace (random-id-generator) "-" "")
- network (new-network random-id
- (:value name)
- (:value symbol)
- (:value url)
- (:value chain)
- (:value network-id))
- custom-chain-type? (= :custom (:value chain))
- new-networks (assoc networks random-id network)]
- (if (or (not custom-chain-type?)
- (chain-id-available? networks network))
- {:db (-> db
- (dissoc :networks/manage)
- (assoc :networks/networks new-networks))
- :json-rpc/call [{:method "settings_saveSetting"
- :params [:networks/networks (vals new-networks)]
- :on-success #(re-frame/dispatch [:navigate-back])}]}
- {:ui/show-error "chain-id already defined"}))
- {:ui/show-error "invalid network parameters"}))
-
-(rf/defn open-network-details
- {:events [::network-entry-pressed]}
- [cofx network]
- (navigation/navigate-to cofx :network-details {:networks/selected-network network}))

src/legacy/status_im/network/core_test.cljs

@@ -31,38 +31,6 @@
  (testing "an https url not on the default port"
  (is (network.core/valid-rpc-url? "https://valid.something.else:65323"))))
 
-(deftest new-network-test
- (let [actual (network.core/new-network "randomid"
- "network-name"
- "network-symbol"
- "upstream-url"
- :mainnet
- nil)]
- (is (= {:id "randomid"
- :name "network-name"
- :symbol "network-symbol"
- :config {:NetworkId 1
- :DataDir "/ethereum/mainnet_rpc"
- :UpstreamConfig {:Enabled true
- :URL "upstream-url"}}}
- actual))))
-
-(deftest new-network-id-test
- (let [actual (network.core/new-network "randomid"
- "network-name"
- "network-symbol"
- "upstream-url"
- :mainnet
- "5777")]
- (is (= {:id "randomid"
- :name "network-name"
- :symbol "network-symbol"
- :config {:NetworkId 5777
- :DataDir "/ethereum/mainnet_rpc"
- :UpstreamConfig {:Enabled true
- :URL "upstream-url"}}}
- actual))))
-
 (deftest valid-manage-test
  (testing "a valid manage"
  (is (network.core/valid-manage? {:url {:value "http://valid.com"}
@@ -92,101 +60,3 @@
  :name {:value "valid"}
  :symbol {:value ""}
  :chain {:value "valid"}})))))
-
-(deftest set-input-test
- (testing "it updates and validate a field"
- (is
- (= {:db {:networks/manage {:url {:value "http://valid.com"
- :error false}
- :name {:value ""
- :error true}
- :symbol {:value "symbol"
- :error false}
- :chain {:value "mainnet"
- :error false}
- :network-id {:value nil
- :error false}}}}
- (network.core/set-input {:db {:networks/manage {:url {:value "something"
- :error true}
- :name {:value ""
- :error false}
- :symbol {:value "symbol"
- :error false}
- :chain {:value "mainnet"
- :error false}}}}
- :url
- "http://valid.com")))))
-
-(deftest not-save-invalid-url
- (testing "it does not save a network with an invalid url"
- (is
- (:ui/show-error (network.core/save {:random-id-generator (constantly "random")
- :db {:networks/manage {:url {:value "wrong"}
- :chain {:value "1"}
- :name {:value "empty"}}
- :profile/profile {}}})))))
-
-(deftest save-valid-network
- (testing "save a valid network"
- (let [fx (network.core/save
- {:random-id-generator (constantly "random-id")
- :db {:networks/manage {:url {:value "http://valid.com"}
- :chain {:value :mainnet}
- :symbol {:value "symbol"}
- :name {:value "valid"}}
- :profile/profile {}
- :networks/networks {"random2"
- {:id "random2"
- :name "network-name"
- :symbol "symbol"
- :config {:NetworkId 1
- :DataDir "/ethereum/mainnet_rpc"
- :UpstreamConfig
- {:Enabled true
- :URL "upstream-url"}}}}}})]
- (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
- (is (nil? (:networks/manage (:db fx))))
- (testing "and check that it has an id with `-` and the correct mainnet NetworkId"
- (is (= 1 (get-in fx [:db :networks/networks "randomid" :config :NetworkId])))))))
-
-(deftest not-save-custom-chain-with-non-unique-id
- (testing "it does not save a custom chain with network-id already defined"
- (let [result (network.core/save
- {:random-id-generator (constantly "already-defined")
- :db {:networks/manage {:url {:value "http://valid.com"}
- :chain {:value :custom}
- :name {:value "valid"}
- :network-id {:value 1}}
- :profile/profile {}
- :networks/networks {"random"
- {:id "random"
- :name "network-name"
- :config {:NetworkId 1
- :DataDir "/ethereum/mainnet_rpc"
- :UpstreamConfig
- {:Enabled true
- :URL "upstream-url"}}}}}})]
- (is (:ui/show-error result)))))
-
-(deftest save-valid-network-with-unique-chain-id-check
- (testing "save a valid network with chain-id not already defined"
- (let [fx (network.core/save
- {:random-id-generator (constantly "random")
- :db {:networks/manage {:url {:value "http://valid.com"}
- :chain {:value :mainnet}
- :name {:value "valid"}
- :symbol {:value "symbol"}
- :network-id {:value 5}}
- :profile/profile {}
- :networks/networks {"randomid"
- {:id "randomid"
- :name "network-name"
- :symbol "symbol"
- :config {:NetworkId 3
- :DataDir "/ethereum/mainnet_rpc"
- :UpstreamConfig
- {:Enabled true
- :URL "upstream-url"}}}}}})]
- (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
- (is (nil? (:networks/manage (:db fx))))
- (is (get-in fx [:db :networks/networks "random"])))))