From 0705ceed3a258cda1fb33e819b662b56539fd78a Mon Sep 17 00:00:00 2001
From: Ugo Giordano <144606237+ugogiordano@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:02:41 +0100
Subject: [PATCH] Fixing duplicate Concierge chat

Addressing the issue of duplicate Concierge chats appearing in the Left Hand Navigation (LHN) when deep linking to Concierge.
---
 src/pages/ConciergePage.tsx | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/pages/ConciergePage.tsx b/src/pages/ConciergePage.tsx
index 46f17e76c083..7ab8deef1bef 100644
--- a/src/pages/ConciergePage.tsx
+++ b/src/pages/ConciergePage.tsx
@@ -1,9 +1,8 @@
 import {useFocusEffect} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useEffect, useRef} from 'react';
+import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {OnyxEntry, useOnyx,withOnyx} from 'react-native-onyx';
 import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
 import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -33,21 +32,23 @@ function ConciergePage({session}: ConciergePageProps) {
     const styles = useThemeStyles();
     const isUnmounted = useRef(false);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {initialValue: true});
 
-    useFocusEffect(() => {
-        if (session && 'authToken' in session) {
-            App.confirmReadyToOpenApp();
-            // Pop the concierge loading page before opening the concierge report.
-            Navigation.isNavigationReady().then(() => {
-                if (isUnmounted.current) {
-                    return;
-                }
-                Report.navigateToConciergeChat(true, () => !isUnmounted.current);
-            });
-        } else {
-            Navigation.navigate();
-        }
-    });
+    useFocusEffect(
+        useCallback(() => {
+            if (session && 'authToken' in session) {
+                App.confirmReadyToOpenApp();
+                Navigation.isNavigationReady().then(() => {
+                    if (isUnmounted.current || isLoadingReportData === undefined || !!isLoadingReportData) {
+                        return;
+                    }
+                    Report.navigateToConciergeChat(true, () => !isUnmounted.current);
+                });
+            } else {
+                Navigation.navigate();
+            }
+        }, [session, isLoadingReportData]),
+    );
 
     useEffect(() => {
         isUnmounted.current = false;