Skip to content

[No QA] Show upgrade modal if user has no eliglbe policy for moving expenses - #97280

Merged
neil-marcellini merged 1 commit into
Expensify:mainfrom
s77rt:upgrade-modal-if-no-policy
Aug 7, 2026
Merged

neil-marcellini merged 1 commit into
Expensify:mainfrom
s77rt:upgrade-modal-if-no-policy

Conversation

@s77rt

@s77rt s77rt commented Jul 28, 2026

Copy link
Copy Markdown
Member

Explanation of Change

Show upgrade modal if user has not eligible policy for moving expenses

Fixed Issues

$ #97276
PROPOSAL:

Tests

  • Requires 2 accounts (an admin and an employee) on same private domain e.g. companydomain.com
  • Employee have assigned an E-Card.

(steps below for the employee account)

  1. Have an unreported card expense
  2. Leave the workspace
  3. Go to Spend > Expenses
  4. Try to report any unreported expense
  5. Verify after you click Create report you get the upgrade modal
Screen.Recording.2026-07-28.at.9.43.08.PM.mov
  • Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

n/a

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • 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 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@s77rt
s77rt marked this pull request as ready for review July 28, 2026 20:56
@s77rt
s77rt requested review from a team as code owners July 28, 2026 20:56
@melvin-bot
melvin-bot Bot requested review from ChavdaSachin and removed request for a team July 28, 2026 20:56
@melvin-bot

melvin-bot Bot commented Jul 28, 2026

Copy link
Copy Markdown

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

@ChavdaSachin

ChavdaSachin commented Jul 28, 2026 •

Copy link
Copy Markdown
Contributor

Does this need a c+ review?

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 297bc91881

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/hooks/usePolicyForMovingExpenses.ts Resolved
@s77rt

s77rt commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

@ChavdaSachin Yes, please review

@ChavdaSachin

This comment was marked as outdated.

@trjExpensify

Copy link
Copy Markdown
Contributor

@ChavdaSachin this has been assigned to you for a while, can you complete your review?

@ChavdaSachin

Copy link
Copy Markdown
Contributor

@trjExpensify I am unable to repro this.
Please reassign the issue.

@s77rt

s77rt commented Aug 5, 2026

Copy link
Copy Markdown
Member Author

@daledah I think you tested something similar previously, can you repro the issue / review this PR?

@daledah

daledah commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Sure, i'm checking now

@daledah

daledah commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

@s77rt as an employee, i can't leave the workspace

Screenshot 2026-08-05 at 23 44 14
Screen.Recording.2026-08-05.at.23.27.41.mov

@s77rt

s77rt commented Aug 5, 2026

Copy link
Copy Markdown
Member Author

Hmm can the admin remove the employee?

@trjExpensify

Copy link
Copy Markdown
Contributor

@daledah weird, why are you getting a DC error when your email address is on a domain that isn't domain controlled? 🤔

@daledah

daledah commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Hmm can the admin remove the employee?

@s77rt i got this error

Screenshot 2026-08-05 at 23 44 14

@s77rt

s77rt commented Aug 6, 2026

Copy link
Copy Markdown
Member Author

Hmm not sure, maybe we should just move forward and not block on this. I was able to reproduce the issue and confirmed the solution works. Can you please review the code and complete the reviewer checklist

@daledah

daledah commented Aug 7, 2026 •

Copy link
Copy Markdown
Contributor

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: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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 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 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)
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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.
  • 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

MacOS: Chrome / Safari
web.mov

return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: true, shouldNavigateToUpgradePath: false};
}

return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false, shouldNavigateToUpgradePath: true};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the new early return added, the return at the end of the hook becomes unreachable.

Trace it: to get past the new gate, resolvedPolicyID must be truthy. If validExpensePolicyID were set we'd have already returned in the branch above, so resolvedPolicyID truthy means singlePolicyID is truthy. And with singlePolicyID truthy, one of the last two branches always returns:

  • isMemberOfMoreThanOnePolicy === false -> caught by if (singlePolicyID && !isMemberOfMoreThanOnePolicy)
  • isMemberOfMoreThanOnePolicy === true -> caught by if (isMemberOfMoreThanOnePolicy)

So the fallback at the bottom can never run

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this is not a blocker? That's a fallback still, let's move forward if we have nothing to fix

@daledah daledah left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one minor comment; otherwise LGTM

@melvin-bot

melvin-bot Bot commented Aug 7, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #97276 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot
melvin-bot Bot requested a review from neil-marcellini August 7, 2026 03:42

@neil-marcellini neil-marcellini left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB: pls add an automated test to ensure this doesn't regress. Can be done in a follow up PR.

@neil-marcellini
neil-marcellini merged commit af37ee8 into Expensify:main Aug 7, 2026
48 of 50 checks passed
@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

🚧 neil-marcellini has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

OSBotify commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.4.52-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 cancelled 🔪

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — no docs changes required

I reviewed this PR against the help site articles under App/docs/articles and applied HELPSITE_NAMING_CONVENTIONS.md, HELP_AUTHORING_GUIDELINES.md, and TEMPLATE.md. No HelpDot article changes are needed, so I did not open a draft PR.

Why: The change is a narrow edge-case guard in src/hooks/usePolicyForMovingExpenses.ts:116 — when a user has no eligible group workspace, the "move expenses / create report" flow now routes them to the existing upgrade path instead of silently creating a report on their personal policy (the bug in #97276). It doesn't add or rename any feature, tab, setting, button, or documented workflow.

Articles I checked
  • new-expensify/reports-and-expenses/Create-and-Submit-Reports.md — documents creating a report and the Create report / Move expenses flow. It already assumes a workspace context ("Reports are opened on your default workspace"), so it doesn't describe the no-eligible-workspace case, and the upgrade modal is a pre-existing generic upsell rather than a new documented surface.
  • new-expensify/reports-and-expenses/Getting-Started-with-the-Spend-Page.md — documents Move to report / Create report from the Spend page; same reasoning.
  • Searched the rest of App/docs/articles for "create report" and "upgrade" — no article documents the "no eligible workspace → upgrade" behavior, and none needs to, since this is an internal routing fix rather than a user-facing feature change.

If you'd rather have this behavior called out in the help site anyway (e.g., a note that creating a report requires an eligible group workspace), reply and I'll draft a HelpDot PR for you to review and mark Ready for review.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.52-11 🚀

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

Bundle Size Analysis (Sentry):

@@ -111,6 +111,11 @@ function usePolicyForMovingExpenses(isPerDiemRequest?: boolean, isTimeRequest?:
const resolvedPolicyID = validExpensePolicyID ?? singlePolicyID;
const [resolvedPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${resolvedPolicyID}`);

// User has no eligible policy
if (!resolvedPolicyID) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This early return treats "no resolved policy" as "user has no eligible workspace" and sends them to the upgrade screen, without checking whether policies have finished loading. During Onyx cold start the collection reads empty, so a member of a group workspace can land on the Collect upgrade screen. Fixed in #101465.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants