From 335635e4a84d168796b53d21ee320c2f25db7daf Mon Sep 17 00:00:00 2001
From: Olivier Freyssinet <olivier.freyssinet@ledger.fr>
Date: Tue, 11 Jun 2024 16:50:57 +0200
Subject: [PATCH] fix(llm/QueuedDrawer): if onClose changes, drawer shouldn't
 auto close

---
 .../src/newArch/components/QueuedDrawer/TestScreens.tsx    | 2 +-
 .../src/newArch/components/QueuedDrawer/index.tsx          | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/TestScreens.tsx b/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/TestScreens.tsx
index 0bc40e0f8537..b6c2eb2d2c5f 100644
--- a/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/TestScreens.tsx
+++ b/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/TestScreens.tsx
@@ -181,7 +181,7 @@ export const MainTestScreen = () => {
   const [drawer3RequestingToBeOpened, setDrawer3RequestingToBeOpened] = useState(false);
   const [drawer4ForcingToBeOpened, setDrawer4ForcingToBeOpened] = useState(false);
 
-  const handleDrawer1Close = useCallback(() => setDrawer1RequestingToBeOpened(false), []);
+  const handleDrawer1Close = () => setDrawer1RequestingToBeOpened(false); // purposely not using useCallback to check if drawer behaves well when onClose prop changes
   const handleDrawer2Close = useCallback(() => setDrawer2RequestingToBeOpened(false), []);
   const handleDrawer3Close = useCallback(() => setDrawer3RequestingToBeOpened(false), []);
   const handleDrawer4Close = useCallback(() => setDrawer4ForcingToBeOpened(false), []);
diff --git a/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/index.tsx b/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/index.tsx
index 10118a9df340..ea9c7a153cae 100644
--- a/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/index.tsx
+++ b/apps/ledger-live-mobile/src/newArch/components/QueuedDrawer/index.tsx
@@ -81,14 +81,17 @@ const QueuedDrawer = ({
     setIsDisplayed(true);
   }, []);
 
+  const onCloseRef = useRef(onClose);
+  onCloseRef.current = onClose;
+
   const triggerClose = useCallback(() => {
     setIsDisplayed(false);
     if (drawerInQueueRef.current?.getPositionInQueue() !== 0) {
       drawerInQueueRef.current?.removeDrawerFromQueue();
       drawerInQueueRef.current = undefined;
     }
-    onClose && onClose();
-  }, [onClose]);
+    onCloseRef.current && onCloseRef.current(); // hack to avoid triggering the useEffect below if the parent changes the onClose prop
+  }, []);
 
   useEffect(() => {
     if (!isFocused && (isRequestingToBeOpened || isForcingToBeOpened)) {