From 2cfff18cb50c254dd2e3cdc8128fec9cfa49af3c Mon Sep 17 00:00:00 2001
From: Mohamed Marrouchi <marrouchi.mohamed@gmail.com>
Date: Thu, 29 May 2025 06:39:23 +0100
Subject: [PATCH] fix: preserve search on conversation select

---
 .../inbox/components/ConversationsList.tsx       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/inbox/components/ConversationsList.tsx b/frontend/src/components/inbox/components/ConversationsList.tsx
index 2d71b614..da1e4876 100644
--- a/frontend/src/components/inbox/components/ConversationsList.tsx
+++ b/frontend/src/components/inbox/components/ConversationsList.tsx
@@ -32,8 +32,8 @@ export const SubscribersList = (props: {
   searchPayload: any;
   assignedTo: AssignedTo;
 }) => {
-  const { query, push } = useRouter();
-  const subscriber = query.subscriber?.toString() || null;
+  const router = useRouter();
+  const subscriber = router.query.subscriber?.toString() || null;
   const { apiUrl } = useConfig();
   const { t, i18n } = useTranslate();
   const chat = useChat();
@@ -74,7 +74,17 @@ export const SubscribersList = (props: {
             <Conversation
               onClick={() => {
                 chat.setSubscriberId(subscriber.id);
-                push(`/${RouterType.INBOX}/subscribers/${subscriber.id}`);
+                router.push(
+                  {
+                    pathname: `/${RouterType.INBOX}/subscribers/[subscriber]`,
+                    query: {
+                      ...router.query,
+                      subscriber: subscriber.id,
+                    },
+                  },
+                  undefined,
+                  { shallow: true },
+                );
               }}
               className="changeColor"
               key={subscriber.id}