fix: go to navigation

Author: mananjadhav

src/components/ImportSpreadsheet.tsx

@@ -35,11 +35,14 @@ type ImportSpreadsheetProps = {
     // The route to navigate to after the file import is completed.
     goTo: Routes;
 
+    // If true, replace the current route after import instead of pushing on top.
+    shouldForceReplaceNavigation?: boolean;
+
     /** Whether the spreadsheet is importing multi-level tags */
     isImportingMultiLevelTags?: boolean;
 };
 
-function ImportSpreadsheet({backTo, goTo, isImportingMultiLevelTags}: ImportSpreadsheetProps) {
+function ImportSpreadsheet({backTo, goTo, shouldForceReplaceNavigation = false, isImportingMultiLevelTags}: ImportSpreadsheetProps) {
     const [importedSpreadsheet] = useOnyx(ONYXKEYS.IMPORTED_SPREADSHEET);
     const icons = useMemoizedLazyExpensifyIcons(['SpreadsheetComputer']);
     const styles = useThemeStyles();
@@ -145,7 +148,7 @@ function ImportSpreadsheet({backTo, goTo, isImportingMultiLevelTags}: ImportSpre
                         );
                     })
                     .then(() => {
-                        Navigation.navigate(goTo);
+                        Navigation.navigate(goTo, {forceReplace: shouldForceReplaceNavigation});
                     })
                     .catch(() => {
                         showUploadFileError('spreadsheet.importFailedTitle', 'spreadsheet.invalidFileMessage');

src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx

@@ -110,6 +110,9 @@ const OPTIONS_PER_SCREEN: Partial<Record<Screen, PlatformStackNavigationOptions>
     [SCREENS.MULTIFACTOR_AUTHENTICATION.NOT_FOUND]: {
         animationTypeForReplace: 'push',
     },
+    [SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORTED]: {
+        animationTypeForReplace: 'push',
+    },
 };
 
 /**

src/pages/workspace/categories/ImportCategoriesPage.tsx

@@ -1,9 +1,9 @@
-import type {RouteProp} from '@react-navigation/native';
 import React from 'react';
 import ImportSpreadsheet from '@components/ImportSpreadsheet';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import usePolicy from '@hooks/usePolicy';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {goBackFromInvalidPolicy, hasAccountingConnections as hasAccountingConnectionsUtil} from '@libs/PolicyUtils';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
@@ -13,9 +13,9 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type ImportCategoriesPageProps = {
-    route: RouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORT | typeof SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORT>;
-};
+type ImportCategoriesPageProps =
+    | PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORT>
+    | PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORT>;
 
 function ImportCategoriesPage({route}: ImportCategoriesPageProps) {
     const policyID = route.params.policyID;
@@ -41,6 +41,7 @@ function ImportCategoriesPage({route}: ImportCategoriesPageProps) {
             <ImportSpreadsheet
                 backTo={isQuickSettingsFlow ? backTo : workspaceCategoriesListBackPath}
                 goTo={isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORIES_IMPORTED.getRoute(policyID, backTo) : workspaceGoToImportedPath}
+                shouldForceReplaceNavigation={!isQuickSettingsFlow}
             />
         </AccessOrNotFoundWrapper>
     );