fix: revert approver button gray color for held expenses

[mananjadhav]

Explanation of Change

• We had updated the Approve button color to grey in case we have any held transactions in the report. But we're now rolling back these changes, and adding the logic to have disabled Approve/ Pay button when in bulk options when there are 1 or more held expenses.
• This essentially reverts three PRs:
  - change report action button bg color if there's held expenses #53117
  - [CP Staging] fix: grey pay button held expense for small screen  #53921
  - change report action button bg color if there's held expenses #53117

Fixed Issues

$ #54054
$ #54657

PROPOSAL: N/A

Tests

Precondition:

• Have an account with a workspace - with approval and without approval hierarchy.

Steps:

1. Open to the app as one of the users of the workspace
2. Submit a few expenses
3. Open the app as an approver
4. Put one of the expenses on Hold.
5. Go to the report and confirm that Approve button doesn't have grey background, it should be green.
6. Go to the search page.
7. Go to the report in the listing.
8. Ensure that the Approve button doesn't have grey background, it should be green.
   9. Bulk select all the transactions within the report
   10. Check the Filter button at the top, which should show the Selected transaction count.
   11. Click on the dropdown, the Approve button should show up and it should be disabled.
9. Unhold the transactions and the Approve button on the bulk select should be enabled.
10. Repeat the steps with the workspace without the approver. The same logic should apply for the Pay button.
11. You can also test the same with different number of transactions, 1 or more.
12. Select a few rows in the report - ie some of with review, view or approve actions.
13. For every selected row, check the button color - Approve, Review, View, ensure that the selected hover should be interactive ie hover color is changed.

• Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

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

Same as Test steps.

• 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

Android: mWeb Chrome

iOS: Native

ios-revert-approve-color.mov

iOS: mWeb Safari

mweb-safari-revert-approve-color.mov

MacOS: Chrome / Safari

web-revert-approve-color.mov

web-button-hover-styles.mov

MacOS: Desktop

desktop-revert-approve-color.mov

[melvin-bot]

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

@parasharrajat This is ready for review. I have some issues with my iOS build. I'll try to upload it later.

[parasharrajat]

I will get it reviewed tomorrow IST

[parasharrajat]

@mananjadhav There are some String ID warnings.

[luacmartins]

@mananjadhav we've got conflicts

[mananjadhav]

@mananjadhav There are some String ID warnings.

@parasharrajat I reverted some of the changes as we decided to fix as a follow up.

@mananjadhav we've got conflicts

@luacmartins Fixed.

[mananjadhav]

I can see new lint errors. I'll get to fix it.

[mananjadhav]

Yeah I just updated both the screenshots for comparison.

[shawnborton]

Hmm if we have a scenario with two buttons, is there ever a reason why we would want the user to do one action over the other? If that's the case, it makes sense for one to be green and one to be "normal". How do we currently decide that logic?

[mananjadhav]

Well I am not sure. But if I look the code, the non-held amount is green and the full amount is gray. Do you think we should track this separately as a follow up? @shawnborton @luacmartins

App/src/components/ProcessMoneyReportHoldMenu.tsx

Lines 93 to 103 in 8e0bd8d

	<DecisionModal
	title={translate(isApprove ? 'iou.confirmApprove' : 'iou.confirmPay')}
	onClose={onClose}
	isVisible={isVisible}
	prompt={promptText}
	firstOptionText={nonHeldAmount ? `${translate(isApprove ? 'iou.approveOnly' : 'iou.payOnly')} ${nonHeldAmount}` : undefined}
	secondOptionText={`${translate(isApprove ? 'iou.approve' : 'iou.pay')} ${fullAmount}`}
	onFirstOptionSubmit={() => onSubmit(false)}
	onSecondOptionSubmit={() => onSubmit(true)}
	isSmallScreenWidth={isSmallScreenWidth}
	/>

[dannymcclain]

Yeah I agree that when there are two buttons we should pick one to be green and one to be regular. I think the current logic makes sense—paying only the unheld amount seems like "happiest" path because we know those ones are good to go. But we give you the option to go ahead and pay everything, even though that may be considered "less happy" because some of those expenses are held.

[shawnborton]

Cool, let's leave it as-is then!

[luacmartins]

Sounds good. It seems like we're ready for final review then?

[parasharrajat]

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
  • 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 form input styles:
  • I verified that all the inputs inside a form are aligned with each other.
  • I added Design label 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.

🎀 👀 🎀 C+ reviewed

[parasharrajat]

Screenshots

🔲 iOS / native

27.01.2025_20.48.58_REC.mp4

🔲 iOS / Safari

27.01.2025_20.54.27_REC.mp4

🔲 MacOS / Desktop

27.01.2025_20.14.13_REC.mp4

27.01.2025_20.21.45_REC.mp4

🔲 MacOS / Chrome

27.01.2025_18.32.37_REC.mp4

🔲 Android / Chrome

27.01.2025_20.43.09_REC.mp4

🔲 Android / native

27.01.2025_20.37.38_REC.mp4

[luacmartins]

LGTM

[OSBotify]

✋ 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]

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.91-0 🚀

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

[github-actions]

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.91-2 🚀

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

[blazejkustra]

@luacmartins @parasharrajat @mananjadhav Steps to reproduce aren't clear to me but in some cases my app crashes due to a change in this PR:

// The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here.
- const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || -1}`);
+ const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`);

[blazejkustra]

Actually the comment over this useOnyx is telling us what is happening 😆

The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here.

[mananjadhav]

Okay I wasn't sure if this would fail, I can see several usages without the fallback value. I can raise a quick PR by adding CONST.DEFAULT_NUMBER_ID. Draft PR is ready @luacmartins @blazejkustra @parasharrajat.

But I am not sure how to reproduce this.

[luacmartins]

Thanks for pointing that out @blazejkustra! @mananjadhav yea, let's add the fallback.

[blazejkustra]

I added you to the TRAVEL3 workspace and tagged [email protected] on report 2056688406598727.

After a fresh sign in this report seems to always crash the app. @shubham1206agra should be able to reproduce

[mananjadhav]

The fix PR is merged, but let me try to reproduce it.

[luacmartins]

I requested a CP as well

[mananjadhav]

CP to staging/prod? I don't see any label in the PR.

[mananjadhav]

@blazejkustra I still couldn't reproduce this. But thanks for highlighting, I am just concerned if the fallback does fix it 🤔

ios-workspace.mov