Fix: Navigated back to the home screen after granting for Camera permission

src/ONYXKEYS.ts

@@ -400,6 +400,9 @@ const ONYXKEYS = {
     /** Stores the information about currently edited advanced approval workflow */
     APPROVAL_WORKFLOW: 'approvalWorkflow',
 
+    /** screen to open after reloading app after changing app permission from settings */
+    LAST_SCREEN: 'last_screen',
+
     /** Collection Keys */
     COLLECTION: {
         DOWNLOAD: 'download_',
@@ -891,6 +894,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_WORKSPACE_TOOLTIP]: OnyxTypes.WorkspaceTooltip;
     [ONYXKEYS.NVP_PRIVATE_CANCELLATION_DETAILS]: OnyxTypes.CancellationDetails[];
     [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
+    [ONYXKEYS.LAST_SCREEN]: string;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

src/libs/actions/App.ts

@@ -496,6 +496,10 @@ function updateLastVisitedPath(path: string) {
     Onyx.merge(ONYXKEYS.LAST_VISITED_PATH, path);
 }
 
+function updateLastScreen(screen: string) {
+    Onyx.set(ONYXKEYS.LAST_SCREEN, screen);
+}
+
 export {
     setLocale,
     setLocaleAndNavigate,
@@ -513,5 +517,6 @@ export {
     savePolicyDraftByNewWorkspace,
     createWorkspaceWithPolicyDraftAndNavigateToIt,
     updateLastVisitedPath,
+    updateLastScreen,
     KEYS_TO_PRESERVE,
 };

src/libs/fileDownload/FileUtils.ts

@@ -5,6 +5,7 @@ import type {FileObject} from '@components/AttachmentModal';
 import DateUtils from '@libs/DateUtils';
 import * as Localize from '@libs/Localize';
 import Log from '@libs/Log';
+import saveLastScreen from '@libs/saveLastScreen';
 import CONST from '@src/CONST';
 import getImageManipulator from './getImageManipulator';
 import getImageResolution from './getImageResolution';
@@ -76,6 +77,9 @@ function showCameraPermissionsAlert() {
                 text: Localize.translateLocal('common.settings'),
                 onPress: () => {
                     Linking.openSettings();
+                    // In case of ios, app reload when we enable camera permission from settings
+                    // we are saving last screen so we can navigate to it after app reload
+                    saveLastScreen();
                 },
             },
         ],

src/libs/saveLastScreen/index.ios.ts

@@ -0,0 +1,6 @@
+import {updateLastScreen} from '@libs/actions/App';
+import Navigation from '@libs/Navigation/Navigation';
+
+export default function saveLastScreen() {
+    updateLastScreen(Navigation.getActiveRoute());
+}

src/libs/saveLastScreen/index.ts

@@ -0,0 +1,3 @@
+/** we are only saving last screen in case of ios */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export default function saveLastScreen() {}

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx

@@ -1,10 +1,12 @@
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useActiveWorkspaceFromNavigationState from '@hooks/useActiveWorkspaceFromNavigationState';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {updateLastScreen} from '@libs/actions/App';
 import {updateLastAccessedWorkspace} from '@libs/actions/Policy/Policy';
 import * as Browser from '@libs/Browser';
 import TopBar from '@libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
@@ -14,6 +16,7 @@ import SidebarLinksData from '@pages/home/sidebar/SidebarLinksData';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
 
 /**
  * Function called when a pinned chat is selected.
@@ -23,7 +26,14 @@ const startTimer = () => {
     Performance.markStart(CONST.TIMING.SWITCH_REPORT);
 };
 
-function BaseSidebarScreen() {
+type BaseSidebarScreenOnyxProps = {
+    /** last visited screen */
+    lastScreen: OnyxEntry<string>;
+};
+
+type BaseSidebarScreenProps = BaseSidebarScreenOnyxProps;
+
+function BaseSidebarScreen({lastScreen}: BaseSidebarScreenProps) {
     const styles = useThemeStyles();
     const activeWorkspaceID = useActiveWorkspaceFromNavigationState();
     const {translate} = useLocalize();
@@ -43,6 +53,22 @@ function BaseSidebarScreen() {
         updateLastAccessedWorkspace(undefined);
     }, [activeWorkspace, activeWorkspaceID]);
 
+    /**
+     * Navigate to scan receipt screen after it enabling camera permission from setting
+     * This will only works for ios application because we are saving last screen only for ios
+     */
+    useEffect(() => {
+        if (!lastScreen) {
+            return;
+        }
+
+        updateLastScreen('');
+        const route = lastScreen as Route;
+        Navigation.navigate(route);
+        // disabling this rule, as we want this to run only on the first render
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -71,4 +97,8 @@ function BaseSidebarScreen() {
 
 BaseSidebarScreen.displayName = 'BaseSidebarScreen';
 
-export default BaseSidebarScreen;
+export default withOnyx<BaseSidebarScreenProps, BaseSidebarScreenOnyxProps>({
+    lastScreen: {
+        key: ONYXKEYS.LAST_SCREEN,
+    },
+})(BaseSidebarScreen);