[22658] Highlight specified cancel buttons #23464

DanutGavrus · 2023-07-24T09:26:29Z

Details

Cancel buttons are not highlighted when the cursor is brought near to them. Added a default style for Buttons & a prop to pass when needed.
Edit button is not highlighted when editing a payment method, passed the previously mentioned prop to this button too.

Fixed Issues

$ #22658
$ #23196
PROPOSAL: #22658 (comment)

Tests

Same as QA Steps.

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps.

QA Steps

I.

Go to settings > Workspace > choose workspace with a currency outside USD;
Go to bank account. A modal will open;
Verify that the "Cancel" button in the modal has hover effect.

II.

Go to settings > Workspace > choose any workspace;
Click on the 3 dots from up right > Delete workspace. A modal will open;
Verify that the "Cancel" button in the modal has hover effect.

III.

Go to settings > Workspace > choose any workspace with at least 2 members in it;
Go to "Members" > select 1 member from the list > then click up on "Remove". A modal will open;
Verify that the "Cancel" button in the modal has hover effect.

IV.

Go to settings > Payments;
If PayPal method is missing > click on "Add payment method" > choose PayPal > write "test" and add it;
Click existing PayPal account name;
Verify that the "Edit" button has hover effect.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

hover_web.mp4

Mobile Web - Chrome

There is no hover effect on Mobile Web - Chrome.

Mobile Web - Safari

There is no hover effect on Mobile Web - Safari.

Desktop

iOS

There is no hover effect on iOS.

Android

There is no hover effect on Android.

melvin-bot · 2023-07-24T09:58:20Z

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

mollfpr

~~@DanutGavrus Why do we need to define the props in the page? Is there a different between the cancel button for confirm modal in workspace initial page and the confirm modal in delete message?~~

Nvm, let's follow the expected result here #22658 (comment).

mollfpr · 2023-07-24T12:44:48Z

src/components/Button/index.js

@@ -142,6 +145,7 @@ const defaultProps = {
    style: [],
    innerStyles: [],
    textStyles: [],
+    default: false,


I don't think we need to specify props for the default style if it's only affecting the hover style. We can replace this with shouldShowDefaultHoverEffect.

Tried to keep it consistent with success and danger styles. Each button may be only 1 of success, danger, default. Would you say shouldShowDefaultHoverEffect is better?

The button has a default style applied, so adding new props default just for the hovered seems confusing.

Updated it to shouldHaveHoverEffect

mollfpr · 2023-07-24T12:46:09Z

src/components/ConfirmContent.js

@@ -36,6 +36,9 @@ const propTypes = {
    /** Whether we should show the cancel button */
    shouldShowCancelButton: PropTypes.bool,

+    /** Whether the cancel button has hover effect */
+    cancelWithHoverEffect: PropTypes.bool,


https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#boolean-variables-and-props

Boolean props or variables must be prefixed with should or is to make it clear that they are Boolean. Use should when we are enabling or disabling some features and is in most other cases.

We should change this with the should prefix.

Updated to shouldCancelBtnHaveHoverEffect

mollfpr · 2023-07-24T13:55:07Z

I'm asking for clarification in the Slack channel, and my expectation was this would be applied to all the cancel buttons in the confirm component. Because if we do not do that, similar issues will arise (for example for the delete message confirm modal) and it will cost us more.

mollfpr · 2023-07-25T05:25:52Z

@DanutGavrus If we change all the cancel buttons, we only need to pass the props from ConfirmContent right? Is there any drawback that is visible to you if we do that?

DanutGavrus · 2023-07-25T09:25:48Z

@mollfpr

If we change all the cancel buttons, we only need to pass the props from ConfirmContent right? Is there any drawback that is visible to you if we do that?

ConfirmContent has a prop called cancelText which is set when ConfirmModal is used. As I see, right now it is used many times and, when shouldShowCancelButton props is true, cancelText prop is set to Cancel everywhere except in Expensify.js where it's set to Decline. Every time it is pressed, the onCancel callback gets called.

If we want to highlight only cancel buttons which have the actual Cancel text, it might be a drawback as we have 1 place where it's not Cancel right now, and there may be more in the future. If the text is just a formality as the prop is called cancelText and the callback is called onCancel, then I see no drawbacks.

Went ahead and updated with a commit, I will revert if needed.

mollfpr · 2023-07-25T09:31:52Z

I guess the cancel button with decline text still counts as a cancel button, and there are no style differences between those.

DanutGavrus · 2023-07-25T10:24:55Z

Agree!

mollfpr · 2023-07-26T04:17:01Z

@DanutGavrus Let's add the prop here too for #23196 the fix.

App/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js

Lines 453 to 459 in 0fec944

    
           {isPayPalMeSelected && ( 
        
               <Button 
        
                   onPress={this.navigateToAddPaypalRoute} 
        
                   style={[styles.mb4]} 
        
                   text={this.props.translate('common.edit')} 
        
               /> 
        
           )}

mollfpr · 2023-07-26T04:53:29Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

23464.Web.mp4

Mobile Web - Chrome

23464.mWeb-Chrome.mp4

Mobile Web - Safari

23464.mWeb-Safari.mp4

Desktop

23464.Desktop.mp4

iOS

23464.iOS.mp4

Android

23464.Android.mp4

DanutGavrus · 2023-07-26T08:38:16Z

@mollfpr

@DanutGavrus Let's add the prop here too for #23196 the fix.

Done!

mollfpr

LGTM and tests well 👍

@DanutGavrus Let's add the test step for edit button on payment page.

DanutGavrus · 2023-07-26T12:00:48Z

@mollfpr Done!

melvin-bot · 2023-07-26T14:22:12Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

OSBotify · 2023-07-26T14:26:27Z

✋ 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 · 2023-07-26T16:09:40Z

🚀 Deployed to staging by https://github.com/Gonals in version: 1.3.46-0 🚀

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

OSBotify · 2023-07-27T22:07:34Z

🚀 Deployed to staging by https://github.com/Gonals in version: 1.3.47-0 🚀

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

OSBotify · 2023-07-27T22:38:26Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.46-2 🚀

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

OSBotify · 2023-07-31T18:36:03Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.47-6 🚀

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

DanutGavrus added 2 commits July 19, 2023 12:34

[22658] Added possibility to add hover effect to cancel buttons.

4568b94

Merge branch 'main' into fix/22658-highlight-cancel-button

2104c2e

DanutGavrus marked this pull request as ready for review July 24, 2023 09:58

DanutGavrus requested a review from a team as a code owner July 24, 2023 09:58

melvin-bot bot removed the request for review from a team July 24, 2023 09:58

melvin-bot bot requested a review from mollfpr July 24, 2023 09:58

This was referenced Jul 24, 2023

[HOLD for payment 2023-08-03] [$1000] Cancel button is not highlighted when the cursor is brought near to it #22658

Closed

[HOLD for payment 2023-08-03] Web - 'Edit' Button in Paypal account name is not highlighted when the cursor comes near to it #23196

Closed

mollfpr suggested changes Jul 24, 2023

View reviewed changes

DanutGavrus added 2 commits July 24, 2023 16:10

Added should prefix to the Bool prop.

dce853a

Changed prop name from default to shouldHaveHoverEffect.

195f453

DanutGavrus added 2 commits July 25, 2023 11:53

Merge branch 'main' into fix/22658-highlight-cancel-button

59ef366

Updated only Cancel buttons to have the default hover effect.

e2e4175

[23196] Added hover effect to paypal edit button.

53b2405

Merge branch 'main' into fix/22658-highlight-cancel-button

3c240a3

mollfpr approved these changes Jul 26, 2023

View reviewed changes

melvin-bot bot requested a review from Gonals July 26, 2023 11:46

Gonals approved these changes Jul 26, 2023

View reviewed changes

Gonals merged commit d68806f into Expensify:main Jul 26, 2023
1 check passed

OSBotify mentioned this pull request Jul 26, 2023

Deploy Checklist: New Expensify 2023-07-26 #23657

Closed

43 tasks

OSBotify mentioned this pull request Jul 27, 2023

Deploy Checklist: New Expensify 2023-07-27 #23765

Closed

79 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[22658] Highlight specified cancel buttons #23464

[22658] Highlight specified cancel buttons #23464

DanutGavrus commented Jul 24, 2023 •

edited

Loading

melvin-bot bot commented Jul 24, 2023

mollfpr left a comment •

edited

Loading

mollfpr Jul 24, 2023

DanutGavrus Jul 24, 2023

mollfpr Jul 24, 2023

DanutGavrus Jul 24, 2023

mollfpr Jul 24, 2023

DanutGavrus Jul 24, 2023

mollfpr commented Jul 24, 2023

mollfpr commented Jul 25, 2023

DanutGavrus commented Jul 25, 2023

mollfpr commented Jul 25, 2023

DanutGavrus commented Jul 25, 2023

mollfpr commented Jul 26, 2023

mollfpr commented Jul 26, 2023 •

edited

Loading

DanutGavrus commented Jul 26, 2023

mollfpr left a comment

DanutGavrus commented Jul 26, 2023

melvin-bot bot commented Jul 26, 2023

OSBotify commented Jul 26, 2023

OSBotify commented Jul 26, 2023

OSBotify commented Jul 27, 2023

OSBotify commented Jul 27, 2023

OSBotify commented Jul 31, 2023

[22658] Highlight specified cancel buttons #23464

[22658] Highlight specified cancel buttons #23464

Conversation

DanutGavrus commented Jul 24, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 24, 2023

mollfpr left a comment • edited Loading

Choose a reason for hiding this comment

mollfpr Jul 24, 2023

Choose a reason for hiding this comment

DanutGavrus Jul 24, 2023

Choose a reason for hiding this comment

mollfpr Jul 24, 2023

Choose a reason for hiding this comment

DanutGavrus Jul 24, 2023

Choose a reason for hiding this comment

mollfpr Jul 24, 2023

Choose a reason for hiding this comment

DanutGavrus Jul 24, 2023

Choose a reason for hiding this comment

mollfpr commented Jul 24, 2023

mollfpr commented Jul 25, 2023

DanutGavrus commented Jul 25, 2023

mollfpr commented Jul 25, 2023

DanutGavrus commented Jul 25, 2023

mollfpr commented Jul 26, 2023

mollfpr commented Jul 26, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

DanutGavrus commented Jul 26, 2023

mollfpr left a comment

Choose a reason for hiding this comment

DanutGavrus commented Jul 26, 2023

melvin-bot bot commented Jul 26, 2023

OSBotify commented Jul 26, 2023

OSBotify commented Jul 26, 2023

OSBotify commented Jul 27, 2023

OSBotify commented Jul 27, 2023

OSBotify commented Jul 31, 2023

DanutGavrus commented Jul 24, 2023 •

edited

Loading

mollfpr left a comment •

edited

Loading

mollfpr commented Jul 26, 2023 •

edited

Loading