Skip to content

Allow inviting new users in the Add approval workflow flow#75589

Merged
youssef-lr merged 29 commits into
Expensify:mainfrom
twilight2294:issue61625
Dec 31, 2025
Merged

Allow inviting new users in the Add approval workflow flow#75589
youssef-lr merged 29 commits into
Expensify:mainfrom
twilight2294:issue61625

Conversation

@twilight2294

@twilight2294 twilight2294 commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #61625
PROPOSAL: #61625 (comment)

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Go to Workspace > Worflows > Add Approvals
  2. In expenses from section, type a user who is not a member of the workspace
    Verify that that user appears
  3. Select that member and click next
    Verify that an invite screen is shown
  4. Invite the user
    Verify that you are taken back to the expenses from rhp
  5. Click next > complete the flow
    Verify that you are able to complete the flow successfully
  • 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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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.
  • 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.
  • 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
Screen.Recording.2025-12-27.at.8.35.11.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-12-27.at.8.35.52.PM.mov
iOS: Native
Simulator.Screen.Recording.-.Expensify.Testing.18.6.Pro.-.2025-12-27.at.18.53.54.mov
iOS: mWeb Safari
Simulator.Screen.Recording.-.Expensify.Testing.18.6.Pro.-.2025-12-27.at.18.54.41.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-27.at.6.50.07.PM.mov

@codecov

codecov Bot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/CONST/index.ts 83.47% <ø> (ø)
src/ROUTES.ts 12.70% <ø> (-0.22%) ⬇️
src/components/ApproverSelectionList.tsx 0.00% <0.00%> (ø)
src/libs/PolicyUtils.ts 53.39% <0.00%> (-0.44%) ⬇️
...kspace/members/WorkspaceInviteMessageComponent.tsx 0.00% <0.00%> (ø)
...ls/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx 0.00% <0.00%> (ø)
... and 148 files with indirect coverage changes

@twilight2294

Copy link
Copy Markdown
Contributor Author

@hoangzinh since this is a new feature, I will upload all platform recordings once i address any comments / code suggestions you may leave after your review.

This helps in avoiding regressions since the PR is tested with new changes, let me know if you require videos before you start testing, looking for your review 😄

@twilight2294 twilight2294 marked this pull request as ready for review November 19, 2025 20:26
@twilight2294 twilight2294 requested review from a team as code owners November 19, 2025 20:26
@melvin-bot melvin-bot Bot requested review from hoangzinh and trjExpensify and removed request for a team November 19, 2025 20:26
@melvin-bot

melvin-bot Bot commented Nov 19, 2025

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot removed the request for review from a team November 19, 2025 20:26
Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx
Comment thread src/components/ApproverSelectionList.tsx Outdated
@twilight2294

Copy link
Copy Markdown
Contributor Author

Implementation video for reference

Screen.Recording.2025-11-20.at.1.59.29.AM.mov

@trjExpensify trjExpensify requested review from JmillsExpensify and removed request for trjExpensify November 20, 2025 19:53
@trjExpensify

Copy link
Copy Markdown
Contributor

@JmillsExpensify has been on this one, so switching us out.

@hoangzinh

Copy link
Copy Markdown
Contributor

@twilight2294, can you check code review feedbacks above?

@JmillsExpensify

Copy link
Copy Markdown
Contributor

I'd like to test an adhoc when we get through C+ review.

@twilight2294

Copy link
Copy Markdown
Contributor Author

@hoangzinh PR is ready for your review

const policyName = policy?.name;

const headerTitle = useMemo(() => {
if (backTo && typeof backTo === 'string' && backTo.includes('expenses-from')) {

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.

Can we put this one into a variable backTo && typeof backTo === 'string' && backTo.includes('expenses-from') ? And reuse it from below

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.

Can we put expenses-from into CONST as well? (also use it to generate WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM.route as well)

}

// If backTo is provided and it's not the members page, navigate back to it
if (backTo && !(backTo as string).endsWith('members')) {

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.

I think we should check 'expenses-from' ROUTE only and goBack to avoid hidden bugs

Comment on lines +133 to +134
// Note: We don't auto-navigate to the approver page after returning from invite
// The user should stay on this page to see their selected members and click "Next" manually

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.

Which code does this comment explain for?

Comment on lines +46 to +53
const ineligibleInvites = getIneligibleInvitees(policy?.employeeList);
return ineligibleInvites.reduce(
(acc, login) => {
acc[login] = true;
return acc;
},
{} as Record<string, boolean>,
);

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.

I think we can put this one into a sharable func

Comment on lines +72 to +77
const handleSearchChange = useCallback(
(term: string) => {
setSearchSelectorTerm(term);
},
[setSearchSelectorTerm],
);

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.

why don't we use setSearchSelectorTerm directly instead of defining new handleSearchChange func?

Comment on lines +266 to +278
// Ensure avatars are only strings (URLs) or undefined, never React components
const allMembers: Member[] = [
...existingMembers.map((member) => ({
...member,
avatar: typeof member.avatar === 'string' ? member.avatar : undefined,
})),
...usersToInvite.map((user) => ({
displayName: user.email,
email: user.email,
avatar: undefined,
})),
];
setApprovalWorkflowMembers(allMembers);

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.

Do you think it's same with https://github.com/Expensify/App/pull/75589/files#diff-0a4739399b93f09a6f9466afba489945b2c9dc18700f579b75e71a0d6e9167ffR290-R298

If yes, we can move it to the top to apply for both usersToInvite.length > 0 and else

@github-actions

github-actions Bot commented Dec 1, 2025

Copy link
Copy Markdown
Contributor

🚧 @JmillsExpensify has triggered a test Expensify/App build. You can view the workflow run here.

@JmillsExpensify

Copy link
Copy Markdown
Contributor

Kicked off an adhoc build

@github-actions

This comment has been minimized.

@twilight2294

Copy link
Copy Markdown
Contributor Author

Addressing the review today

@hoangzinh

hoangzinh commented Dec 24, 2025

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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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: HybridApp
Screen.Recording.2025-12-25.at.04.26.26.android.mov
Android: mWeb Chrome
Screen.Recording.2025-12-25.at.04.30.22.android.chrome.mov
iOS: HybridApp
Screen.Recording.2025-12-25.at.04.41.53.ios.mov
iOS: mWeb Safari
Screen.Recording.2025-12-25.at.04.36.47.ios.s.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-25.at.04.15.08.web.mov

@hoangzinh

Copy link
Copy Markdown
Contributor

@twilight2294 can you also add recordings for this issue?

@twilight2294

Copy link
Copy Markdown
Contributor Author

@hoangzinh i updated

@twilight2294

Copy link
Copy Markdown
Contributor Author

bump @hoangzinh , can you approve the PR please

@hoangzinh

Copy link
Copy Markdown
Contributor

Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated
@twilight2294

Copy link
Copy Markdown
Contributor Author

@hoangzinh back to you

@hoangzinh hoangzinh 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.

LGTM

@melvin-bot melvin-bot Bot requested a review from youssef-lr December 31, 2025 10:40
@youssef-lr youssef-lr merged commit 66de3d6 into Expensify:main Dec 31, 2025
31 checks passed
@OSBotify

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

OSBotify commented Jan 2, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.2.91-0 🚀

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

@mitarachim

mitarachim commented Jan 2, 2026

Copy link
Copy Markdown

@twilight2294 This PR is failing because of a regression issue #78775 .
Step 4 is fail because after inviting user, RHP returns to Approver.

The issue is reproducible in: Web

Bug7040498_1767351637415.2.mp4

@mountiny

mountiny commented Jan 2, 2026

Copy link
Copy Markdown
Contributor

Going to revert the pr due to bunch of minor issues, please try to address them all in v2 and include the testing steps in the Pr description please

@OSBotify

OSBotify commented Jan 2, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.91-1 🚀

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

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