[CRITICAL] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection by blazejkustra · Pull Request #46484 · Expensify/App

blazejkustra · 2024-07-30T10:26:00Z

Details

Approval member page is going to be a page with a header and (multi select variant) with a save button.

Clicking on the next button will set the members with setApprovalWorkflowMembers action (more info in the Onyx setup section). Users will be navigated to the Approver selection page (‘settings/workspaces/:policyID/workflows/approvals/approver’) when creating a new approval workflow or navigated to the ‘Edit approval’ page (‘settings/workspaces/:policyID/workflows/approvals/:firstApproverEmail/edit’) based on isBeingEdited property in Onyx.

Fixed Issues

$ #45955
PROPOSAL: N/A

Tests

Open Workflows page (it has to be turned on in More features settings page)
Locally edit canUseWorkflowsAdvancedApproval function to return true (or use canUseWorkflowsAdvancedApproval beta)
Click on the 'Add approval workflow' button, it should navigate to 'Expenses from' page
Verify that Expenses From page functions as other selection list (good example is Workspace invite screen)
- "Find a member" input should filter users
- You can select and deselect people in the list properly
Next button should navigate to the approver page

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

android.webm

Android: mWeb Chrome

android-web.webm

iOS: Native

ios.mp4

iOS: mWeb Safari

ios-web.mp4

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

Guccio163

LGTM 🙌

blazejkustra · 2024-07-30T12:37:02Z

src/languages/es.ts

    },
    workflowsExpensesFromPage: {
        title: 'Gastos de',
+        header: 'Cuando los siguientes miembros presenten gastos:',


Translation already approved here

melvin-bot · 2024-07-30T12:37:14Z

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

blazejkustra · 2024-07-30T12:42:48Z

@thesahindia I would appreciate a quick review on this one, as Approval Workflow project has a tight deadline (Aug 15)

thesahindia · 2024-07-30T13:54:42Z

We need to fix this error.

thesahindia · 2024-07-30T16:45:59Z

After selecting the admin and clicking "Next", when we come back the "Admin" badge goes away.

Screen.Recording.2024-07-30.at.9.56.12.PM.mov

Shouldn't we dismiss the modal after the user selects an approver instead of navigating back to "Expenses from" page?

Screen.Recording.2024-07-30.at.9.54.25.PM.mov

blazejkustra · 2024-07-31T09:09:28Z

After selecting the admin and clicking "Next", when we come back the "Admin" badge goes away.

On it!

Shouldn't we dismiss the modal after the user selects an approver instead of navigating back to "Expenses from" page?

It will be covered in the next PR here, so I wouldn't block this PR because of it. (Add approval button is behind a beta so shouldn't be a problem).

blazejkustra · 2024-07-31T09:12:47Z

We need to fix this error.

I don't see it, can you add reproduction steps? (make sure you have the newest changes)

thesahindia · 2024-07-31T10:40:51Z

We need to fix this error.

I don't see it, can you add reproduction steps? (make sure you have the newest changes)

It was fixed after the new changes.

blazejkustra · 2024-07-31T10:50:04Z

After selecting the admin and clicking "Next", when we come back the "Admin" badge goes away.

@thesahindia Fixed!

thesahindia · 2024-07-31T16:53:36Z

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-07-31.at.10.09.58.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-07-31.at.9.49.10.PM.mov

iOS: Native

Screen.Recording.2024-07-31.at.10.16.35.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-07-31.at.10.17.49.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-31.at.9.19.50.PM.mov

MacOS: Desktop

Screen.Recording.2024-07-31.at.10.19.40.PM.mov

thesahindia

👍🏼

tgolen

Looking good!

OSBotify · 2024-07-31T18:46:39Z

✋ 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-07-31T19:33:39Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.0.15-0 🚀

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

kavimuru · 2024-07-31T20:28:02Z

@tgolen @thesahindia How should we run this step?

Locally edit canUseWorkflowsAdvancedApproval function to return true (or use canUseWorkflowsAdvancedApproval beta)

tgolen · 2024-07-31T20:30:58Z

I don't think this one is QA-able yet. Since it's under beta, the testing will come later. Sorry for the confusion! You can just mark this one off the deploy checklist.

OSBotify · 2024-08-02T02:21:58Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.15-9 🚀

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

s77rt · 2024-10-16T17:04:18Z

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx

+    const goBack = useCallback(() => {
+        if (!approvalWorkflow?.isBeingEdited) {
+            Workflow.clearApprovalWorkflow();
+        }
+        Navigation.goBack();
+    }, [approvalWorkflow?.isBeingEdited]);


Clearing the approval workflow on going back caused the not found view to appear briefly while hiding the modal (#50094). Also this goBack function is not called if we dismiss the modal on outside-click.

We went with a different approach that is to clear the workflow (from WorkspaceWorkflowsPage) before navigating to this page.

suneox · 2025-07-18T17:12:49Z

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx

+                const isAdmin = policy?.employeeList?.[member.email].role === CONST.REPORT.ROLE.ADMIN;
+
+                return {
+                    text: member.displayName,


Coming from #63939 checklist: The display name may include the SMS domain, so we should remove it to ensure consistency with InviteMemberListItem.

blazejkustra added 5 commits July 30, 2024 12:14

Update ApprovalWorkflow types

2133d72

Add functionality to WorkspaceWorkflowsPage

b8d64d7

Add translation

a0e00fa

Add empty approval workflow EMPTY_APPROVAL_WORKFLOW

725c887

Implement selection list on expenses form page

5c43fbd

blazejkustra changed the title ~~Approval workflows/expenses from~~ [CRITICAL] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection Jul 30, 2024

Fix lint

0e3601c

Guccio163 approved these changes Jul 30, 2024

View reviewed changes

blazejkustra commented Jul 30, 2024

View reviewed changes

blazejkustra marked this pull request as ready for review July 30, 2024 12:37

blazejkustra requested a review from a team as a code owner July 30, 2024 12:37

melvin-bot bot requested review from thesahindia and removed request for a team July 30, 2024 12:37

blazejkustra added 3 commits July 30, 2024 15:02

Add accountId to the icon so that email is displayed

877bad1

Add fallback avatar

82a8725

Add noResultsFound message

c05863a

blazejkustra added 4 commits July 30, 2024 17:20

Fix console errors

a991ef7

Merge branch 'main' into approval-workflows/expenses-from

0f42bf8

Remove unused import

f9c1a6e

Style Add approval workflow button

17dbd84

Add admin badge for selected users

9da70e4

thesahindia approved these changes Jul 31, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen July 31, 2024 16:53

tgolen approved these changes Jul 31, 2024

View reviewed changes

tgolen merged commit c425f7c into Expensify:main Jul 31, 2024

github-actions bot mentioned this pull request Jul 31, 2024

Deploy Checklist: New Expensify 2024-07-31 #46607

Closed

melvin-bot bot mentioned this pull request Aug 2, 2024

[PAID] [CRITICAL] [Advanced Approval Workflows] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection #45955

Closed

s77rt reviewed Oct 16, 2024

View reviewed changes

s77rt mentioned this pull request Oct 16, 2024

[HOLD for payment 2024-10-22] [$250] Workflow - Tapping add approval workflow or tapping back shows diff. behavior in mweb&android #50094

Closed

6 tasks

suneox reviewed Jul 18, 2025

View reviewed changes

Conversation

blazejkustra commented Jul 30, 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!

Guccio163 left a comment

Choose a reason for hiding this comment

Uh oh!

blazejkustra Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jul 30, 2024

Uh oh!

blazejkustra commented Jul 30, 2024

Uh oh!

thesahindia commented Jul 30, 2024

Uh oh!

thesahindia commented Jul 30, 2024

Uh oh!

blazejkustra commented Jul 31, 2024

Uh oh!

blazejkustra commented Jul 31, 2024

Uh oh!

thesahindia commented Jul 31, 2024

Uh oh!

blazejkustra commented Jul 31, 2024

Uh oh!

thesahindia commented Jul 31, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

thesahindia left a comment

Choose a reason for hiding this comment

Uh oh!

tgolen left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jul 31, 2024

Uh oh!

OSBotify commented Jul 31, 2024

Uh oh!

kavimuru commented Jul 31, 2024

Uh oh!

tgolen commented Jul 31, 2024

Uh oh!

OSBotify commented Aug 2, 2024

Uh oh!

s77rt Oct 16, 2024

Choose a reason for hiding this comment

Uh oh!

suneox Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

blazejkustra commented Jul 30, 2024 •

edited

Loading