fix: Second approver unapproval shows 'Waiting for first approver' in next steps

[truph01]

Explanation of Change

Fixed Issues

$ #50269
PROPOSAL: #50269 (comment)

Tests

Test 1

1. Navigate to ND.
2. Create a new workspace and enable the workflow feature.
3. Set the expense submission mode to "Manual".
4. Add 2 members to the workspace:

• An employee
• Approver A (first approver)
• Approver B (second approver and also workspace owner)

5. Configure the approval workflow:

• Employee submits to Approver A
• Approver A sends it to Approver B

6. As the employee, submit an expense in the workspace chat
7. Approve the expense as Approver A
8. As Approver B, approve the expense, then unapprove it
9. Observe the next step in the workflow
10. Verify after Approver B unapproves the expense, the message should revert to: "Waiting for you to approve expense(s)."

Test 2

1. Navigate to ND.
2. Create a new workspace and enable the workflow feature.
3. Set the expense submission mode to "Manual".
4. Add 3 members to the workspace:

• An employee
• Approver A (first approver)
• Approver B (second approver and not the workspace owner)

5. Configure the approval workflow:

• Employee submits to Approver A
• Approver A sends it to Approver B

6. As the employee, submit an expense in the workspace chat
7. Approve the expense as Approver A
8. As Approver B, approve the expense,
9. As workspace owner, unapprove it
10. Observe the next step in the workflow
11. Verify the message should be: "Waiting for approver B to approve expense(s)."

• Verify that no errors appear in the JS console

Offline tests

QA Steps

See above tests

• 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 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 verified the translation was requested/reviewed 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.js 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 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.

Screenshots/Videos

Android: Native

Screen.Recording.2024-11-11.at.11.26.44.mov

Android: mWeb Chrome

Screen.Recording.2024-11-11.at.11.21.11.mov

iOS: Native

Screen.Recording.2024-11-11.at.11.27.44.mov

iOS: mWeb Safari

Screen.Recording.2024-11-11.at.11.24.39.mov

MacOS: Chrome / Safari

Test 1:

output.mp4

Test 2:

output.mp4

MacOS: Desktop

Screen.Recording.2024-11-11.at.11.31.03.mov

[melvin-bot]

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

[Julesssss]

Can you update this section to say something like: See above tests

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

[truph01]

Can you update this section to say something like: See above tests

I updated

[Julesssss]

@truph01 could you please merge main ad resolve conflicts so we can review. thanks!

[truph01]

I merged main

[Julesssss]

Hi @allroundexperts please can you review

[allroundexperts]

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

[Julesssss]

@allroundexperts was this a pass?

[allroundexperts]

Apologies for the delay in the review here, but this is working very weirdly.

Sometimes, when I un-approve as admin, it gets disapproved as user A as well. See the video recording:

Screen.Recording.2024-11-19.at.2.30.42.AM.mov

It might be a backend issue, but this is definitely making testing very hard.

[allroundexperts]

Can you merge main @truph01?

[truph01]

@allroundexperts I merged main

[allroundexperts]

The order of approval / unapproval is still not consistent here. @Julesssss This seems to be coming from the backend. Can you please check?

screen-recording-2024-12-03-at-54445-am_XxF8j7Vx.mp4

[Julesssss]

@allroundexperts could you share the exact reproduction steps please, at which testing step does your issue occur and what are you seeing? Thanks

[allroundexperts]

Okay. Here are the steps @Julesssss

1. Create three new users, user A, B & C.
2. As user A, create a workspace.
3. Enable delayed submission, and set the frequency to Manual.
4. Add user B and C to the workspace.
5. Go to the workflows, and create a new workflow where when user B submits an expense, it requires approval from user C and user A.
6. As user B, submit an expense to the workspace.
7. As user C, approve the expense.
8. As user A, approve the expense.
9. As user A, Un-approve the expense.

The expense requires the approval of both user C and user A again.

[Julesssss]

Thank you. I'm going to check this internally (link).

[Julesssss]

The expense requires the approval of both user C and user A again.

Hey @allroundexperts, could you please just confirm what happens when all of the above steps occur and then user C approves again? Are we stuck, or does that final approve?

[allroundexperts]

Hey @allroundexperts, could you please just confirm what happens when all of the above steps occur and then user C approves again? Are we stuck, or does that final approve?

User A is requested to approve after that.

[Julesssss]

@allroundexperts

Thanks! As long as we're not stuck in a loop and the expense can be paid when approved by both, we're good to move forward here.

[allroundexperts]

@truph01 Given what @Julesssss said, your PR does not fix the issue. The optimistic message for user A after un-approving is awaiting your approval, while the backend sends awaiting user C approval after a while. Please check.

[truph01]

@allroundexperts I cannot reproduce the bug "The optimistic message for user A after un-approving is awaiting your approval, while the backend sends awaiting user C approval after a while." Below are my test steps along with the corresponding video.

• Test steps:

1. Create three new users, user A, B & C.
2. As user A, create a workspace.
3. Enable delayed submission, and set the frequency to Manual.
4. Add user B and C to the workspace.
5. Go to the workflows, and create a new workflow where when user B submits an expense, it requires approval from user C and user A.
6. As user B, submit an expense to the workspace.
7. As user C, approve the expense.
8. As user A, approve the expense.
9. As user A, Un-approve the expense. The next step is "Waiting for you to approve expense(s)"
10. Try to clear the cache, the next step is still "Waiting for you to approve expense(s)"

• Video:

demo.mp4

[truph01]

@allroundexperts I know you're on vacation, but please take a moment to review this PR when you have a chance. Thank you!