Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/components/ConfirmContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
import Header from './Header';
import styles from '../styles/styles';
import Button from './Button';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import useLocalize from '../hooks/useLocalize';
import useNetwork from '../hooks/useNetwork';
import Text from './Text';

const propTypes = {
Expand Down Expand Up @@ -33,14 +34,15 @@ const propTypes = {
/** Whether we should use the danger button color. Use if the action is destructive */
danger: PropTypes.bool,

/** Whether we should disable the confirm button when offline */
shouldDisableConfirmButtonWhenOffline: PropTypes.bool,

/** Whether we should show the cancel button */
shouldShowCancelButton: PropTypes.bool,

/** Styles for view */
// eslint-disable-next-line react/forbid-prop-types
contentStyles: PropTypes.arrayOf(PropTypes.object),

...withLocalizePropTypes,
};

const defaultProps = {
Expand All @@ -50,11 +52,15 @@ const defaultProps = {
success: true,
danger: false,
onCancel: () => {},
shouldDisableConfirmButtonWhenOffline: false,
shouldShowCancelButton: true,
contentStyles: [],
};

function ConfirmContent(props) {
const {translate} = useLocalize();
const {isOffline} = useNetwork();

return (
<View style={[styles.m5, ...props.contentStyles]}>
<View style={[styles.flexRow, styles.mb4]}>
Expand All @@ -69,13 +75,14 @@ function ConfirmContent(props) {
style={[styles.mt4]}
onPress={props.onConfirm}
pressOnEnter
text={props.confirmText || props.translate('common.yes')}
text={props.confirmText || translate('common.yes')}
isDisabled={isOffline && props.shouldDisableConfirmButtonWhenOffline}
/>
{props.shouldShowCancelButton && (
<Button
style={[styles.mt3, styles.noSelect]}
onPress={props.onCancel}
text={props.cancelText || props.translate('common.no')}
text={props.cancelText || translate('common.no')}
shouldUseDefaultHover
/>
)}
Expand All @@ -86,4 +93,4 @@ function ConfirmContent(props) {
ConfirmContent.propTypes = propTypes;
ConfirmContent.defaultProps = defaultProps;
ConfirmContent.displayName = 'ConfirmContent';
export default withLocalize(ConfirmContent);
export default ConfirmContent;
5 changes: 5 additions & 0 deletions src/components/ConfirmModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ const propTypes = {
/** Is the action destructive */
danger: PropTypes.bool,

/** Whether we should disable the confirm button when offline */
shouldDisableConfirmButtonWhenOffline: PropTypes.bool,

/** Whether we should show the cancel button */
shouldShowCancelButton: PropTypes.bool,

Expand All @@ -52,6 +55,7 @@ const defaultProps = {
success: true,
danger: false,
onCancel: () => {},
shouldDisableConfirmButtonWhenOffline: false,
shouldShowCancelButton: true,
shouldSetModalVisibility: true,
title: '',
Expand Down Expand Up @@ -79,6 +83,7 @@ function ConfirmModal(props) {
prompt={props.prompt}
success={props.success}
danger={props.danger}
shouldDisableConfirmButtonWhenOffline={props.shouldDisableConfirmButtonWhenOffline}
shouldShowCancelButton={props.shouldShowCancelButton}
/>
</Modal>
Expand Down
1 change: 1 addition & 0 deletions src/pages/settings/Security/CloseAccountPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ function CloseAccountPage(props) {
prompt={props.translate('closeAccountPage.closeAccountPermanentlyDeleteData')}
confirmText={props.translate('common.yesContinue')}
cancelText={props.translate('common.cancel')}
shouldDisableConfirmButtonWhenOffline
shouldShowCancelButton
/>
</View>
Expand Down