Fix - Expense - An expense can be send to an expired WS via FAB by FitseTLT · Pull Request #57396 · Expensify/App

FitseTLT · 2025-02-25T12:34:03Z

Details

Fixed Issues

$ #56829
PROPOSAL: #56829 (comment)

Tests

Login with an account without a subscription with Workspaces and an expired trial
Make sure you set one of your group policies as default
Tap on Fab > Create expense
Enter amount or scan a receipt or input distance waypoints and confirm
Verify that you are navigated to participants page instead of submitting an expense to the default workspace without payment details after the trial has expired

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

2025-02-25.15-32-25.mp4

Android: mWeb Chrome

2025-02-25.15-31-10.mp4

iOS: Native

2025-02-25.16-23-49.mp4

iOS: mWeb Safari

bil.iw.mp4

MacOS: Chrome / Safari

bil.w.mp4

MacOS: Desktop

bil.d.mp4

melvin-bot · 2025-02-25T12:34:09Z

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

shubham1206agra · 2025-02-27T07:04:35Z

+                    hideProductTrainingTooltip();
+                    if (policyChatForActivePolicy?.policyID && shouldRestrictUserBillableActions(policyChatForActivePolicy.policyID)) {
+                        Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policyChatForActivePolicy.policyID));
+                        return;
+                    }
+
+                    const quickActionReportID = policyChatForActivePolicy?.reportID || generateReportID();
+                    startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true);


@FitseTLT I don't think we need this since this logic is already present in selectOption

selectOption checks on the quickActionReport so that's why I removed it in this case and made a check on policyChatForActivePolicy 👍

Why though?

I don't understand your question @shubham1206agra We can't use selectOption because here we need to check for shouldRestrictUserBillableActions for (policyChatForActivePolicy.policyID)

For quickaction, we need to check on quickActionReport

This is not a quick action. It is an edge case where there is no quick action then we construct a quick action from policyChatForActivePolicy.

Oh. Then it's fine.

shubham1206agra · 2025-02-28T17:12:25Z

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 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-02-28.at.10.40.00.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-02-28.at.10.23.57.PM.mov

iOS: Native

Screen.Recording.2025-02-28.at.10.33.17.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-02-28.at.10.18.42.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-02-28.at.10.15.50.PM.mov

MacOS: Desktop

Screen.Recording.2025-02-28.at.10.28.01.PM.mov

mountiny

Thanks!

OSBotify · 2025-03-02T22:59:31Z

✋ 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-03-03T17:15:06Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.8-0 🚀

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

github-actions · 2025-03-04T21:54:21Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.8-1 🚀

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

add checks for billable restricted actions

7779350

FitseTLT requested a review from a team as a code owner February 25, 2025 12:34

melvin-bot Bot requested review from shubham1206agra and removed request for a team February 25, 2025 12:34

mountiny assigned FitseTLT Feb 25, 2025

shubham1206agra reviewed Feb 27, 2025

View reviewed changes

shubham1206agra approved these changes Feb 28, 2025

View reviewed changes

melvin-bot Bot requested a review from mountiny February 28, 2025 17:12

mountiny approved these changes Mar 2, 2025

View reviewed changes

mountiny merged commit 996eecc into Expensify:main Mar 2, 2025

github-actions Bot mentioned this pull request Mar 3, 2025

Deploy Checklist: New Expensify 2025-03-03 #57683

Closed

42 tasks

melvin-bot Bot mentioned this pull request Mar 4, 2025

[Due for payment 2025-03-11] [$250] Expense - An expense can be send to an expired WS via FAB #56829

Closed

8 tasks

Conversation

FitseTLT commented Feb 25, 2025 • 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 Feb 25, 2025

Uh oh!

shubham1206agra Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Feb 27, 2025 • 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!

shubham1206agra Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Feb 28, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Mar 2, 2025

Uh oh!

github-actions Bot commented Mar 3, 2025

Uh oh!

github-actions Bot commented Mar 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

FitseTLT commented Feb 25, 2025 •

edited

Loading

FitseTLT Feb 27, 2025 •

edited

Loading