Update settlement button condition #56410

cretadn22 · 2025-02-05T16:37:53Z

Explanation of Change

Fixed Issues

$ #54168
PROPOSAL: #54168 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps 1

Precondition:

Workspace has enabled Add approvals.
Admin is the approval.

Go to workspace chat with no unsettled expense.
Submit a manual expense.
Go to expense report.
Click on the receipt.
Add a receipt.
Approve button will be hidden.

QA Steps 2

Create Admin account with Gmail
Create Collect workspace, set Workflows to enabled
Enable Approvals in Workflows and set Admin account as Approver
Enable Workflows > Delay submissions and set it to Manually
Enable "Prevent Self-Approval" switch
Submit expense from the workspace
Click on the report that was created
Notice that the submit button is blocked and there is a hour glass with a comment: "_Oops! Looks like you're submitting to yourself. Approving your own reports is forbidden by your policy."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen-Recording-2025-02-11-at-20.07.42.mp4

Android: mWeb Chrome

Screen.Recording.2025-02-11.at.20.09.37.mov

iOS: Native

Screen-Recording-2025-02-11-at-20.05.34.mp4

iOS: mWeb Safari

Screen-Recording-2025-02-11-at-20.08.48.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-02-11.at.20.04.58.mov

MacOS: Desktop

Screen.Recording.2025-02-11.at.20.04.10.mov

melvin-bot · 2025-02-05T16:37:58Z

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

cretadn22 · 2025-02-05T16:44:30Z

@alitoshmatov This PR implements the same change as this previous PR. The earlier PR was mistakenly reverted, as noted in this comment.

alitoshmatov · 2025-02-10T15:28:53Z

@cretadn22 Can you resolve the conflict, also please update the recordings with latest changes

cretadn22 · 2025-02-11T13:22:39Z

@alitoshmatov I updated

alitoshmatov · 2025-02-13T10:11:43Z

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

scanning-android.mov

Android: mWeb Chrome

iOS: Native

scanning-ios.mp4

iOS: mWeb Safari

scanning-safari.mp4

MacOS: Chrome / Safari

scanning-web.mov

MacOS: Desktop

scanning-desktop.mov

alitoshmatov

LGTM!

MonilBhavsar

Can we please add tests for this bug #55845
The reason why previous PR was reverted

cretadn22 · 2025-02-14T04:48:30Z

@MonilBhavsar I added QA tests for this bug #55845 and verified again

Screen.Recording.2025-02-14.at.11.44.39.1.mp4

MonilBhavsar

Thanks a lot!

OSBotify · 2025-02-14T18:28:00Z

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

github-actions · 2025-02-17T09:23:46Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.0.99-0 🚀

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

…tton-condition" This reverts commit 9866eff, reversing changes made to 3cb018f.

github-actions · 2025-02-18T06:15:49Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.99-2 🚀

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

cretadn22 requested a review from a team as a code owner February 5, 2025 16:37

melvin-bot bot requested review from alitoshmatov and removed request for a team February 5, 2025 16:37

update settlement button condition

b320a54

cretadn22 force-pushed the update-settlement-button-condition branch from e6bf446 to b320a54 Compare February 5, 2025 16:47

new main

02ec0a5

merge new main

c58e9c6

alitoshmatov approved these changes Feb 13, 2025

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar February 13, 2025 10:12

MonilBhavsar reviewed Feb 13, 2025

View reviewed changes

MonilBhavsar approved these changes Feb 14, 2025

View reviewed changes

MonilBhavsar merged commit 9866eff into Expensify:main Feb 14, 2025
19 checks passed

github-actions bot mentioned this pull request Feb 17, 2025

Deploy Checklist: New Expensify 2025-02-17 #56922

Closed

46 tasks

francoisl added a commit that referenced this pull request Feb 17, 2025

Revert "Merge pull request #56410 from cretadn22/update-settlement-bu…

3dae4ec

…tton-condition" This reverts commit 9866eff, reversing changes made to 3cb018f.

melvin-bot bot mentioned this pull request Feb 18, 2025

[Due for payment 2025-02-25] [$250] Expense - Approve button changes to Pay button after manually adding a receipt #54168

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update settlement button condition #56410

Update settlement button condition #56410

cretadn22 commented Feb 5, 2025 •

edited

Loading

melvin-bot bot commented Feb 5, 2025

cretadn22 commented Feb 5, 2025

alitoshmatov commented Feb 10, 2025

cretadn22 commented Feb 11, 2025

alitoshmatov commented Feb 13, 2025

alitoshmatov left a comment

MonilBhavsar left a comment

cretadn22 commented Feb 14, 2025

MonilBhavsar left a comment

OSBotify commented Feb 14, 2025

github-actions bot commented Feb 17, 2025

github-actions bot commented Feb 18, 2025

Update settlement button condition #56410

Update settlement button condition #56410

Conversation

cretadn22 commented Feb 5, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps 1

QA Steps 2

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 5, 2025

cretadn22 commented Feb 5, 2025

alitoshmatov commented Feb 10, 2025

cretadn22 commented Feb 11, 2025

alitoshmatov commented Feb 13, 2025

Reviewer Checklist

Screenshots/Videos

alitoshmatov left a comment

Choose a reason for hiding this comment

MonilBhavsar left a comment

Choose a reason for hiding this comment

cretadn22 commented Feb 14, 2025

MonilBhavsar left a comment

Choose a reason for hiding this comment

OSBotify commented Feb 14, 2025

github-actions bot commented Feb 17, 2025

github-actions bot commented Feb 18, 2025

cretadn22 commented Feb 5, 2025 •

edited

Loading