Refactor getTopmostReportParam to getTopmostReportParams

src/libs/Navigation/Navigation.ts

@@ -24,7 +24,7 @@ import {
     getMinimalAction,
     getPolicyIDFromState,
     getStateFromPath,
-    getTopmostReportParam,
+    getTopmostReportParams,
     isReportOpenInRHP,
     isSplitNavigatorName,
     linkTo,
@@ -70,10 +70,10 @@ function canNavigate(methodName: string, params: Record<string, unknown> = {}):
 }
 
 // Extracts from the topmost report its id.
-const getTopmostReportId = (state = navigationRef.getState()) => getTopmostReportParam(state, 'reportID');
+const getTopmostReportId = (state = navigationRef.getState()) => getTopmostReportParams(state)?.reportID;
 
 // Extracts from the topmost report its action id.
-const getTopmostReportActionId = (state = navigationRef.getState()) => getTopmostReportParam(state, 'reportActionID');
+const getTopmostReportActionId = (state = navigationRef.getState()) => getTopmostReportParams(state)?.reportActionID;
 
 // Re-exporting the closeRHPFlow here to fill in default value for navigationRef. The closeRHPFlow isn't defined in this file to avoid cyclic dependencies.
 const closeRHPFlow = (ref = navigationRef) => originalCloseRHPFlow(ref);

src/libs/Navigation/helpers/getTopmostReportParam.ts → src/libs/Navigation/helpers/getTopmostReportParams.ts

@@ -1,22 +1,20 @@
 import type {NavigationState, PartialState} from '@react-navigation/native';
-import type {RootStackParamList} from '@libs/Navigation/types';
+import type {ReportsSplitNavigatorParamList, RootStackParamList} from '@libs/Navigation/types';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 // This function is in a separate file than Navigation.ts to avoid cyclic dependency.
 
 /**
- * Find the last visited report screen in the navigation state and get its specific param (id or action id).
+ * Find the last visited report screen in the navigation state and get its params.
  *
  * @param state - The react-navigation state
- * @param reportParam - param to get from the report route params
  * @returns - It's possible that there is no report screen
  */
 
 type State = NavigationState | NavigationState<RootStackParamList> | PartialState<NavigationState>;
-type ReportParam = 'reportID' | 'reportActionID';
 
-function getTopmostReportParam(state: State, reportParam: ReportParam): string | undefined {
+function getTopmostReportParams(state: State): ReportsSplitNavigatorParamList[typeof SCREENS.REPORT] | undefined {
     if (!state) {
         return;
     }
@@ -33,9 +31,7 @@ function getTopmostReportParam(state: State, reportParam: ReportParam): string |
         return;
     }
 
-    const topmostReportParams = topmostReport?.params as Record<string, string>;
-
-    return topmostReportParams?.[reportParam];
+    return topmostReport?.params as ReportsSplitNavigatorParamList[typeof SCREENS.REPORT];
 }
 
-export default getTopmostReportParam;
+export default getTopmostReportParams;

src/libs/Navigation/helpers/index.ts

@@ -10,7 +10,7 @@ export {default as getOnboardingAdaptedState} from './getOnboardingAdaptedState'
 export {default as getParamsFromRoute} from './getParamsFromRoute';
 export {default as getPolicyIDFromState} from './getPolicyIDFromState';
 export {default as getStateFromPath} from './getStateFromPath';
-export {default as getTopmostReportParam} from './getTopmostReportParam';
+export {default as getTopmostReportParams} from './getTopmostReportParams';
 export {default as getTopmostRouteName} from './getTopmostRouteName';
 export {default as isReportOpenInRHP} from './isReportOpenInRHP';
 export {default as isSearchTopmostFullScreenRoute} from './isSearchTopmostFullScreenRoute';