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(wallet): saved addresses - navigation on save and ens fixes (#20462) 

This commit:
- fixes addresses are displayed without truncation
- fixes network preference (advanced icon) shown for ENS
- fixes navigation on adding a new saved address

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
This commit is contained in:
Mohamed Javid 2024-06-14 17:06:44 +05:30 committed by GitHub
parent 8b424b0669
commit 686f6bdf5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs
View File

@ -156,7 +156,7 @@
(rf/dispatch (rf/dispatch
[:wallet/set-address-to-save [:wallet/set-address-to-save
{:address address {:address address
:ens address-or-ens :ens (when ens-name? address-or-ens)
:ens? ens-name?}]) :ens? ens-name?}])
(rf/dispatch (rf/dispatch
[:open-modal :screen/settings.save-address])) [:open-modal :screen/settings.save-address]))

5
src/status_im/contexts/settings/wallet/saved_addresses/events.cljs
View File

@ -90,7 +90,8 @@
(defn add-saved-address-success (defn add-saved-address-success
[_ [toast-message]] [_ [toast-message]]
{:fx [[:dispatch [:wallet/get-saved-addresses]] {:fx [[:dispatch [:wallet/get-saved-addresses]]
[:dispatch [:navigate-back-to :screen/settings.saved-addresses]] [:dispatch [:dismiss-modal :screen/settings.add-address-to-save]]
[:dispatch [:dismiss-modal :screen/settings.save-address]]
[:dispatch-later [:dispatch-later
{:ms 100 {:ms 100
:dispatch [:toasts/upsert :dispatch [:toasts/upsert
@ -103,7 +104,7 @@
(defn edit-saved-address-success (defn edit-saved-address-success
[_] [_]
{:fx [[:dispatch [:wallet/get-saved-addresses]] {:fx [[:dispatch [:wallet/get-saved-addresses]]
[:dispatch [:navigate-back]] [:dispatch [:dismiss-modal :screen/settings.edit-saved-address]]
[:dispatch-later [:dispatch-later
{:ms 100 {:ms 100
:dispatch [:toasts/upsert :dispatch [:toasts/upsert

7
src/status_im/contexts/settings/wallet/saved_addresses/events_test.cljs
View File

@ -152,14 +152,15 @@
effects (events/add-saved-address-success cofx [toast-message]) effects (events/add-saved-address-success cofx [toast-message])
result-fx (:fx effects) result-fx (:fx effects)
expected-fx [[:dispatch [:wallet/get-saved-addresses]] expected-fx [[:dispatch [:wallet/get-saved-addresses]]
[:dispatch [:navigate-back-to :screen/settings.saved-addresses]] [:dispatch [:dismiss-modal :screen/settings.add-address-to-save]]
[:dispatch [:dismiss-modal :screen/settings.save-address]]
[:dispatch-later [:dispatch-later
{:ms 100 {:ms 100
:dispatch [:toasts/upsert :dispatch [:toasts/upsert
{:type :positive {:type :positive
:theme :dark :theme :dark
:text toast-message}]}]]] :text toast-message}]}]]]
(is (= (count result-fx) 3)) (is (= (count result-fx) 4))
(is (match? expected-fx result-fx))))) (is (match? expected-fx result-fx)))))
(deftest edit-saved-address-success-test (deftest edit-saved-address-success-test
@ -169,7 +170,7 @@
effects (events/edit-saved-address-success cofx) effects (events/edit-saved-address-success cofx)
result-fx (:fx effects) result-fx (:fx effects)
expected-fx [[:dispatch [:wallet/get-saved-addresses]] expected-fx [[:dispatch [:wallet/get-saved-addresses]]
[:dispatch [:navigate-back]] [:dispatch [:dismiss-modal :screen/settings.edit-saved-address]]
[:dispatch-later [:dispatch-later
{:ms 100 {:ms 100
:dispatch [:toasts/upsert :dispatch [:toasts/upsert

4
src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs
View File

@ -81,7 +81,7 @@
:on-error :on-error
[:wallet/add-saved-address-failed] [:wallet/add-saved-address-failed]
:name address-label :name address-label
:ens ens :ens (when ens? ens)
:address address-without-prefix :address address-without-prefix
:customization-color address-color :customization-color address-color
:chain-short-names chain-short-names}])) :chain-short-names chain-short-names}]))
@ -93,7 +93,7 @@
:subtitle-type :default :subtitle-type :default
:label :none :label :none
:blur? true :blur? true
:icon-right? true :icon-right? (not ens?)
:right-icon :i/advanced :right-icon :i/advanced
:card? true :card? true
:title (i18n/label :t/address) :title (i18n/label :t/address)

2
src/status_im/contexts/settings/wallet/saved_addresses/view.cljs
View File

@ -46,6 +46,8 @@
{:address address {:address address
:chain-short-names chain-short-names :chain-short-names chain-short-names
:full-address full-address :full-address full-address
:ens? ens?
:ens ens
:name name :name name
:network-preferences-names :network-preferences-names
network-preferences-names network-preferences-names