Prevent going to confirmation page when active policy has no expense chat by shubham1206agra · Pull Request #58691 · Expensify/App

shubham1206agra · 2025-03-19T08:15:51Z

Explanation of Change

Fixed Issues

Tests

Pre-requisite - Join this WS https://new.expensify.com/settings/workspaces/1C780CA463966475/join?email=gatantm+219@gmail.com and set is as default

Launch new expensify
Tap on the FAB icon from LHN
Tap on Create expense
Tap on Scan and take a photo
Verify that the participant page is opened without any errors.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-03-19.at.3.43.05.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-03-19.at.2.37.34.PM.mov

iOS: Native

Screen.Recording.2025-03-19.at.3.22.22.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-19.at.2.34.28.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-19.at.2.32.57.PM.mov

MacOS: Desktop

Screen.Recording.2025-03-19.at.2.44.34.PM.mov

…chat

melvin-bot · 2025-03-19T10:19:58Z

@eh2077 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]

eh2077 · 2025-03-25T05:46:34Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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.2025-03-25.at.11.51.45.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-03-25.at.11.50.34.PM.mov

iOS: Native

Screen.Recording.2025-03-25.at.11.46.23.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-25.at.11.48.00.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-25.at.11.45.17.PM.mov

MacOS: Desktop

Screen.Recording.2025-03-25.at.11.53.00.PM.mov

eh2077

Looks good to me and tested well

iwiznia · 2025-03-25T16:43:25Z

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
            if ((transaction?.isFromGlobalCreate && iouType !== CONST.IOU.TYPE.TRACK && !report?.reportID) || iouType === CONST.IOU.TYPE.CREATE) {
-                if (activePolicy && isPaidGroupPolicy(activePolicy) && !shouldRestrictUserBillableActions(activePolicy.id)) {
+                if (activePolicy && isPaidGroupPolicy(activePolicy) && activePolicy?.isPolicyExpenseChatEnabled && !shouldRestrictUserBillableActions(activePolicy.id)) {


hmmmm isn't this code wrong (even before your changes)? Why is it using activePolicy instead of the policy of the chat you are requesting money from?
Same in the other file really.

We are requesting from active policy only. This was a new feature introduced where we skip the participant selection step.

What do you mean? These components are not used when you click on the + button in the workspace chat?

See #56090 for the feature explaination

That's a whole PR where exactly is the explanation?
Also is your answer to my previous question no?

Oh, but this only runs if isFromGlobalCreate OR when iouType === CONST.IOU.TYPE.CREATE, I am not sure what that last condition means, do you?

@iwiznia I made the changes you requested

OSBotify · 2025-03-31T16:31:55Z

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

github-actions · 2025-04-01T15:38:40Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.1.22-0 🚀

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

github-actions · 2025-04-03T11:40:02Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.22-10 🚀

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

Prevent going to confirmation page when active policy has no expense …

979f57c

…chat

shubham1206agra marked this pull request as ready for review March 19, 2025 10:19

shubham1206agra requested a review from a team as a code owner March 19, 2025 10:19

melvin-bot bot requested review from eh2077 and removed request for a team March 19, 2025 10:19

eh2077 approved these changes Mar 25, 2025

View reviewed changes

melvin-bot bot requested a review from iwiznia March 25, 2025 16:31

iwiznia requested changes Mar 25, 2025

View reviewed changes

shubham1206agra and others added 2 commits March 31, 2025 13:20

Merge branch 'Expensify:main' into fix-scan-expense-2

18c95f3

Fix conditions in scan request

66635ad

iwiznia approved these changes Mar 31, 2025

View reviewed changes

iwiznia merged commit f0110e5 into Expensify:main Mar 31, 2025
17 checks passed

github-actions bot mentioned this pull request Apr 1, 2025

Deploy Checklist: New Expensify 2025-04-01 #59448

Closed

60 tasks

melvin-bot bot mentioned this pull request Apr 3, 2025

[Due for payment 2025-04-10] [$250] iOS - Scan - Taking photos from FAB returns user to camera UI after tapping the shutter #57115

Closed

8 tasks

shubham1206agra deleted the fix-scan-expense-2 branch January 2, 2026 12:20

Conversation

shubham1206agra commented Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 19, 2025

Uh oh!

eh2077 commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

iwiznia Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

iwiznia Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

iwiznia Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

iwiznia Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 31, 2025

Uh oh!

github-actions bot commented Apr 1, 2025

Uh oh!

github-actions bot commented Apr 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shubham1206agra commented Mar 19, 2025 •

edited

Loading

eh2077 commented Mar 25, 2025 •

edited

Loading