Skip to content

Commit

Permalink
Resolved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
alitoshmatov committed Jun 5, 2023
1 parent 65c7539 commit fb5c98a
Showing 1 changed file with 16 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import Button from '../../../../../components/Button';
import DotIndicatorMessage from '../../../../../components/DotIndicatorMessage';
import * as Session from '../../../../../libs/actions/Session';
import Text from '../../../../../components/Text';
import {withNetwork} from '../../../../../components/OnyxProvider';
import PressableWithFeedback from '../../../../../components/Pressable/PressableWithFeedback';
import themeColors from '../../../../../styles/themes/default';
import * as StyleUtils from '../../../../../styles/StyleUtils';

const propTypes = {
...withLocalizePropTypes,
Expand Down Expand Up @@ -138,12 +142,18 @@ function BaseValidateCodeForm(props) {
onClose={() => User.clearContactMethodErrors(props.contactMethod, 'validateCodeSent')}
>
<View style={[styles.mt2, styles.dFlex, styles.flexColumn, styles.alignItemsStart]}>
<Text
style={[styles.link, styles.mr1]}
<PressableWithFeedback
disabled={props.network.isOffline}
style={[styles.mr1]}
onPress={resendValidateCode}
underlayColor={themeColors.componentBG}
hoverDimmingValue={1}
pressDimmingValue={0.2}
accessibilityRole="button"
accessibilityLabel={props.translate('contacts.resendMagicCode')}
>
{props.translate('contacts.resendMagicCode')}
</Text>
<Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>{props.translate('contacts.resendMagicCode')}</Text>
</PressableWithFeedback>
{props.hasMagicCodeBeenSent && (
<DotIndicatorMessage
type="success"
Expand All @@ -160,6 +170,7 @@ function BaseValidateCodeForm(props) {
onClose={() => User.clearContactMethodErrors(props.contactMethod, 'validateLogin')}
>
<Button
disabled={props.network.isOffline}
text={props.translate('common.verify')}
onPress={validateAndSubmitForm}
style={[styles.mt4]}
Expand All @@ -180,4 +191,5 @@ export default compose(
withOnyx({
account: {key: ONYXKEYS.ACCOUNT},
}),
withNetwork(),
)(BaseValidateCodeForm);

0 comments on commit fb5c98a

Please sign in to comment.