Fix: Navigated back to the home screen after granting for Camera permission by ravindra-encoresky · Pull Request #47222 · Expensify/App

ravindra-encoresky · 2024-08-12T10:26:09Z

Details

Fixed Issues

$ #46422
PROPOSAL: $ #46422 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Start Submit Expense flow from Global Create
Tap on the Scan tab
Go to the Phone settings from the system prompt asking for Camera permission
Go back to the App by tapping on <- NewExpensify on the top left corner of the iPhone
Verify that App navigate to scan screen

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android_web.mov

iOS: Native

355539874-76950b43-82cc-444f-bd0f-99fa09ef6bdc.mov

iOS: mWeb Safari

Only iOS Native affected

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-08-12T10:26:14Z

@DylanDylann Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

…rmission

DylanDylann · 2024-08-14T09:21:18Z

                    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
+                    if (getPlatform() === CONST.PLATFORM.IOS && screenName) {


Don't use getPlatform function. Let's create a new .ios file

created FileUtils.ios.ts file

@ravindra-encoresky Ops, Don't need to create a new FileUtils.ios.ts. WƯe should introduce a new function, this function only be available on .ios file, and this func will be empty on other platforms. Then we use this function in showCameraPermissionsAlert func

@DylanDylann Do you want something like this?
Under src/lib/updateLastScreen

index.ts - will have empty updateLastScreen function

index.ios.ts - will have updateLastScreen function to save last screen

and I updateLastScreen will be called from showCameraPermissionsAlert

@ravindra-encoresky Yes. We should avoid making duplicated code when creating new FileUtils.ts

DylanDylann · 2024-08-14T09:22:19Z

+        }
+        interceptAnonymousUser(() => {
+            updateLastScreen('');
+            IOU.startMoneyRequest(


Please check this comment
#46422 (comment)

@ravindra-encoresky Please check this comment

DylanDylann · 2024-08-16T08:57:09Z

@ravindra-encoresky Hi, how about the above comments?

DylanDylann · 2024-08-16T08:58:13Z

Also please record videos on all platforms to ensure that your change don't break any other things

ravindra-encoresky · 2024-08-16T09:02:47Z

@DylanDylann hi, yes checked the comments. I'll add the changes soon. Sure will add the video as well.

DylanDylann · 2024-08-20T08:54:53Z

@ravindra-encoresky Friendly bump

ravindra-encoresky · 2024-08-20T09:33:08Z

@ravindra-encoresky Friendly bump

@DylanDylann I'm on it, all things done, just have to push it, due to the holidays here wasn't able to. I'll do it earliest.

thanks.

…rmission

DylanDylann · 2024-08-21T07:44:10Z

@ravindra-encoresky Bump on this comment: #47222 (comment)

…rmission

DylanDylann · 2024-08-22T09:31:02Z


                if (status === RESULTS.BLOCKED) {
-                    FileUtils.showCameraPermissionsAlert();
+                    FileUtils.showCameraPermissionsAlert({screenName: SCREENS.RIGHT_MODAL.MONEY_REQUEST, iouType});


@ravindra-encoresky I think we should save the current route in Onyx (using Navigation.getActiveRoute function)

yes, you are correct. I am making necessary changes

@DylanDylann i have made the necessary changes to use activeRoute and it is working as expected

DylanDylann · 2024-08-22T09:32:59Z

+     * 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(() => {


Why do you put this useEffect into this file?

I couldn't find any other file for navigating to the Receipt Scan screen when the app opens. btw I looking to optimise it by using activeRoute instead of hardcoding last screen.

@DylanDylann Another screen where I could place this useEffect is SidebarScreen.tsx. Please let me know if I’m missing any part of the flow for this.

@ravindra-encoresky Let's try in Expensify.tsx file

@DylanDylann done

ravindra-encoresky · 2024-08-23T10:20:39Z

Also please record videos on all platforms to ensure that your change don't break any other things

I have added videos for all platforms except iOS Safari, as the camera doesn’t work in the Safari browser on the emulator. Additionally, I am unable to find a way to run the mobile web version on a physical iOS device.

DylanDylann · 2024-08-25T15:10:27Z

    APPROVAL_WORKFLOW: 'approvalWorkflow',

+    /** screen to open after reloading app after changing app permission from settings */
+    LAST_SCREEN: 'last_screen',


Suggested change

LAST_SCREEN: 'last_screen',

LAST_ROUTE: 'lastRoute',

Anh also update other places to use route instead of screen

DylanDylann · 2024-08-25T15:11:12Z

    /** Stores the information about currently edited advanced approval workflow */
    APPROVAL_WORKFLOW: 'approvalWorkflow',

+    /** screen to open after reloading app after changing app permission from settings */


Suggested change

/** screen to open after reloading app after changing app permission from settings */

/** Stores the route to open after changing app permission from settings */

DylanDylann · 2024-08-25T15:11:56Z

+import {updateLastScreen} from '@libs/actions/App';
+import Navigation from '@libs/Navigation/Navigation';
+
+export default function saveLastScreen() {


Suggested change

export default function saveLastScreen() {

export default function saveLastRoute() {

DylanDylann · 2024-08-25T15:12:25Z

                text: Localize.translateLocal('common.settings'),
                onPress: () => {
                    Linking.openSettings();
+                    // In case of ios, app reload when we enable camera permission from settings


Suggested change

// In case of ios, app reload when we enable camera permission from settings

// In the case of ios, the App reloads when we update camera permission from settings

DylanDylann · 2024-08-25T15:14:18Z

@@ -0,0 +1,3 @@
+/** we are only saving last screen in case of ios */


Suggested change

/** we are only saving last screen in case of ios */

DylanDylann · 2024-08-25T15:16:15Z

@@ -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() {}


Suggested change

export default function saveLastScreen() {}

const saveLastRoute: GetPlaidDesktopMessage = () => {};

export default saveLastRoute;

@DylanDylann There is a issue of type mismatch for return (Type 'void' is not assignable to type 'TranslationPaths | undefined)

@ravindra-encoresky ahh my bad, please remove GetPlaidDesktopMessage

DylanDylann · 2024-08-26T07:39:42Z

    lastVisitedPath: {
        key: ONYXKEYS.LAST_VISITED_PATH,
    },
+    lastRoute: {


@ravindra-encoresky Please use useOnyx

DylanDylann · 2024-08-26T07:40:10Z

Some minor comments, @ravindra-encoresky Could you address them soon?

DylanDylann · 2024-08-26T08:04:18Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-26.at.14.51.07.mov

Android: mWeb Chrome

Screen.Recording.2024-08-26.at.14.58.44.mov

iOS: Native

Screen.Recording.2024-08-26.at.14.59.42.mov

iOS: mWeb Safari

ScreenRecording_08-26-2024.15-16-14_1.MP4

MacOS: Chrome / Safari

Screen.Recording.2024-08-26.at.15.03.45.mov

MacOS: Desktop

Screen.Recording.2024-08-26.at.15.03.29.mov

ravindra-encoresky · 2024-08-26T08:52:16Z

Some minor comments, @ravindra-encoresky Could you address them soon?

Done

DylanDylann

LGTM

roryabraham · 2024-08-26T20:32:08Z

        Audio.setAudioModeAsync({playsInSilentModeIOS: true});
    }, []);

+    useEffect(() => {


Wondering if we should replace this with a useLayoutEffect so that we can run Navigation.navigate to route to the correct screen before the first paint of Expensify.tsx

Done.
Tested again, working perfectly.

OSBotify · 2024-08-27T05:02:25Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-08-28T21:44:06Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.0.26-1 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-08-30T18:32:34Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.26-6 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

ravindra-encoresky added 2 commits August 12, 2024 12:48

navigate to scan screen after granting camera permission from setting

0272c75

fix navigation for track and submit expense

bae715a

ravindra-encoresky requested a review from a team as a code owner August 12, 2024 10:26

melvin-bot Bot requested review from DylanDylann and removed request for a team August 12, 2024 10:26

ravindra-encoresky and others added 4 commits August 12, 2024 16:20

Merge remote-tracking branch 'upstream/main' into fix-46422-camera-pe…

604ebe3

…rmission

fix lint issues

02bd5f4

fix lint issue

222c7b3

Merge branch 'main' into fix-46422-camera-permission

77e195a

DylanDylann reviewed Aug 14, 2024

View reviewed changes

ravindra-encoresky added 2 commits August 21, 2024 10:36

Merge remote-tracking branch 'upstream/main' into fix-46422-camera-pe…

cf84bd0

…rmission

create ios file for fileUtils

ef85f11

ravindra-encoresky added 2 commits August 22, 2024 10:13

Merge remote-tracking branch 'upstream/main' into fix-46422-camera-pe…

f30e704

…rmission

make navigation after app reload generic

d2e9ba4

DylanDylann reviewed Aug 22, 2024

View reviewed changes

ravindra-encoresky added 3 commits August 22, 2024 17:44

use activeRoute for saving last screen

0b54f77

fix type issues

20654ab

remove unnecessary useCallback

1f870b2

DylanDylann reviewed Aug 25, 2024

View reviewed changes

ravindra-encoresky added 2 commits August 26, 2024 12:12

refactor variable names and comments

46dfb03

moved last route navigation logic to expensify.js

e623380

DylanDylann reviewed Aug 26, 2024

View reviewed changes

Comment thread src/Expensify.tsx Outdated

DylanDylann reviewed Aug 26, 2024

View reviewed changes

use useOnyx for lastRoute and code cleanup

3edf7ea

DylanDylann approved these changes Aug 26, 2024

View reviewed changes

melvin-bot Bot requested a review from roryabraham August 26, 2024 09:01

roryabraham reviewed Aug 26, 2024

View reviewed changes

replace useEffect with useLayoutEffect

9031f44

roryabraham approved these changes Aug 27, 2024

View reviewed changes

roryabraham merged commit d5cfecf into Expensify:main Aug 27, 2024

github-actions Bot mentioned this pull request Aug 28, 2024

Deploy Checklist: New Expensify 2024-08-28 #48221

Closed

93 tasks

	/** screen to open after reloading app after changing app permission from settings */
	/** Stores the route to open after changing app permission from settings */

	export default function saveLastScreen() {
	export default function saveLastRoute() {

	// In case of ios, app reload when we enable camera permission from settings
	// In the case of ios, the App reloads when we update camera permission from settings

		@@ -0,0 +1,3 @@
		/** we are only saving last screen in case of ios */

-export default function saveLastScreen() {}
+const saveLastRoute: GetPlaidDesktopMessage = () => {};
+export default saveLastRoute;

Conversation

ravindra-encoresky commented Aug 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Aug 12, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ravindra-encoresky Aug 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Aug 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DylanDylann commented Aug 16, 2024

Uh oh!

ravindra-encoresky commented Aug 16, 2024

Uh oh!

DylanDylann commented Aug 20, 2024

Uh oh!

ravindra-encoresky commented Aug 20, 2024

Uh oh!

DylanDylann commented Aug 21, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ravindra-encoresky Aug 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ravindra-encoresky Aug 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann Aug 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ravindra-encoresky commented Aug 23, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ravindra-encoresky commented Aug 12, 2024 •

edited

Loading

ravindra-encoresky Aug 22, 2024 •

edited

Loading

DylanDylann commented Aug 16, 2024 •

edited

Loading

ravindra-encoresky Aug 22, 2024 •

edited

Loading

ravindra-encoresky Aug 22, 2024 •

edited

Loading

DylanDylann Aug 25, 2024 •

edited

Loading

DylanDylann commented Aug 26, 2024 •

edited

Loading

roryabraham Aug 26, 2024 •

edited

Loading