Fix: Hold request style and visibility by dragnoir · Pull Request #38471 · Expensify/App

dragnoir · 2024-03-18T13:30:48Z

Details

Fixed Issues

$ #37536
PROPOSAL: #37536 (comment)

The winning proposals are:

Not displaying hold on 3 dots menu when scanning [HOLD for payment 2024-05-09] [$500] Hold Request - "Hold" banner is aligned to the top when there is scan request message #37536 (comment)
Having the same style for hold status [HOLD for payment 2024-05-09] [$500] Hold Request - "Hold" banner is aligned to the top when there is scan request message #37536 (comment)

Tests

Go to staging.new.expensify.com
Go to 1:1 DM
Create a scan request
Go to request details page
Click 3-dot menu
Verify that there's no option to Hold from the 3 dots menu when the scanning status is displayed
Wait until the scan finish
Click 3-dot menu > Hold request
Add a reason and save it
Verify that the Hold status has the same style as the scanning status except with a red background for the badge

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to staging.new.expensify.com
Go to 1:1 DM
Create a scan request
Go to request details page
Click 3-dot menu
Verify that there's no option to Hold from the 3 dots menu when the scanning status is displayed
Go back online to allow the scan to finish
Wait until the scan finish
Go offline again
Click 3-dot menu > Hold request
Add a reason and save it
Verify that the Hold status has the same style as the scanning status except with a red background for the badge

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-03-18T13:30:54Z

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

shawnborton · 2024-03-18T13:43:42Z

Can you share a couple of still screenshots of the scanning state and the hold state? I just want to double check that the banner styles look the same. Thanks!

dragnoir · 2024-03-18T13:48:15Z

@shawnborton here's one

shawnborton · 2024-03-18T13:50:46Z

Awesome. Can you try making the "Hold" text use the same text color as our danger/red buttons?

Also cc @Expensify/design for vis... I think some of this stuff will eventually change when we update the next steps, but for now, I think this is worth getting alignment on.

We could also consider updating both of these badges to use our new badge style that's in the app too?

dragnoir · 2024-03-18T14:12:25Z

@shawnborton text color updated

shawnborton · 2024-03-18T14:48:04Z

Nice, that looks good to me - thanks!

dragnoir · 2024-03-18T15:49:09Z

I will try merging main again tomorrow to solve the perf test.

dragnoir · 2024-03-21T14:49:17Z

@Santhosh-Sellavel All checks have passed

Santhosh-Sellavel · 2024-03-25T18:31:57Z

    const styles = useThemeStyles();
    const borderBottomStyle = shouldShowBorderBottom ? styles.borderBottom : {};
+    const badgeBackgroundColorStyle = badgeColorStyle ?? styles.moneyRequestHeaderStatusBarBadgeBackground;
+    const badgeTextColorStyle = badgeColorStyle ? styles.textMicroBoldDangerColor : styles.textMicroBoldColor;


Why badgeColorStyle is used like a boolean here.
Why if badgeColorStylecolor exists text style should be styles.textMicroBoldDangerColor?

As badgeColorStyle could be anything.

Can you please refactor this properly?

dragnoir · 2024-03-26T21:27:01Z

I will refactor tomorrow

Santhosh-Sellavel · 2024-03-27T10:17:51Z

@neonbhai Can you help here by reviewing this one. Complete the Reviewer checklist.

neonbhai · 2024-03-28T01:39:10Z

@neonbhai Can you help here by reviewing this one. Complete the Reviewer checklist.

Sure thing! waiting on @dragnoir to resolve the PR comments

dragnoir · 2024-03-28T14:26:28Z

@neonbhai refactor done

shawnborton · 2024-03-29T08:07:42Z

Also, where did we land with regards to this screen here:

I thought the idea was that we would not show two banners at once?

shawnborton · 2024-03-29T08:08:22Z

From @JmillsExpensify in the original issue:

Yeah you shouldn't be able to hold a scanning request. That feels like the solution in my opinion.

cc @danielrvidal since you commented about this in Slack

Santhosh-Sellavel · 2024-03-29T16:06:44Z

Yeah, we should not show two labels at the same time!

dragnoir · 2024-03-29T23:56:39Z

Can you share a couple of still screenshots of the scanning state and the hold state?

@shawnborton it's just a screenshot for you to check how it looks. I played with the code to display both.

@Santhosh-Sellavel there's no two labels in the same time.

shawnborton · 2024-04-01T05:26:38Z

it's just a screenshot for you to check how it looks. I played with the code to display both.

Sounds good, thanks for confirming. Let us know when there are updated screenshots to check out and we can review from there.

dragnoir · 2024-04-01T08:33:24Z

@shawnborton here the final screenshots

dragnoir · 2024-04-24T21:22:31Z

@shawnborton do you want to update this too?

it's not related to hold request, but on the same other header for reports

dragnoir · 2024-04-24T21:32:02Z

Some screenshots from the update: (some are hardcoded just to display all the status in one screen)

I also updated the MoneyReportHeaderStatusBar

dragnoir · 2024-04-24T21:38:20Z

Also updated the education header

dragnoir · 2024-04-24T21:45:00Z

@Santhosh-Sellavel we will not need the component HoldBanner anymore. How to proceed?

shawnborton · 2024-04-25T11:22:10Z

Also updated the education header

What updates were needed for this out of curiosity?

we will not need the component HoldBanner anymore. How to proceed?

Can you elaborate some more - why is this not needed anymore?

dragnoir · 2024-04-25T11:32:09Z

@shawnborton

also updated the education header

this one here #38471 (comment)

Can you elaborate some more - why is this not needed anymore?

We use the same component for the 3 type of messages. The HOLD one, was using a the component HoldBanner. After we updated using badges, we don't need it, because it was for UI HOLD badge

shawnborton · 2024-04-25T11:54:18Z

We use the same component for the 3 type of messages. The HOLD one, was using a the component HoldBanner. After we updated using badges, we don't need it, because it was for UI HOLD badge

this one here #38471 (comment)

Cool, thanks for confirming!

neonbhai · 2024-04-25T22:45:39Z

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

Screen.Recording.2024-04-29.at.8.06.27.PM.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Scanning.Web.mov

MacOS: Desktop

Held.Desktop.mov

Scanning.Desktop.mov

neonbhai

looks good! just some small changes

neonbhai · 2024-04-25T22:47:16Z

    shouldShowBorderBottom: boolean;
+
+    /** Is Error type */
+    error?: boolean;


Let's name the new prop as danger here since we are signalling a color change and no actual error has occurred or is being passed.

neonbhai · 2024-04-25T22:50:31Z

    /** Whether we show the border bottom */
    shouldShowBorderBottom: boolean;
+
+    /** Is Error type */


Suggested change

/** Is Error type */

/** Whether we should use the danger theme color */

Let's use the prop description from here

dragnoir · 2024-04-26T09:25:41Z

Updates done

shawnborton · 2024-04-29T13:46:06Z

Friendly bump, let's please get this reviewed ASAP. I have a feeling this one is going to conflict with the updates @grgia is making to the pending/scanning requests though, right?

dragnoir · 2024-04-29T13:48:44Z

@Santhosh-Sellavel all good, just need approval.

@neonbhai missing screenshots

neonbhai

Looks good to me! 🚀

trjExpensify · 2024-04-29T17:01:25Z

👋 @NikkiWines any chance you could take the secondary internal review on this PR?

NikkiWines · 2024-04-29T19:00:04Z

Sure, I'll review this today!

Santhosh-Sellavel

LGTM, tests well, thanks everyone!

NikkiWines

👍 looks good!

OSBotify · 2024-05-01T03:01:10Z

🚀 Deployed to staging by https://github.com/NikkiWines in version: 1.4.69-0 🚀

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

OSBotify · 2024-05-02T13:04:45Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.69-2 🚀

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

Fix: Hold request style and visibility

7635de8

melvin-bot Bot requested review from Santhosh-Sellavel and removed request for a team March 18, 2024 13:30

shawnborton self-requested a review March 18, 2024 13:42

dragnoir added 2 commits March 18, 2024 15:50

Fix: scan status badge danger text

3e6c006

Merge remote-tracking branch 'upstream/main' into 37536-fix

b206355

Merge remote-tracking branch 'upstream/main' into 37536-fix

2900a14

Santhosh-Sellavel reviewed Mar 25, 2024

View reviewed changes

Comment thread src/styles/index.ts

Santhosh-Sellavel suggested changes Mar 25, 2024

View reviewed changes

dragnoir added 2 commits March 28, 2024 15:19

refactor

4db5bf9

Merge branch 'Expensify:main' into 37536-fix

bab947e

Merge branch 'Expensify:main' into 37536-fix

c04f281

dragnoir added 2 commits April 24, 2024 21:35

undo MoneyReportHeaderStatusBar

b8ff77e

update with new badge

e8ce240

update MoneyReportHeaderStatusBar too

88c3d4c

neonbhai suggested changes Apr 25, 2024

View reviewed changes

Rachid L added 2 commits April 26, 2024 10:19

Merge branch 'Expensify:main' into 37536-fix

eaf91c7

error to danger

69b603a

neonbhai approved these changes Apr 29, 2024

View reviewed changes

NikkiWines self-requested a review April 29, 2024 18:59

Santhosh-Sellavel approved these changes Apr 29, 2024

View reviewed changes

melvin-bot Bot requested a review from francoisl April 29, 2024 19:13

NikkiWines approved these changes Apr 30, 2024

View reviewed changes

NikkiWines merged commit 6f31a9c into Expensify:main Apr 30, 2024

github-actions Bot mentioned this pull request May 1, 2024

Deploy Checklist: New Expensify 2024-05-01 #41376

Closed

59 tasks

cretadn22 mentioned this pull request May 1, 2024

[HOLD for Payment: 2024-05-15] Expense Report - Top and bottom borders of "Next step" are cut off when the text has one line #41424

Closed

6 tasks

gijoe0295 mentioned this pull request May 5, 2024

feat: surfacing potential duplicates #40153

Merged

50 tasks

	/** Is Error type */
	/** Whether we should use the danger theme color */

Conversation

dragnoir commented Mar 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Mar 18, 2024

Uh oh!

shawnborton commented Mar 18, 2024

Uh oh!

dragnoir commented Mar 18, 2024

Uh oh!

shawnborton commented Mar 18, 2024

Uh oh!

dragnoir commented Mar 18, 2024

Uh oh!

shawnborton commented Mar 18, 2024

Uh oh!

dragnoir commented Mar 18, 2024

Uh oh!

dragnoir commented Mar 21, 2024

Uh oh!

Uh oh!

Santhosh-Sellavel Mar 25, 2024

Choose a reason for hiding this comment

Uh oh!

dragnoir commented Mar 26, 2024

Uh oh!

Santhosh-Sellavel commented Mar 27, 2024

Uh oh!

neonbhai commented Mar 28, 2024

Uh oh!

dragnoir commented Mar 28, 2024

Uh oh!

shawnborton commented Mar 29, 2024

Uh oh!

shawnborton commented Mar 29, 2024

Uh oh!

Santhosh-Sellavel commented Mar 29, 2024

Uh oh!

dragnoir commented Mar 29, 2024

Uh oh!

shawnborton commented Apr 1, 2024

Uh oh!

dragnoir commented Apr 1, 2024

Uh oh!

dragnoir commented Apr 24, 2024

Uh oh!

dragnoir commented Apr 24, 2024

Uh oh!

dragnoir commented Apr 24, 2024

Uh oh!

dragnoir commented Apr 24, 2024

Uh oh!

shawnborton commented Apr 25, 2024

Uh oh!

dragnoir commented Apr 25, 2024

Uh oh!

shawnborton commented Apr 25, 2024

Uh oh!

neonbhai commented Apr 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

neonbhai left a comment

Choose a reason for hiding this comment

Uh oh!

neonbhai Apr 25, 2024

Choose a reason for hiding this comment

Uh oh!

neonbhai Apr 25, 2024

Choose a reason for hiding this comment

Uh oh!

dragnoir commented Apr 26, 2024

dragnoir commented Mar 18, 2024 •

edited

Loading

neonbhai commented Apr 25, 2024 •

edited

Loading