Merge pull request #56523 from daledah/fix/55691

fix: remove flashing effect when opening a report
Expensify · Mar 4, 2025 · 72916d6 · 72916d6
2 parents f21c548 + 09de108
commit 72916d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/hooks/useCurrentReportID.tsx b/src/hooks/useCurrentReportID.tsx
@@ -1,10 +1,14 @@
 import type {NavigationState} from '@react-navigation/native';
 import React, {createContext, useCallback, useContext, useMemo, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import Navigation from '@libs/Navigation/Navigation';
+import {getReportIDFromLink} from '@libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 type CurrentReportIDContextValue = {
     updateCurrentReportID: (state: NavigationState) => void;
     currentReportID: string | undefined;
+    currentReportIDFromPath: string | undefined;
 };
 
 type CurrentReportIDContextProviderProps = {
@@ -16,6 +20,8 @@ const CurrentReportIDContext = createContext<CurrentReportIDContextValue | null>
 
 function CurrentReportIDContextProvider(props: CurrentReportIDContextProviderProps) {
     const [currentReportID, setCurrentReportID] = useState<string | undefined>('');
+    const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH);
+    const lastAccessReportFromPath = getReportIDFromLink(lastVisitedPath ?? null);
 
     /**
      * This function is used to update the currentReportID
@@ -46,8 +52,9 @@ function CurrentReportIDContextProvider(props: CurrentReportIDContextProviderPro
         (): CurrentReportIDContextValue => ({
             updateCurrentReportID,
             currentReportID,
+            currentReportIDFromPath: lastAccessReportFromPath || undefined,
         }),
-        [updateCurrentReportID, currentReportID],
+        [updateCurrentReportID, currentReportID, lastAccessReportFromPath],
     );
 
     return <CurrentReportIDContext.Provider value={contextValue}>{props.children}</CurrentReportIDContext.Provider>;

diff --git a/src/hooks/useReportIDs.tsx b/src/hooks/useReportIDs.tsx
@@ -64,7 +64,7 @@ function ReportIDsContextProvider({
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {accountID} = useCurrentUserPersonalDetails();
     const currentReportIDValue = useCurrentReportID();
-    const derivedCurrentReportID = currentReportIDForTests ?? currentReportIDValue?.currentReportID;
+    const derivedCurrentReportID = currentReportIDForTests ?? currentReportIDValue?.currentReportIDFromPath ?? currentReportIDValue?.currentReportID;
     const {activeWorkspaceID} = useActiveWorkspace();
 
     const policyMemberAccountIDs = useMemo(() => getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID), [policies, activeWorkspaceID, accountID]);