status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix usage of ratom to fix wallet share (#18883)

This commit is contained in:
Ibrahem Khalil 2024-03-06 10:46:48 +02:00 committed by GitHub
parent 33e637ff71
commit 0937da9e50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/status_im/contexts/shell/share/wallet/view.cljs
View File

@ -39,7 +39,7 @@
(fn [] (fn []
[network-preferences/view [network-preferences/view
{:blur? true {:blur? true
:selected-networks (set selected-networks) :selected-networks (set @selected-networks)
:on-save (fn [chain-ids] :on-save (fn [chain-ids]
(rf/dispatch [:hide-bottom-sheet]) (rf/dispatch [:hide-bottom-sheet])
(reset! selected-networks (map #(get utils/id->network %) (reset! selected-networks (map #(get utils/id->network %)
@ -48,7 +48,10 @@
[props] [props]
(let [{:keys [account width index]} props (let [{:keys [account width index]} props
selected-networks (reagent/atom [:ethereum :optimism :arbitrum]) selected-networks (reagent/atom [:ethereum :optimism :arbitrum])
wallet-type (reagent/atom :legacy)] wallet-type (reagent/atom :legacy)
on-settings-press #(open-preferences selected-networks)
on-legacy-press #(reset! wallet-type :legacy)
on-multichain-press #(reset! wallet-type :multichain)]
(fn [] (fn []
(let [share-title (str (:name account) " " (i18n/label :t/address)) (let [share-title (str (:name account) " " (i18n/label :t/address))
qr-url (utils/get-wallet-qr {:wallet-type @wallet-type qr-url (utils/get-wallet-qr {:wallet-type @wallet-type
@ -72,9 +75,9 @@
:full-name (:name account) :full-name (:name account)
:customization-color (:color account) :customization-color (:color account)
:emoji (:emoji account) :emoji (:emoji account)
:on-multichain-press #(reset! wallet-type :multichain) :on-multichain-press on-multichain-press
:on-legacy-press #(reset! wallet-type :legacy) :on-legacy-press on-legacy-press
:on-settings-press #(open-preferences @selected-networks)}]]])))) :on-settings-press on-settings-press}]]]))))
(def wallet-qr-code-item (memoize wallet-qr-code-item-internal)) (def wallet-qr-code-item (memoize wallet-qr-code-item-internal))

19
src/status_im/contexts/wallet/share_address/view.cljs
View File

@ -48,11 +48,14 @@
(defn view (defn view
[] []
(let [padding-top (:top (safe-area/get-insets)) (let [padding-top (:top (safe-area/get-insets))
wallet-type (reagent/atom :legacy) wallet-type (reagent/atom :legacy)
;; Design team is yet to confirm the default selected networks here. ;; Design team is yet to confirm the default selected networks here. Should be the current
;; Should be the current selected for the account or all the networks always ;; selected for the account or all the networks always
selected-networks (reagent/atom [:ethereum :optimism :arbitrum])] selected-networks (reagent/atom [:ethereum :optimism :arbitrum])
on-settings-press #(open-preferences selected-networks)
on-legacy-press #(reset! wallet-type :legacy)
on-multichain-press #(reset! wallet-type :multichain)]
(fn [] (fn []
(let [{:keys [address color emoji watch-only?] (let [{:keys [address color emoji watch-only?]
:as account} (rf/sub [:wallet/current-viewing-account]) :as account} (rf/sub [:wallet/current-viewing-account])
@ -97,6 +100,6 @@
:full-name (:name account) :full-name (:name account)
:customization-color color :customization-color color
:emoji emoji :emoji emoji
:on-legacy-press #(reset! wallet-type :legacy) :on-legacy-press on-legacy-press
:on-multichain-press #(reset! wallet-type :multichain) :on-multichain-press on-multichain-press
:on-settings-press #(open-preferences selected-networks)}]]]])))) :on-settings-press on-settings-press}]]]]))))