diff --git a/src/quo/foundations/colors.cljs b/src/quo/foundations/colors.cljs index 4d1c61f71c..eddc30f3bc 100644 --- a/src/quo/foundations/colors.cljs +++ b/src/quo/foundations/colors.cljs @@ -245,6 +245,7 @@ ;;;; Networks (def ^:private networks {:ethereum "#758EEB" + :mainnet "#758EEB" :optimism "#E76E6E" :arbitrum "#6BD5F0" :zkSync "#9FA0FE" diff --git a/src/status_im/common/qr_codes/view.cljs b/src/status_im/common/qr_codes/view.cljs index e80499a2c2..4fd88ab653 100644 --- a/src/status_im/common/qr_codes/view.cljs +++ b/src/status_im/common/qr_codes/view.cljs @@ -1,6 +1,7 @@ (ns status-im.common.qr-codes.view (:require [quo.core :as quo] + [status-im.constants :as constants] [utils.image-server :as image-server] [utils.re-frame :as rf])) @@ -43,9 +44,10 @@ (defn get-network-short-name-url [network] (case network - :ethereum "eth:" - :optimism "opt:" - :arbitrum "arb1:" + :ethereum (str constants/mainnet-short-name ":") + :mainnet (str constants/mainnet-short-name ":") + :optimism (str constants/optimism-short-name ":") + :arbitrum (str constants/arbitrum-short-name ":") (str (name network) ":"))) (defn- get-qr-data-for-wallet-multichain @@ -66,7 +68,7 @@ - customization-color: Custom color for the QR code component. - unblur-on-android?: [Android only] disables blur for this component. - full-name: User full name. - + Depending on the `type`, different properties are accepted: `:profile` - profile-picture: map ({:source image-source}) or any image source. diff --git a/src/status_im/contexts/wallet/account/share_address/view.cljs b/src/status_im/contexts/wallet/account/share_address/view.cljs index 368b160615..eced4be4ed 100644 --- a/src/status_im/contexts/wallet/account/share_address/view.cljs +++ b/src/status_im/contexts/wallet/account/share_address/view.cljs @@ -34,7 +34,8 @@ [selected-networks] (let [on-save (fn [chain-ids] (rf/dispatch [:hide-bottom-sheet]) - (reset! selected-networks (map utils/id->network chain-ids))) + (reset! selected-networks (map #(if (= % 1) :mainnet (utils/id->network %)) + chain-ids))) sheet-content (fn [] [network-preferences/view {:blur? true @@ -52,7 +53,7 @@ wallet-type (reagent/atom :legacy) ;; Design team is yet to confirm the default selected networks here. Should be the current ;; selected for the account or all the networks always - selected-networks (reagent/atom [:ethereum :optimism :arbitrum]) + selected-networks (reagent/atom [:mainnet :optimism :arbitrum]) on-settings-press #(open-preferences selected-networks) on-legacy-press #(reset! wallet-type :legacy) on-multichain-press #(reset! wallet-type :multichain)] diff --git a/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs b/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs index 4ba2e1b2cc..5ef37d2bc3 100644 --- a/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs +++ b/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs @@ -93,7 +93,7 @@ layer-2-networks)}] [quo/bottom-actions {:actions :one-action - :button-one-label (i18n/label :t/update) + :button-one-label (i18n/label :t/display) :button-one-props {:disabled? (= @state :default) :on-press (fn [] (let [chain-ids (map :chain-id current-networks)] diff --git a/translations/en.json b/translations/en.json index 7ac10da317..9fd5540233 100644 --- a/translations/en.json +++ b/translations/en.json @@ -2565,5 +2565,6 @@ "max": "Max: {{number}}", "key-name-error-length": "Key name too long", "key-name-error-emoji": "Emojis are not allowed", - "key-name-error-special-char": "Special characters are not allowed" + "key-name-error-special-char": "Special characters are not allowed", + "display": "Display" }