Merge pull request #479 from trezor/fix/signverify-validation

Fix/signverify validation
pull/482/head
Vladimir Volek 5 years ago committed by GitHub
commit 263e09dad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -141,13 +141,17 @@ const inputChange = (inputName: string, value: string): ThunkAction => (
type: SIGN_VERIFY.TOUCH, type: SIGN_VERIFY.TOUCH,
inputName, inputName,
}); });
if (inputName === 'verifyAddress' && validateAddress(value) !== null) {
if (inputName === 'verifyAddress') {
const error = validateAddress(value);
if (error) {
dispatch({ dispatch({
type: SIGN_VERIFY.ERROR, type: SIGN_VERIFY.ERROR,
inputName, inputName,
message: validateAddress(value), message: error,
}); });
} }
}
}; };
const clearSign = (): ThunkAction => (dispatch: Dispatch): void => { const clearSign = (): ThunkAction => (dispatch: Dispatch): void => {

@ -57,6 +57,8 @@ export default (state: State = initialState, action: Action): State => {
return { return {
...state, ...state,
touched: [...state.touched, action.inputName], touched: [...state.touched, action.inputName],
// reset errors for the input even if it was not touched before
errors: state.errors.filter(error => error.inputName !== inputName),
}; };
} }
return { return {

@ -140,6 +140,7 @@ class SignVerify extends Component<Props> {
<FormattedMessage {...l10nCommonMessages.TR_CLEAR} /> <FormattedMessage {...l10nCommonMessages.TR_CLEAR} />
</StyledButton> </StyledButton>
<StyledButton <StyledButton
isDisabled={!device.connected}
onClick={() => onClick={() =>
signVerifyActions.sign(account.accountPath, signMessage) signVerifyActions.sign(account.accountPath, signMessage)
} }
@ -194,7 +195,7 @@ class SignVerify extends Component<Props> {
<FormattedMessage {...l10nCommonMessages.TR_CLEAR} /> <FormattedMessage {...l10nCommonMessages.TR_CLEAR} />
</StyledButton> </StyledButton>
<StyledButton <StyledButton
isDisabled={!!verifyAddressError} isDisabled={!!verifyAddressError || !device.connected}
onClick={() => { onClick={() => {
if (errors.length <= 0) { if (errors.length <= 0) {
signVerifyActions.verify( signVerifyActions.verify(

Loading…
Cancel
Save