diff --git a/src/actions/SignVerifyActions.js b/src/actions/SignVerifyActions.js index d12bb678..8fc3982f 100644 --- a/src/actions/SignVerifyActions.js +++ b/src/actions/SignVerifyActions.js @@ -141,12 +141,16 @@ const inputChange = (inputName: string, value: string): ThunkAction => ( type: SIGN_VERIFY.TOUCH, inputName, }); - if (inputName === 'verifyAddress' && validateAddress(value) !== null) { - dispatch({ - type: SIGN_VERIFY.ERROR, - inputName, - message: validateAddress(value), - }); + + if (inputName === 'verifyAddress') { + const error = validateAddress(value); + if (error) { + dispatch({ + type: SIGN_VERIFY.ERROR, + inputName, + message: error, + }); + } } }; diff --git a/src/reducers/SignVerifyReducer.js b/src/reducers/SignVerifyReducer.js index 47197857..4b1b3cd3 100644 --- a/src/reducers/SignVerifyReducer.js +++ b/src/reducers/SignVerifyReducer.js @@ -57,6 +57,8 @@ export default (state: State = initialState, action: Action): State => { return { ...state, 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 { diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js index 3b4f21e9..6155cc6d 100644 --- a/src/views/Wallet/views/Account/SignVerify/index.js +++ b/src/views/Wallet/views/Account/SignVerify/index.js @@ -140,6 +140,7 @@ class SignVerify extends Component { signVerifyActions.sign(account.accountPath, signMessage) } @@ -194,7 +195,7 @@ class SignVerify extends Component { { if (errors.length <= 0) { signVerifyActions.verify(