diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/style.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/style.cljs new file mode 100644 index 00000000000..dad3273a7f3 --- /dev/null +++ b/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/style.cljs @@ -0,0 +1,10 @@ +(ns status-im.contexts.settings.wallet.saved-addresses.sheets.share-address.style) + +(def screen-container + {:flex 1}) + +(def top-container + {:margin-bottom 8}) + +(def qr-wrapper + {:padding-horizontal 20}) diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/view.cljs index 2822ac45d75..3099e7b7b47 100644 --- a/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/view.cljs +++ b/src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/view.cljs @@ -3,8 +3,7 @@ [quo.core :as quo] [react-native.core :as rn] [react-native.platform :as platform] - [react-native.safe-area :as safe-area] - [status-im.constants :as constants] + [status-im.contexts.settings.wallet.saved-addresses.sheets.share-address.style :as style] [status-im.contexts.wallet.common.utils :as utils] [status-im.contexts.wallet.common.utils.networks :as network-utils] [status-im.contexts.wallet.sheets.network-preferences.view :as network-preferences] @@ -51,38 +50,33 @@ (defn view [] - (let [padding-top (:top (safe-area/get-insets)) - {:keys [name address customization-color]} (rf/sub [:get-screen-params]) - [wallet-type set-wallet-type] (rn/use-state :legacy) - [selected-networks set-selected-networks] (rn/use-state constants/default-network-names) - on-settings-press (rn/use-callback #(open-preferences - selected-networks - set-selected-networks) - [selected-networks]) - on-legacy-press (rn/use-callback #(set-wallet-type :legacy)) - on-multichain-press (rn/use-callback #(set-wallet-type :multichain)) - preferred-networks (rf/sub [:wallet/preferred-chain-names-for-address - address]) - share-title (str name " " (i18n/label :t/address)) - qr-url (rn/use-memo #(utils/get-wallet-qr - {:wallet-type wallet-type - :selected-networks selected-networks - :address address}) - [wallet-type selected-networks address]) - qr-media-server-uri (rn/use-memo - #(image-server/get-qr-image-uri-for-any-url - {:url qr-url - :port (rf/sub [:mediaserver/port]) - :qr-size qr-size - :error-level :highest}) - [qr-url])] - - (rn/use-mount #(set-selected-networks preferred-networks)) - - [quo/overlay {:type :shell} - [rn/view - {:flex 1 - :padding-top padding-top} + (let [{:keys [name address customization-color + network-preferences-names]} (rf/sub [:get-screen-params]) + [wallet-type set-wallet-type] (rn/use-state :legacy) + [selected-networks set-selected-networks] (rn/use-state network-preferences-names) + on-settings-press (rn/use-callback #(open-preferences + selected-networks + set-selected-networks) + [selected-networks]) + on-legacy-press (rn/use-callback #(set-wallet-type :legacy)) + on-multichain-press (rn/use-callback #(set-wallet-type :multichain)) + share-title (str name " " (i18n/label :t/address)) + qr-url (rn/use-memo #(utils/get-wallet-qr + {:wallet-type wallet-type + :selected-networks selected-networks + :address address}) + [wallet-type selected-networks address]) + qr-media-server-uri (rn/use-memo + #(image-server/get-qr-image-uri-for-any-url + {:url qr-url + :port (rf/sub [:mediaserver/port]) + :qr-size qr-size + :error-level :highest}) + [qr-url])] + [quo/overlay + {:type :shell + :top-inset? true} + [rn/view {:style style/screen-container} [quo/page-nav {:icon-name :i/close :on-press navigate-back @@ -90,8 +84,8 @@ :accessibility-label :top-bar}] [quo/page-top {:title (i18n/label :t/share-address) - :container-style {:margin-bottom 8}}] - [rn/view {:style {:padding-horizontal 20}} + :container-style style/top-container}] + [rn/view {:style style/qr-wrapper} [quo/share-qr-code {:type :saved-address :address wallet-type @@ -99,7 +93,6 @@ :qr-data qr-url :networks selected-networks :on-share-press #(share-action qr-url share-title) - :profile-picture nil :full-name name :customization-color customization-color :on-legacy-press on-legacy-press diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs index 0acb718387e..70ccf94415e 100644 --- a/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs +++ b/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs @@ -20,7 +20,7 @@ :container-style style/empty-container-style}])) (defn- saved-address - [{:keys [name address chain-short-names customization-color has-ens? ens]}] + [{:keys [name address chain-short-names customization-color has-ens? ens network-preferences-names]}] (let [full-address (str chain-short-names address) on-press-saved-address (rn/use-callback #(rf/dispatch @@ -29,11 +29,12 @@ :shell? true :content (fn [] [address-options/view - {:address address - :chain-short-names chain-short-names - :full-address full-address - :name name - :customization-color customization-color}])}]) + {:address address + :chain-short-names chain-short-names + :full-address full-address + :name name + :network-preferences-names network-preferences-names + :customization-color customization-color}])}]) [address chain-short-names full-address name customization-color])] [quo/saved-address {:blur? true