From 686f6bdf5ec392be81aae6cfd4c101ecdd9b6278 Mon Sep 17 00:00:00 2001
From: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:06:44 +0530
Subject: [PATCH] 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>
---
 .../wallet/saved_addresses/add_address_to_save/view.cljs   | 2 +-
 .../contexts/settings/wallet/saved_addresses/events.cljs   | 5 +++--
 .../settings/wallet/saved_addresses/events_test.cljs       | 7 ++++---
 .../settings/wallet/saved_addresses/save_address/view.cljs | 4 ++--
 .../contexts/settings/wallet/saved_addresses/view.cljs     | 2 ++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs
index e580c5bf61..1d081d0e44 100644
--- a/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs
+++ b/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs
@@ -156,7 +156,7 @@
                                                (rf/dispatch
                                                 [:wallet/set-address-to-save
                                                  {:address address
-                                                  :ens     address-or-ens
+                                                  :ens     (when ens-name? address-or-ens)
                                                   :ens?    ens-name?}])
                                                (rf/dispatch
                                                 [:open-modal :screen/settings.save-address]))
diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/events.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/events.cljs
index 46b0ec64fb..493e69d0aa 100644
--- a/src/status_im/contexts/settings/wallet/saved_addresses/events.cljs
+++ b/src/status_im/contexts/settings/wallet/saved_addresses/events.cljs
@@ -90,7 +90,8 @@
 (defn add-saved-address-success
   [_ [toast-message]]
   {: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
          {:ms       100
           :dispatch [:toasts/upsert
@@ -103,7 +104,7 @@
 (defn edit-saved-address-success
   [_]
   {:fx [[:dispatch [:wallet/get-saved-addresses]]
-        [:dispatch [:navigate-back]]
+        [:dispatch [:dismiss-modal :screen/settings.edit-saved-address]]
         [:dispatch-later
          {:ms       100
           :dispatch [:toasts/upsert
diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/events_test.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/events_test.cljs
index 27fc70ad4d..1fc9a500b6 100644
--- a/src/status_im/contexts/settings/wallet/saved_addresses/events_test.cljs
+++ b/src/status_im/contexts/settings/wallet/saved_addresses/events_test.cljs
@@ -152,14 +152,15 @@
           effects       (events/add-saved-address-success cofx [toast-message])
           result-fx     (:fx effects)
           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
                           {:ms       100
                            :dispatch [:toasts/upsert
                                       {:type  :positive
                                        :theme :dark
                                        :text  toast-message}]}]]]
-      (is (= (count result-fx) 3))
+      (is (= (count result-fx) 4))
       (is (match? expected-fx result-fx)))))
 
 (deftest edit-saved-address-success-test
@@ -169,7 +170,7 @@
           effects       (events/edit-saved-address-success cofx)
           result-fx     (:fx effects)
           expected-fx   [[:dispatch [:wallet/get-saved-addresses]]
-                         [:dispatch [:navigate-back]]
+                         [:dispatch [:dismiss-modal :screen/settings.edit-saved-address]]
                          [:dispatch-later
                           {:ms       100
                            :dispatch [:toasts/upsert
diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs
index 4a6d9a0649..8271573606 100644
--- a/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs
+++ b/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs
@@ -81,7 +81,7 @@
                                         :on-error
                                         [:wallet/add-saved-address-failed]
                                         :name address-label
-                                        :ens ens
+                                        :ens (when ens? ens)
                                         :address address-without-prefix
                                         :customization-color address-color
                                         :chain-short-names chain-short-names}]))
@@ -93,7 +93,7 @@
                                    :subtitle-type   :default
                                    :label           :none
                                    :blur?           true
-                                   :icon-right?     true
+                                   :icon-right?     (not ens?)
                                    :right-icon      :i/advanced
                                    :card?           true
                                    :title           (i18n/label :t/address)
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 0d5fe39219..f55466e81b 100644
--- a/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs
+++ b/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs
@@ -46,6 +46,8 @@
                                                         {:address address
                                                          :chain-short-names chain-short-names
                                                          :full-address full-address
+                                                         :ens? ens?
+                                                         :ens ens
                                                          :name name
                                                          :network-preferences-names
                                                          network-preferences-names