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

Fix/signverify validation

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({
+    if (inputName === 'verifyAddress') {
-            type: SIGN_VERIFY.ERROR,
+        const error = validateAddress(value);
-            inputName,
+        if (error) {
-            message: validateAddress(value),
+            dispatch({
-        });
+                type: SIGN_VERIFY.ERROR,
+                inputName,
+                message: error,
+            });
+        }
     }
 };
 

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 {

src/views/Wallet/views/Account/SignVerify/index.js

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