fix: improved check for disabling continue button

more human readable
pull/3056/head
William Grant 1 year ago
parent 04d053a0e9
commit c3334d09e4

@ -1,3 +1,4 @@
import { isEmpty } from 'lodash';
import { useDispatch } from 'react-redux';
import { useMount } from 'react-use';
import { SettingsKey } from '../../../data/settings-key';
@ -86,7 +87,7 @@ export const CreateAccount = () => {
});
const signUpWithDetails = async () => {
if (!(!!displayName && !displayNameError)) {
if (isEmpty(displayName) || !isEmpty(displayNameError)) {
return;
}
@ -145,7 +146,7 @@ export const CreateAccount = () => {
buttonColor={SessionButtonColor.White}
onClick={signUpWithDetails}
text={window.i18n('continue')}
disabled={!(!!displayName && !displayNameError)}
disabled={isEmpty(displayName) || !isEmpty(displayNameError)}
dataTestId="continue-button"
/>
</Flex>

@ -1,4 +1,5 @@
import { Dispatch } from '@reduxjs/toolkit';
import { isEmpty } from 'lodash';
import { useDispatch } from 'react-redux';
import { ONBOARDING_TIMES } from '../../../session/constants';
import { InvalidWordsError, NotEnoughWordsError } from '../../../session/crypto/mnemonic';
@ -165,7 +166,12 @@ export const RestoreAccount = () => {
};
const recoverAndEnterDisplayName = async () => {
if (!(!!recoveryPassword && !recoveryPasswordError) || !(!!displayName && !displayNameError)) {
if (
isEmpty(recoveryPassword) ||
!isEmpty(recoveryPasswordError) ||
isEmpty(displayName) ||
!isEmpty(displayNameError)
) {
return;
}
@ -277,8 +283,10 @@ export const RestoreAccount = () => {
onClick={recoverAndEnterDisplayName}
text={window.i18n('continue')}
disabled={
!(!!recoveryPassword && !recoveryPasswordError) ||
!(!!displayName && !displayNameError)
isEmpty(recoveryPassword) ||
!isEmpty(recoveryPasswordError) ||
isEmpty(displayName) ||
!isEmpty(displayNameError)
}
dataTestId="continue-button"
/>

Loading…
Cancel
Save