From fb0dea79aeb9723c312efc222a9b19759379413d Mon Sep 17 00:00:00 2001
From: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
Date: Thu, 27 Jun 2024 22:22:25 +0530
Subject: [PATCH] fix: Remove saved address on delete

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
---
 .../wallet/saved_addresses/events.cljs        | 25 +++++++++++--------
 .../wallet/saved_addresses/events_test.cljs   |  5 +++-
 2 files changed, 19 insertions(+), 11 deletions(-)

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 0f14731cbb..23e957fa92 100644
--- a/src/status_im/contexts/settings/wallet/saved_addresses/events.cljs
+++ b/src/status_im/contexts/settings/wallet/saved_addresses/events.cljs
@@ -66,15 +66,17 @@
 (rf/reg-event-fx :wallet/get-saved-addresses get-saved-addresses)
 
 (defn delete-saved-address-success
-  [_ [toast-message]]
-  {:fx [[:dispatch [:wallet/get-saved-addresses]]
-        [:dispatch [:hide-bottom-sheet]]
-        [:dispatch-later
-         {:ms       100
-          :dispatch [:toasts/upsert
-                     {:type  :positive
-                      :theme :dark
-                      :text  toast-message}]}]]})
+  [{:keys [db]} [{:keys [address test-networks-enabled? toast-message]}]]
+  (let [db-key        (if test-networks-enabled? :test :prod)
+        saved-address (get-in db [:wallet :saved-addresses db-key address])]
+    {:fx [[:dispatch [:wallet/reconcile-saved-addresses [(assoc saved-address :removed? true)]]]
+          [:dispatch [:hide-bottom-sheet]]
+          [:dispatch-later
+           {:ms       100
+            :dispatch [:toasts/upsert
+                       {:type  :positive
+                        :theme :dark
+                        :text  toast-message}]}]]}))
 
 (rf/reg-event-fx :wallet/delete-saved-address-success delete-saved-address-success)
 
@@ -96,7 +98,10 @@
     {:fx [[:json-rpc/call
            [{:method     "wakuext_deleteSavedAddress"
              :params     [address test-networks-enabled?]
-             :on-success [:wallet/delete-saved-address-success toast-message]
+             :on-success [:wallet/delete-saved-address-success
+                          {:address                address
+                           :test-networks-enabled? test-networks-enabled?
+                           :toast-message          toast-message}]
              :on-error   [:wallet/delete-saved-address-failed]}]]]}))
 
 (rf/reg-event-fx :wallet/delete-saved-address delete-saved-address)
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 19b36753fc..d6eff59260 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
@@ -210,7 +210,10 @@
           expected-fx            [[:json-rpc/call
                                    [{:method     "wakuext_deleteSavedAddress"
                                      :params     [address test-networks-enabled?]
-                                     :on-success [:wallet/delete-saved-address-success toast-message]
+                                     :on-success [:wallet/delete-saved-address-success
+                                                  {:address                address
+                                                   :test-networks-enabled? test-networks-enabled?
+                                                   :toast-message          toast-message}]
                                      :on-error   [:wallet/delete-saved-address-failed]}]]]]
       (is (match? expected-fx result-fx)))))