Skip to content

Fix bugs with bypass approver feature#69361

Merged
marcaaron merged 6 commits into
Expensify:mainfrom
parasharrajat:parasharrajat/fix-bypass-approver
Sep 5, 2025
Merged

Fix bugs with bypass approver feature#69361
marcaaron merged 6 commits into
Expensify:mainfrom
parasharrajat:parasharrajat/fix-bypass-approver

Conversation

@parasharrajat

@parasharrajat parasharrajat commented Aug 27, 2025

Copy link
Copy Markdown
Member

Explanation of Change

Fixed Issues

$ #69247
$ #69277
PROPOSAL:

Tests

Precondition:

  • Admin invites User A and User B to the workspace.
  • Create a new approval workflow where User A submits to User B (approver).

Steps for Incorrect error message & system message remains after dismissing error

  1. Go to staging.new.expensify.com
  2. [User A] Go to workspace chat.
  3. [User A] Create an expense in the workspace chat and click Submit on the expense preview.
  4. [Admin] Open workspace chat with User A.
  5. [Admin] Open the expense report.
  6. [Admin] Go offline.
  7. [Admin] Click More > Change approver.
  8. [Admin] Click Bypass approvers, then click Change approver.
  9. [Approver] While online, approve the report submitted by User A.
  10. [Admin] Go online.
  11. [Admin] Dismiss "The Report status has changed since you started reviewing it".
    • Verify that action with error message is removed.

Steps for Expense - No error above Change approver button when Bypass approvers is not selected

  1. Go to staging.new.expensify.com
  2. [User A] Go to workspace chat.
  3. [User A] Create an expense in the workspace chat and click Submit on the expense preview.
  4. [Admin] Open workspace chat with User A.
  5. [Admin] Open the expense report.
  6. [Admin] Click More > Change approver.
  7. [Admin] Click Change approver without selecting Bypass approvers.
    • Verify that you see an error message that says Please select an option above.
  8. Select the Bypass approver option.
    • Verify that error is removed and you can submit the page.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

same as 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 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 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
01.09.2025_14.24.49_REC.mp4
Android: mWeb Chrome
01.09.2025_15.06.54_REC.mp4
iOS: Native
01.09.2025_14.59.30_REC.mp4
iOS: mWeb Safari
01.09.2025_15.02.04_REC.mp4
MacOS: Chrome / Safari
01.09.2025_14.13.30_REC.mp4
01.09.2025_14.17.28_REC.mp4
MacOS: Desktop
01.09.2025_14.36.02_REC.mp4

@parasharrajat parasharrajat marked this pull request as ready for review August 29, 2025 18:19
@parasharrajat parasharrajat requested review from a team as code owners August 29, 2025 18:19
@melvin-bot melvin-bot Bot requested review from mananjadhav and removed request for a team August 29, 2025 18:19
@melvin-bot

melvin-bot Bot commented Aug 29, 2025

Copy link
Copy Markdown

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

@mananjadhav

Copy link
Copy Markdown
Collaborator

@parasharrajat Does this need C+ review? Also I can see the checklist is complete but the screencasts are missing.

@parasharrajat

Copy link
Copy Markdown
Member Author

I will add those. Can you please complete your testing?

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

  1. [Admin] Dismiss "Auth ChangeApprover returned an error".

Mhm, are we really showing this error message? It's very technical.

@parasharrajat

Copy link
Copy Markdown
Member Author

No, this will change from backend and marc is working on it.

@trjExpensify

trjExpensify commented Aug 30, 2025

Copy link
Copy Markdown
Contributor

Okay cool, I'd suggest the steps should:

  1. Reference the actual error that will be displayed to avoid confusion.
  2. Actually include a step/steps on what we're asking QA to verify. As it stands, they read like executable steps, not what should be verified will happen when executed.

@parasharrajat

Copy link
Copy Markdown
Member Author

Agreed. I will update that once backend PR is done

@parasharrajat

Copy link
Copy Markdown
Member Author

Vids updated.

@parasharrajat

Copy link
Copy Markdown
Member Author

Bump @mananjadhav

@mananjadhav

Copy link
Copy Markdown
Collaborator

I reviewed the PR code changes but need to QA this. I'll do that in an hour or two once I am onlne.

@mananjadhav

mananjadhav commented Sep 4, 2025

Copy link
Copy Markdown
Collaborator

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
    • 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 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
Android: mWeb Chrome mweb-chrome-offline-change-approver mweb-chrome-change-approver-form-error
iOS: HybridApp ios-offline-change-approver ios-change-approver-form-error
iOS: mWeb Safari mweb-safari-change-approver-form-error
mweb-safari-offline-change-approver.mov
MacOS: Chrome / Safari
web-online-change-approver-form-error.mov
web-offline-change-approver.mov
MacOS: Desktop
desktop-change-approver-form-error.mov
desktop-offline-change-approver.mov

@mananjadhav mananjadhav left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I couldn't test on Android due to gradle issues. Tests well on the rest of the platforms. Approving.

@melvin-bot melvin-bot Bot requested a review from marcaaron September 4, 2025 14:42
@trjExpensify

Copy link
Copy Markdown
Contributor

Agreed. I will update that once backend PR is done

Will you do this, so QA can follow what we want them to test and verify?

@parasharrajat

Copy link
Copy Markdown
Member Author

@trjExpensify Yes, updated.

@trjExpensify

Copy link
Copy Markdown
Contributor

Thanks! I don't think you addressed my second point though:

  1. Actually include a step/steps on what we're asking QA to verify. As it stands, they read like executable steps, not what should be verified will happen when executed.

@parasharrajat

Copy link
Copy Markdown
Member Author

I see. Good catch @trjExpensify. I updated it now. Thanks

@trjExpensify

Copy link
Copy Markdown
Contributor

Thanks!

@marcaaron marcaaron 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

@marcaaron marcaaron merged commit c9d1922 into Expensify:main Sep 5, 2025
24 of 25 checks passed
@OSBotify

OSBotify commented Sep 5, 2025

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 Sep 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.2.3-0 🚀

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

@OSBotify

OSBotify commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.2.5-0 🚀

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

@OSBotify

OSBotify commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.2.8-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.8-4 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 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.

5 participants