From d9e03c898a48c52ec9c22008a223bfc3725de252 Mon Sep 17 00:00:00 2001
From: slowbackspace <slowbackspace@gmail.com>
Date: Fri, 29 Mar 2019 09:47:05 +0100
Subject: [PATCH 1/3] call validateAddress only once per inputChange()

---
 src/actions/SignVerifyActions.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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,
+            });
+        }
     }
 };
 

From f60ddec70fbcd0198d854e98ff4b35038f27aef0 Mon Sep 17 00:00:00 2001
From: slowbackspace <slowbackspace@gmail.com>
Date: Fri, 29 Mar 2019 10:40:25 +0100
Subject: [PATCH 2/3] reset errors for the input even if it was not touched
 before

---
 src/reducers/SignVerifyReducer.js | 2 ++
 1 file changed, 2 insertions(+)

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 {

From b2a5d040b53320a9daafc7163030f54a6d38e48f Mon Sep 17 00:00:00 2001
From: slowbackspace <slowbackspace@gmail.com>
Date: Fri, 29 Mar 2019 10:51:02 +0100
Subject: [PATCH 3/3] disabled sign and verify buttons when device is not
 connected

---
 src/views/Wallet/views/Account/SignVerify/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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<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(