[Advanced approvals] Add optimistic steps for advanced approvals #44940

rushatgabhane · 2024-07-07T12:30:07Z

Details

Fixed Issues

$ #43567
PROPOSAL:

Tests

Pre-requisites

Go to oldDot > control policy > members page
Enable Advanced approvals on a control policy
Have this memebers setup -

4. Set Manually approve all expenses over to `$10`.

Test 1 - Submit as Employee1 below $100

Submit as employee1

Login as employee1
Go offline
Submit an expense of $25 to control policy.
Verify that the Next step in report header says: "Waiting for Manager to approve expense(s)"

Approve as manager

Login as manager
Go offline
Approve the employee's report
Verify that the Next step in report header says: "Waiting for Mini Boss to approve expense(s)"

Approve as mini boss

Login as mini boss
Go offline
Approve the employee's report
Verify that the Next step in report header says: "Nothing to do..

Test 2 - Submit as Employee1 above $100

Submit as employee1

Login as employee1
Go offline
Submit an expense of $500 to control policy.
Verify that the Next step in report header says: "Waiting for Manager to approve expense(s)"

Approve as manager

Login as manager
Go offline
Approve the employee's report
Verify that the Next step in report header says: "Waiting for Boss Owner to approve expense(s)"

Approve as boss owner

Login as boss owner
Go offline
Approve the employee's report
Verify that the Next step in report header says: "Nothing to do..

Test 3 - Submit as manager - Under $100

Submit as Manager

Login as manager
Go offline
Submit an expense of $25.
Verify that the Next step in report header says: "Waiting for Mini owner to approve expense(s)"

Approve as mini owner

Login as mini owner
Go offline
Approve expense of manager.
Verify that the Next step in report header says: All done / Nothing to do

Test 4 - Submit as manager - OVER $100

Submit as Manager

Login as manager
Go offline
Submit an expense of $150.
Verify that the Next step in report header says: "Waiting for Mini owner to approve expense(s)"

Approve as mini owner

Login as mini owner
Go offline
Approve expense of manager.
Verify that the Next step in report header says: All done / Nothing to do

Test 5 - Submit as mini owner - Under $100

Submit as mini owner

Login as mini owner
Go offline
Submit an expense of $25.
Verify that the Next step in report header says: "Waiting for boss owner to approve expense(s)"

Approve as boss owner

Login as boss owner
Go offline
Approve expense of mini owner.
Verify that the Next step in report header says: All done / Nothing to do

Test 6 - Submit as mini owner - Over $100

Submit as mini owner

Login as mini owner
Go offline
Submit an expense of $550.
Verify that the Next step in report header says: "Waiting for boss owner to approve expense(s)"

Approve as boss owner

Login as boss owner
Go offline
Approve expense of mini owner.
Verify that the Next step in report header says: All done / Nothing to do

Test 7 -

Test the scenario -

Employee A submitsTo Employee B
Employee B forwardsTo Employee A

Do a regression test for other scenarios. Turn of Advanced Approval and do regression tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-09.at.07.33.46.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-08-09.at.07.17.43.mov

iOS: mWeb Safari

More than approval limit

Screen.Recording.2024-08-09.at.07.22.08.mov

MacOS: Chrome / Safari

MacOS: Desktop

src/libs/PolicyUtils.ts

Co-authored-by: Alex Beaman <dabeamanator@gmail.com>

src/libs/PolicyUtils.ts

src/libs/NextStepUtils.ts

melvin-bot · 2024-08-02T01:38:27Z

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

…approver

Beamanator

Getting squeaky clean!!!

src/libs/NextStepUtils.ts

src/libs/PolicyUtils.ts

This reverts commit 38441ea.

Beamanator · 2024-08-07T18:02:19Z

src/libs/ReportUtils.ts

+    const approvalChain: string[] = [];
+
+    // If the policy is not on advanced approval mode, we should not use the approval chain even if it exists.
+    if (!PolicyUtils.isControlOnAdvancedApprovalMode(policy)) {


NAB - Maybe in a follow-up we can change this to only checking if the policy is not on advanced approval mode - it shouldn't matter if it's control or not (currently advanced approval is only available in control, but this "technically" could change at some point, and we'd have to update this)

ohhh shoot i used an existing function. i should have asked

will fix in a follow up

Beamanator · 2024-08-07T18:03:11Z

src/libs/ReportUtils.ts

+
+    // If the policy is not on advanced approval mode, we should not use the approval chain even if it exists.
+    if (!PolicyUtils.isControlOnAdvancedApprovalMode(policy)) {
+        return approvalChain;


NAB - Eventually we should change this to return the policy's default approver in this case. But not needed at this exact moment probably since we only call this function for advanced approval policies i believe

yeah here some cleanup would be fine. i didn't want the function to be used by non advanced policy otherwise we'll have to test every flow

src/libs/actions/IOU.ts

mananjadhav · 2024-08-07T20:27:02Z

Testing the scenarios again. I'll try my best to test atleast a couple of scenarios on mobile, but all on Web.

Beamanator · 2024-08-08T22:56:35Z

quick bump @mananjadhav 🙏

…nto additional-approver

rushatgabhane · 2024-08-09T04:26:30Z

@Beamanator good to merge. Code tests well for non-advancced approval modes too

Submit and approve -

Screen.Recording.2024-08-09.at.07.25.43.mov

Submit and close

Screen.Recording.2024-08-09.at.07.27.56.mov

Beamanator · 2024-08-09T16:06:40Z

@rushatgabhane in both of your videos, why does it look like you had to press "Submit" Twice? 😅 Am I looking at it wrong?

Beamanator

Approving through @mananjadhav is still testing - there's a few NABs that would be great to work through in a follow-up too

Beamanator · 2024-08-09T21:07:23Z

Merging so we can get this in before the next deploy (which may happen soon today)

OSBotify · 2024-08-09T21:23:38Z

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

mananjadhav · 2024-08-09T22:15:09Z

Okay so I just finished all for Web. I had all sorts of issues unrelated to the PR. I was unable to login, then saw the RBR on submit requests, amount showing twice in the money view, and the background overlapping with the amount rows, etc. Then cleared the cache for all sessions and it worked fine.

I still saw two crashes which happen when I go offline to online, which again seems unrelated to the PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

test-flow-1-employee-manager-miniboss_XG5X98fd.mp4

test-flow-2-employee-manager-bossowner_NCvwYDK5.mp4

test-flow-3-manager-miniboss_xef26Oa3.mp4

test-flow-4-manager-miniboss-amt-more-than-100_LdWyXEby.mp4

test-flow-5-and-6-miniboss-owner.mp4

test-9-submit-and-approve_GzuYbsXQ.mp4

MacOS: Desktop

mananjadhav · 2024-08-09T22:45:07Z

One more thing

Here's a bug we might need to fix here:

After the first approval (forward), when I log in as the current approver (the 2nd approver, but not the final approver) I see:

Waiting for **zzb@gmail.com** to approve expense(s).

But I think I want to see:

Waiting for **you** to approve expense(s).

I can still see "Waiting for xyz@gmail.com to approve expense(s)." instead of "Waiting for you..."

rushatgabhane · 2024-08-09T23:09:42Z

not a bug

explained here - #44940 (comment)

github-actions · 2024-08-10T15:20:42Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/44940/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/44940/NewExpensify.dmg	https://44940.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

mananjadhav · 2024-08-12T06:54:23Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

Videos being uploaded in this comment.

marcaaron · 2024-08-12T21:32:44Z

Can someone please look at this Deploy Blocker and confirm whether it is related to these changes or not? Thanks!

Beamanator · 2024-08-14T20:12:16Z

FYI I believe this was deployed to prod yesterday, from this checklist - #47219

rushatgabhane added 4 commits July 7, 2024 15:28

add build approval chain

c1a5e67

fix lint

a8e29ef

rename to get

a9afa16

add next steps for multiple approvers

a7adbba

rushatgabhane mentioned this pull request Jul 7, 2024

[Simple AA in NewDot] Make sure optimistic Next Steps & report action are set for Control mid-level "Approvals" in NewDot #43567

Closed

Beamanator reviewed Jul 8, 2024

View reviewed changes

src/libs/PolicyUtils.ts Outdated Show resolved Hide resolved

Beamanator reviewed Jul 8, 2024

View reviewed changes

src/libs/PolicyUtils.ts Outdated Show resolved Hide resolved

rushatgabhane and others added 2 commits July 8, 2024 11:34

Update src/libs/PolicyUtils.ts

38c65d0

Co-authored-by: Alex Beaman <dabeamanator@gmail.com>

Update src/libs/PolicyUtils.ts

5500e9c

Co-authored-by: Alex Beaman <dabeamanator@gmail.com>

rushatgabhane commented Jul 8, 2024

View reviewed changes

src/libs/PolicyUtils.ts Outdated Show resolved Hide resolved

Update src/libs/PolicyUtils.ts

a4fdf8e

Beamanator reviewed Jul 8, 2024

View reviewed changes

src/libs/NextStepUtils.ts Outdated Show resolved Hide resolved

rushatgabhane added 2 commits August 2, 2024 04:05

fix conflict

bae63de

fix conflict

5aa1ce9

rushatgabhane requested a review from Beamanator August 2, 2024 01:38

rushatgabhane marked this pull request as ready for review August 2, 2024 01:38

rushatgabhane requested a review from a team as a code owner August 2, 2024 01:38

melvin-bot bot requested review from akinwale and removed request for a team August 2, 2024 01:38

rushatgabhane added 10 commits August 5, 2024 10:53

Merge branch 'main' of github.com:rushatgabhane/exfy into additional-…

b08590d

…approver

rm next approval step

a697d1b

rm has advanced approval

ae18457

keep state as submitted if more than one approver

c2f2352

get display name for next approver

5f2be76

early return if AA is not enabled

d387a8e

check if last approver

2e5612c

fix last approver logic

0d5ce30

fix next approver logic

7f0d770

use ownerAccountID for building approval chain

a78ce47

Beamanator requested changes Aug 7, 2024

View reviewed changes

src/libs/NextStepUtils.ts Outdated Show resolved Hide resolved

src/libs/PolicyUtils.ts Show resolved Hide resolved

move submit to policyutils

cd89b9e

rushatgabhane requested a review from Beamanator August 7, 2024 03:31

rushatgabhane added 4 commits August 7, 2024 06:34

handle self submit

38441ea

Revert "handle self submit"

dcb4926

This reverts commit 38441ea.

cleanup

ab691ac

Merge branch 'main' into additional-approver

05f5276

Beamanator requested changes Aug 7, 2024

View reviewed changes

rushatgabhane added 2 commits August 9, 2024 07:14

improve readability of last approver

916ba40

Merge branch 'additional-approver' of github.com:rushatgabhane/exfy i…

c5bd485

…nto additional-approver

rushatgabhane requested a review from Beamanator August 9, 2024 04:31

Beamanator approved these changes Aug 9, 2024

View reviewed changes

Beamanator merged commit cdbd464 into Expensify:main Aug 9, 2024
15 of 18 checks passed

Beamanator added the Ready To Build label Aug 10, 2024

github-actions bot mentioned this pull request Aug 12, 2024

Deploy Checklist: New Expensify 2024-08-12 #47219

Closed

90 tasks

izarutskaya mentioned this pull request Aug 12, 2024

[$500] Approve button not disappear after approving report offline if advanced approval set #47264

Closed

6 tasks

lanitochka17 mentioned this pull request Aug 13, 2024

[HOLD for payment 2024-10-10] [Report next steps audit] Next step in report header changes after returning online #47278

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Advanced approvals] Add optimistic steps for advanced approvals #44940

[Advanced approvals] Add optimistic steps for advanced approvals #44940

rushatgabhane commented Jul 7, 2024 •

edited

Loading

melvin-bot bot commented Aug 2, 2024

Beamanator left a comment

Beamanator Aug 7, 2024

rushatgabhane Aug 9, 2024

rushatgabhane Aug 9, 2024

Beamanator Aug 7, 2024

rushatgabhane Aug 9, 2024

mananjadhav commented Aug 7, 2024

Beamanator commented Aug 8, 2024

rushatgabhane commented Aug 9, 2024 •

edited

Loading

Beamanator commented Aug 9, 2024

Beamanator left a comment

Beamanator commented Aug 9, 2024

OSBotify commented Aug 9, 2024

mananjadhav commented Aug 9, 2024 •

edited

Loading

mananjadhav commented Aug 9, 2024

rushatgabhane commented Aug 9, 2024

github-actions bot commented Aug 10, 2024

mananjadhav commented Aug 12, 2024 •

edited

Loading

marcaaron commented Aug 12, 2024

Beamanator commented Aug 14, 2024

[Advanced approvals] Add optimistic steps for advanced approvals #44940

[Advanced approvals] Add optimistic steps for advanced approvals #44940

Conversation

rushatgabhane commented Jul 7, 2024 • edited Loading

Details

Fixed Issues

Tests

Pre-requisites

Test 1 - Submit as Employee1 below $100

Submit as employee1

Approve as manager

Approve as mini boss

Test 2 - Submit as Employee1 above $100

Submit as employee1

Approve as manager

Approve as boss owner

Test 3 - Submit as manager - Under $100

Submit as Manager

Approve as mini owner

Test 4 - Submit as manager - OVER $100

Submit as Manager

Approve as mini owner

Test 5 - Submit as mini owner - Under $100

Submit as mini owner

Approve as boss owner

Test 6 - Submit as mini owner - Over $100

Submit as mini owner

Approve as boss owner

Test 7 -

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

More than approval limit

melvin-bot bot commented Aug 2, 2024

Beamanator left a comment

Choose a reason for hiding this comment

Beamanator Aug 7, 2024

Choose a reason for hiding this comment

rushatgabhane Aug 9, 2024

Choose a reason for hiding this comment

rushatgabhane Aug 9, 2024

Choose a reason for hiding this comment

Beamanator Aug 7, 2024

Choose a reason for hiding this comment

rushatgabhane Aug 9, 2024

Choose a reason for hiding this comment

mananjadhav commented Aug 7, 2024

Beamanator commented Aug 8, 2024

rushatgabhane commented Aug 9, 2024 • edited Loading

Submit and approve -

Submit and close

Beamanator commented Aug 9, 2024

Beamanator left a comment

Choose a reason for hiding this comment

Beamanator commented Aug 9, 2024

OSBotify commented Aug 9, 2024

mananjadhav commented Aug 9, 2024 • edited Loading

Screenshots/Videos

mananjadhav commented Aug 9, 2024

rushatgabhane commented Aug 9, 2024

github-actions bot commented Aug 10, 2024

mananjadhav commented Aug 12, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

marcaaron commented Aug 12, 2024

Beamanator commented Aug 14, 2024

rushatgabhane commented Jul 7, 2024 •

edited

Loading

rushatgabhane commented Aug 9, 2024 •

edited

Loading

mananjadhav commented Aug 9, 2024 •

edited

Loading

mananjadhav commented Aug 12, 2024 •

edited

Loading