Skip to content

Commit

Permalink
[#19734] fix: address reviewer feedbacks
Browse files Browse the repository at this point in the history
  • Loading branch information
@mohsen-ghafouri
mohsen-ghafouri committed Jun 5, 2024
1 parent 73686a2 commit 290a866
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 43 deletions.
10 changes: 10 additions & 0 deletions src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/style.cljs
View file
Original file line number Diff line number Diff line change
@@ -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})
67 changes: 30 additions & 37 deletions src/status_im/contexts/settings/wallet/saved_addresses/sheets/share_address/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -51,55 +50,49 @@

(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
:background :blur
: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
:qr-image-uri qr-media-server-uri
: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
Expand Down
13 changes: 7 additions & 6 deletions src/status_im/contexts/settings/wallet/saved_addresses/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 290a866

Please sign in to comment.