From 8e22173ee1992d50aaaeb8e71c9bcd8ae0f30b6a Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Sat, 31 May 2025 16:43:47 +0100
Subject: [PATCH 1/2] fix(frontend): resolve inbox flickering issue

---
 .../src/components/inbox/components/ConversationsList.tsx   | 6 ++----
 frontend/src/components/inbox/index.tsx                     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/inbox/components/ConversationsList.tsx b/frontend/src/components/inbox/components/ConversationsList.tsx
index da1e4876..8ae03eaa 100644
--- a/frontend/src/components/inbox/components/ConversationsList.tsx
+++ b/frontend/src/components/inbox/components/ConversationsList.tsx
@@ -44,10 +44,8 @@ export const SubscribersList = (props: {
   }, 400);
 
   useEffect(() => {
-    if (chat) {
-      chat.setSubscriberId(subscriber);
-    }
-  }, [chat, subscriber]);
+    chat.setSubscriberId(subscriber);
+  }, [subscriber]);
 
   return (
     <>
diff --git a/frontend/src/components/inbox/index.tsx b/frontend/src/components/inbox/index.tsx
index 22564d47..dafce8a8 100644
--- a/frontend/src/components/inbox/index.tsx
+++ b/frontend/src/components/inbox/index.tsx
@@ -49,7 +49,7 @@ export const Inbox = () => {
       >
         <Grid item width="100%" height="100%" overflow="hidden">
           <MainContainer style={{ height: "100%" }}>
-            <Sidebar position="left">
+            <Sidebar position="left" style={{ flexBasis: "100%" }}>
               <Grid paddingX={1} paddingTop={2} paddingBottom={1} mx={1}>
                 <FilterTextfield
                   onChange={onSearch}

From 6c2ce757fb0546869a535facd9a72cf331cc3194 Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Sat, 31 May 2025 16:52:58 +0100
Subject: [PATCH 2/2] fix(frontend): apply feedback

---
 .../src/components/inbox/components/ConversationsList.tsx     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/inbox/components/ConversationsList.tsx b/frontend/src/components/inbox/components/ConversationsList.tsx
index 8ae03eaa..93c4bced 100644
--- a/frontend/src/components/inbox/components/ConversationsList.tsx
+++ b/frontend/src/components/inbox/components/ConversationsList.tsx
@@ -44,7 +44,9 @@ export const SubscribersList = (props: {
   }, 400);
 
   useEffect(() => {
-    chat.setSubscriberId(subscriber);
+    if (chat) {
+      chat.setSubscriberId(subscriber);
+    }
   }, [subscriber]);
 
   return (