change report action button bg color if there's held expenses #53117

NJ-2020 · 2024-11-26T08:49:18Z

Explanation of Change

Fixed Issues

$ #52569
PROPOSAL: #52569 (comment)

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

One Expense

Go to any chat/workspace
Submit expense
Hold the expense
Make sure the pay/approve button color is gray inside the header
Go back
Make sure the report preview the pay/approve button color is gray

More than 1 Expense

Go to any chat/workspace
Submit more than 1 expense
Hold one of the expense
Make sure the pay/approve button color is gray inside the header
Go back
Make sure the report preview the pay/approve button color is gray

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-03.at.15.29.52.mov

Android: mWeb Chrome

Screen.Recording.2024-12-04.at.07.13.44.mov

iOS: Native

Screen.Recording.2024-12-04.at.08.48.31.mov

iOS: mWeb Safari

Screen.Recording.2024-12-04.at.08.10.48.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-04.at.09.10.03.mov

MacOS: Desktop

Screen.Recording.2024-12-04.at.08.56.19.mov

melvin-bot · 2024-11-26T08:49:23Z

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

luacmartins

I think we're missing the Search action button case.

NJ-2020 · 2024-11-29T13:30:55Z

Done, will update the recording videos soon

NJ-2020 · 2024-12-02T12:21:18Z

Hi, I will be OOO for 1 day

cc: @mananjadhav

luacmartins

We have conflicts

NJ-2020 · 2024-12-04T02:44:36Z

Done, conflicts resolved, merged latest changes from main

cc: @luacmartins @mananjadhav please re-review

src/components/SelectionList/Search/ActionCell.tsx

src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx

src/components/SelectionList/Search/TransactionListItemRow.tsx

mananjadhav · 2024-12-05T12:07:09Z

@NJ-2020 quick bump on the PR comments.

… fix/52569

NJ-2020 · 2024-12-05T14:17:23Z

Done, please re-review

cc: @mananjadhav

luacmartins

Left a few more comments

luacmartins · 2024-12-05T18:15:39Z

src/components/SelectionList/Search/ReportListItem.tsx

+    const reportItemTotal = reportItem?.total ?? 0;
+    const reportItemUnheldTotal = reportItem?.unheldTotal ?? 0;
+    const isOnHold = reportItemTotal - reportItemUnheldTotal === 0;
+
+    const isApproveAction = reportItem.action === CONST.SEARCH.ACTION_TYPES.APPROVE;
+    const shouldUseSuccessStyle = isApproveAction ? !isOnHold : true;
+


Can we use ReportUtils.hasHeldExpenses like so?

Suggested change

const reportItemTotal = reportItem?.total ?? 0;

const reportItemUnheldTotal = reportItem?.unheldTotal ?? 0;

const isOnHold = reportItemTotal - reportItemUnheldTotal === 0;

const isApproveAction = reportItem.action === CONST.SEARCH.ACTION_TYPES.APPROVE;

const shouldUseSuccessStyle = isApproveAction ? !isOnHold : true;

const hasHeldExpenses = ReportUtils.hasHeldExpenses('', reportItem.transactions);

luacmartins · 2024-12-05T18:16:03Z

src/components/SelectionList/Search/ReportListItem.tsx

@@ -202,6 +209,7 @@ function ReportListItem<TItem extends ListItem>({
                        <View style={StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)}>
                            <ActionCell
                                action={reportItem.action}
+                                shouldUseSuccessStyle={shouldUseSuccessStyle}


Suggested change

shouldUseSuccessStyle={shouldUseSuccessStyle}

shouldUseSuccessStyle={!hasHeldExpenses}

luacmartins · 2024-12-05T18:17:03Z

src/components/SelectionList/Search/TransactionListItemRow.tsx

@@ -278,6 +283,7 @@ function TransactionListItemRow({
                        onButtonPress={onButtonPress}
                        canSelectMultiple={canSelectMultiple}
                        action={item.action}
+                        shouldUseSuccessStyle={shouldUseSuccessStyle}


Suggested change

shouldUseSuccessStyle={shouldUseSuccessStyle}

shouldUseSuccessStyle={!isOnHold}

luacmartins · 2024-12-05T18:17:11Z

src/components/SelectionList/Search/TransactionListItemRow.tsx

@@ -444,6 +450,7 @@ function TransactionListItemRow({
                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
                    <ActionCell
                        action={item.action}
+                        shouldUseSuccessStyle={shouldUseSuccessStyle}


Suggested change

shouldUseSuccessStyle={shouldUseSuccessStyle}

shouldUseSuccessStyle={!isOnHold}

luacmartins · 2024-12-05T18:17:35Z

src/components/SelectionList/Search/TransactionListItemRow.tsx

+    const isApproveAction = item.action === CONST.SEARCH.ACTION_TYPES.APPROVE;
+    const shouldUseSuccessStyle = isApproveAction ? !isOnHold : true;


Do we need to check if it's approve action? Shouldn't we always use the grey style if there's a transaction on hold?

Suggested change

const isApproveAction = item.action === CONST.SEARCH.ACTION_TYPES.APPROVE;

const shouldUseSuccessStyle = isApproveAction ? !isOnHold : true;

… fix/52569

NJ-2020 · 2024-12-06T12:14:04Z

Please re-review @mananjadhav

luacmartins

Code LGTM. All yours @mananjadhav

mananjadhav · 2024-12-06T15:58:12Z

Testing the changes.

mananjadhav · 2024-12-08T19:32:37Z

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

android-grey-pay-button.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web-grey-pay-button.mov

MacOS: Desktop

desktop-grey-pay-button.mov

luacmartins

LGTM

OSBotify · 2024-12-09T16:11:10Z

✋ 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 · 2024-12-10T23:03:39Z

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

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

github-actions · 2024-12-12T01:33:36Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.74-8 🚀

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

jayeshmangwani · 2024-12-19T05:20:52Z

Following up on this issue, On this PR, we missed the case where the approve button turns green when selected via the checkbox. To address this, we updated the button style by adding buttonDefaultHovered. More details can be found in the selected proposal: #53897 (comment)

luacmartins · 2024-12-19T14:04:18Z

BTW we're reverting these changes and no longer changing button colors so if you're aware of any additional work changing the button colors, please stop immediately.

NJ-2020 added 2 commits November 26, 2024 15:38

change report action button bg color if has held expenses

c01057c

add new prop for SettlementButton

ac633d2

NJ-2020 requested a review from a team as a code owner November 26, 2024 08:49

melvin-bot bot requested a review from mananjadhav November 26, 2024 08:49

melvin-bot bot removed the request for review from a team November 26, 2024 08:49

luacmartins self-requested a review November 26, 2024 17:08

luacmartins requested changes Nov 26, 2024

View reviewed changes

NJ-2020 and others added 2 commits November 28, 2024 14:38

Merge branch 'Expensify:main' into fix/52569

b8b7a82

fix search action button color in case of held expense

24e43ec

fix typescript errors

508fe58

This comment was marked as resolved.

Sign in to view

luacmartins self-requested a review December 2, 2024 17:36

luacmartins reviewed Dec 2, 2024

View reviewed changes

NJ-2020 and others added 2 commits December 4, 2024 09:43

Merge changes from main and resolve conflicts

7f91683

Merge branch 'Expensify:main' into fix/52569

7b3e68d

fix search action button in small screen

a68cd67

luacmartins self-requested a review December 4, 2024 16:34

luacmartins requested changes Dec 4, 2024

View reviewed changes

NJ-2020 and others added 7 commits December 5, 2024 19:22

Merge branch 'Expensify:main' into fix/52569

b534b9c

fix some changes

e267431

remove unnecessary

3f80dcc

remove unnecessary changes

ea44f63

Merge branch 'fix/52569' of https://github.com/NJ-2020/Expensify into…

c1a1bb9

… fix/52569

fix eslint error

62d7aa7

revert changes

22232d3

luacmartins requested changes Dec 5, 2024

View reviewed changes

NJ-2020 added 2 commits December 6, 2024 05:16

update isOnHold and success style logic

0cc7779

Merge branch 'fix/52569' of https://github.com/NJ-2020/Expensify into…

0e52e7c

… fix/52569

luacmartins approved these changes Dec 6, 2024

View reviewed changes

mananjadhav approved these changes Dec 8, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins December 8, 2024 19:33

luacmartins approved these changes Dec 9, 2024

View reviewed changes

luacmartins merged commit d007785 into Expensify:main Dec 9, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Dec 10, 2024

Deploy Checklist: New Expensify 2024-12-10 #53889

Closed

52 tasks

IuliiaHerets mentioned this pull request Dec 11, 2024

[$250] Held expense - Green payment button appears briefly when paying held expense #53900

Open

8 tasks

cristipaval mentioned this pull request Dec 11, 2024

[HOLD for payment 2024-12-20] [HOLD for payment 2024-12-19] Search - Pay button for held expenses is gray in wide layout, and green in narrow layout #53905

Closed

8 tasks

luacmartins mentioned this pull request Dec 11, 2024

[HOLD for payment 2024-12-20] [HOLD for payment 2024-12-19] [$250] Search - Approve button becomes green when the held expense is selected via checkbox #53897

Closed

8 tasks

melvin-bot bot mentioned this pull request Dec 12, 2024

[HOLD for payment 2024-12-20] [HOLD for payment 2024-12-19] [$250] Updating report action button in the case of held expenses #52569

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

change report action button bg color if there's held expenses #53117

change report action button bg color if there's held expenses #53117

NJ-2020 commented Nov 26, 2024 •

edited

Loading

melvin-bot bot commented Nov 26, 2024

luacmartins left a comment

NJ-2020 commented Nov 29, 2024

This comment was marked as resolved.

NJ-2020 commented Dec 2, 2024

luacmartins left a comment

NJ-2020 commented Dec 4, 2024

mananjadhav commented Dec 5, 2024

NJ-2020 commented Dec 5, 2024

luacmartins left a comment

luacmartins Dec 5, 2024

luacmartins Dec 5, 2024

luacmartins Dec 5, 2024

luacmartins Dec 5, 2024

luacmartins Dec 5, 2024

NJ-2020 commented Dec 6, 2024

luacmartins left a comment

mananjadhav commented Dec 6, 2024

mananjadhav commented Dec 8, 2024

luacmartins left a comment

OSBotify commented Dec 9, 2024

github-actions bot commented Dec 10, 2024

github-actions bot commented Dec 12, 2024

jayeshmangwani commented Dec 19, 2024

luacmartins commented Dec 19, 2024

	shouldUseSuccessStyle={shouldUseSuccessStyle}
	shouldUseSuccessStyle={!hasHeldExpenses}

	shouldUseSuccessStyle={shouldUseSuccessStyle}
	shouldUseSuccessStyle={!isOnHold}

		const isApproveAction = item.action === CONST.SEARCH.ACTION_TYPES.APPROVE;
		const shouldUseSuccessStyle = isApproveAction ? !isOnHold : true;

change report action button bg color if there's held expenses #53117

change report action button bg color if there's held expenses #53117

Conversation

NJ-2020 commented Nov 26, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 26, 2024

luacmartins left a comment

Choose a reason for hiding this comment

NJ-2020 commented Nov 29, 2024

This comment was marked as resolved.

NJ-2020 commented Dec 2, 2024

luacmartins left a comment

Choose a reason for hiding this comment

NJ-2020 commented Dec 4, 2024

mananjadhav commented Dec 5, 2024

NJ-2020 commented Dec 5, 2024

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins Dec 5, 2024

Choose a reason for hiding this comment

luacmartins Dec 5, 2024

Choose a reason for hiding this comment

luacmartins Dec 5, 2024

Choose a reason for hiding this comment

luacmartins Dec 5, 2024

Choose a reason for hiding this comment

luacmartins Dec 5, 2024

Choose a reason for hiding this comment

NJ-2020 commented Dec 6, 2024

luacmartins left a comment

Choose a reason for hiding this comment

mananjadhav commented Dec 6, 2024

mananjadhav commented Dec 8, 2024

Reviewer Checklist

Screenshots/Videos

luacmartins left a comment

Choose a reason for hiding this comment

OSBotify commented Dec 9, 2024

github-actions bot commented Dec 10, 2024

github-actions bot commented Dec 12, 2024

jayeshmangwani commented Dec 19, 2024

luacmartins commented Dec 19, 2024

NJ-2020 commented Nov 26, 2024 •

edited

Loading