Merge pull request #23464 from DanutGavrus/fix/22658-highlight-cancel…

…-button [22658] Highlight specified cancel buttons
Expensify · Jul 26, 2023 · d68806f · d68806f
2 parents 3d22f59 + 3c240a3
commit d68806f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/components/Button/index.js b/src/components/Button/index.js
@@ -87,6 +87,9 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     textStyles: PropTypes.arrayOf(PropTypes.object),
 
+    /** Whether we should use the default hover style */
+    shouldUseDefaultHover: PropTypes.bool,
+
     /** Whether we should use the success theme color */
     success: PropTypes.bool,
 
@@ -142,6 +145,7 @@ const defaultProps = {
     style: [],
     innerStyles: [],
     textStyles: [],
+    shouldUseDefaultHover: false,
     success: false,
     danger: false,
     children: null,
@@ -295,6 +299,7 @@ class Button extends Component {
                     ...this.props.innerStyles,
                 ]}
                 hoverStyle={[
+                    this.props.shouldUseDefaultHover && !this.props.isDisabled ? styles.buttonDefaultHovered : undefined,
                     this.props.success && !this.props.isDisabled ? styles.buttonSuccessHovered : undefined,
                     this.props.danger && !this.props.isDisabled ? styles.buttonDangerHovered : undefined,
                 ]}

diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
@@ -76,6 +76,7 @@ function ConfirmContent(props) {
                     style={[styles.mt3, styles.noSelect]}
                     onPress={props.onCancel}
                     text={props.cancelText || props.translate('common.no')}
+                    shouldUseDefaultHover
                 />
             )}
         </View>

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -455,6 +455,7 @@ class BasePaymentsPage extends React.Component {
                                     onPress={this.navigateToAddPaypalRoute}
                                     style={[styles.mb4]}
                                     text={this.props.translate('common.edit')}
+                                    shouldUseDefaultHover
                                 />
                             )}
                             <Button

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -525,6 +525,11 @@ const styles = {
         textAlign: 'center',
     },
 
+    buttonDefaultHovered: {
+        backgroundColor: themeColors.buttonHoveredBG,
+        borderWidth: 0,
+    },
+
     buttonSuccess: {
         backgroundColor: themeColors.success,
         borderWidth: 0,