From 174e44c77de6505a9569c2dc47c85704f4144c5e Mon Sep 17 00:00:00 2001
From: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
Date: Thu, 16 Jan 2025 21:57:06 +0530
Subject: [PATCH] fix(wallet)_: Dismiss collectible details screen after a is
 TX placed (#21909)

This commit fixes the user is not taken to the activity tab after the TX is placed if the user enters the send flow from collectible details screen (inside the account)

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
---
 src/status_im/contexts/wallet/collectible/events.cljs | 2 +-
 src/status_im/contexts/wallet/events.cljs             | 6 +++---
 src/status_im/contexts/wallet/send/events.cljs        | 1 +
 src/status_im/navigation/screens.cljs                 | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/status_im/contexts/wallet/collectible/events.cljs b/src/status_im/contexts/wallet/collectible/events.cljs
index 2d01997f24..edb8b332b0 100644
--- a/src/status_im/contexts/wallet/collectible/events.cljs
+++ b/src/status_im/contexts/wallet/collectible/events.cljs
@@ -303,7 +303,7 @@
            ;; By doing it, we skip a blink while visiting the collectible detail page.
            [:dispatch-later
             {:ms       17
-             :dispatch [:navigate-to :screen/wallet.collectible]}]]})))
+             :dispatch [:open-modal :screen/wallet.collectible]}]]})))
 
 (defn- keep-not-empty-value
   [old-value new-value]
diff --git a/src/status_im/contexts/wallet/events.cljs b/src/status_im/contexts/wallet/events.cljs
index d95dbc7597..f867618e11 100644
--- a/src/status_im/contexts/wallet/events.cljs
+++ b/src/status_im/contexts/wallet/events.cljs
@@ -41,18 +41,18 @@
 (rf/reg-event-fx :wallet/navigate-to-account
  (fn [{:keys [db]} [address]]
    {:db (assoc-in db [:wallet :current-viewing-account-address] address)
-    :fx [[:dispatch [:navigate-to :screen/wallet.accounts address]]]}))
+    :fx [[:dispatch [:navigate-to :screen/wallet.accounts]]]}))
 
 (rf/reg-event-fx :wallet/navigate-to-account-within-stack
  (fn [{:keys [db]} [address]]
    {:db (assoc-in db [:wallet :current-viewing-account-address] address)
-    :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.accounts :shell-stack] address]]]}))
+    :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.accounts :shell-stack]]]]}))
 
 (rf/reg-event-fx :wallet/navigate-to-new-account
  (fn [{:keys [db]} [address]]
    {:db (assoc-in db [:wallet :current-viewing-account-address] address)
     :fx [[:dispatch [:hide-bottom-sheet]]
-         [:dispatch [:navigate-to :screen/wallet.accounts address]]
+         [:dispatch [:navigate-to :screen/wallet.accounts]]
          [:dispatch [:wallet/show-account-created-toast address]]]}))
 
 (rf/reg-event-fx :wallet/select-account-tab
diff --git a/src/status_im/contexts/wallet/send/events.cljs b/src/status_im/contexts/wallet/send/events.cljs
index 16f4738ad4..deba686e12 100644
--- a/src/status_im/contexts/wallet/send/events.cljs
+++ b/src/status_im/contexts/wallet/send/events.cljs
@@ -633,6 +633,7 @@
 (rf/reg-event-fx :wallet/clean-up-transaction-flow
  (fn [_]
    {:fx [[:dispatch [:dismiss-modal :screen/wallet.transaction-confirmation]]
+         [:dispatch [:dismiss-modal :screen/wallet.collectible]]
          [:dispatch [:wallet/clean-scanned-address]]
          [:dispatch [:wallet/clean-local-suggestions]]
          [:dispatch [:wallet/clean-send-address]]
diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs
index 5d2a66a09d..098bff5c7a 100644
--- a/src/status_im/navigation/screens.cljs
+++ b/src/status_im/navigation/screens.cljs
@@ -518,6 +518,7 @@
 
    {:name      :screen/wallet.collectible
     :metrics   {:track? true}
+    :options   {:modalPresentationStyle :overCurrentContext}
     :component wallet-collectible/view}
 
    {:name      :screen/wallet.edit-account