Skip to content

Commit

Permalink
Move alias validation to onChange callback for better feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
jurevans committed Aug 2, 2023
1 parent 70c159a commit 46fb699
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions apps/extension/src/App/Accounts/AddAccount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,19 @@ const AddAccount: React.FC<Props> = ({
}
}, []);

const validateAlias = (accounts: DerivedAccount[], alias: string): void => {
const _validateAliasInUse = validateAliasInUse.bind(null, accounts, alias);
const _validateAliasIsRequired = validateAliasIsRequired.bind(null, alias);

if (!_validateAliasIsRequired()) {
setValidation(Validation.AliasRequired);
} else if (!_validateAliasInUse()) {
setValidation(Validation.AliasInUse);
} else {
setValidation(Validation.Valid);
}
};

useEffect(() => {
const _validatePath = validatePath.bind(
null,
Expand All @@ -190,19 +203,12 @@ const AddAccount: React.FC<Props> = ({
accounts,
parentAccountType
);
const _validateAliasInUse = validateAliasInUse.bind(null, accounts, alias);
const _validateAliasIsRequired = validateAliasIsRequired.bind(null, alias);

if (!_validateAliasIsRequired()) {
setValidation(Validation.AliasRequired);
} else if (!_validateAliasInUse()) {
setValidation(Validation.AliasInUse);
} else if (!_validatePath()) {
if (!_validatePath()) {
setValidation(Validation.PathInUse);
} else {
setValidation(Validation.Valid);
}
}, [parentAccountIndex, change, index, alias, isTransparent]);
}, [parentAccountIndex, change, index, isTransparent]);

useEffect(() => {
setIndex(
Expand Down Expand Up @@ -305,7 +311,11 @@ const AddAccount: React.FC<Props> = ({
label="Alias"
autoFocus={true}
value={alias}
onChangeCallback={(e) => setAlias(e.target.value)}
onChangeCallback={(e) => {
const { value } = e.target;
setAlias(value);
validateAlias(accounts, value);
}}
/>
</InputContainer>
<InputContainer>
Expand Down

0 comments on commit 46fb699

Please sign in to comment.