From 31889270a0f17b53b0933ed043fbef10a1d13093 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 2 Nov 2018 16:38:27 +0100
Subject: [PATCH] Implemented review

---
 .babelrc                              |  4 ++--
 src/actions/SelectedAccountActions.js |  1 +
 src/actions/SignVerifyActions.js      | 27 +++++++++++++++------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.babelrc b/.babelrc
index ca61982f..18127ec5 100644
--- a/.babelrc
+++ b/.babelrc
@@ -25,7 +25,7 @@
     ],
     "env": {
         "test": {
-          "presets": ["jest"]
+            "presets": ["jest"]
         }
-      }
+    }
 }
\ No newline at end of file
diff --git a/src/actions/SelectedAccountActions.js b/src/actions/SelectedAccountActions.js
index 995e1cf8..f3f7c919 100644
--- a/src/actions/SelectedAccountActions.js
+++ b/src/actions/SelectedAccountActions.js
@@ -127,6 +127,7 @@ const getAccountStatus = (state: State, selectedAccount: SelectedAccountState):
             shouldRender: true,
         };
     }
+
     if (!device.available) {
         return {
             type: 'info',
diff --git a/src/actions/SignVerifyActions.js b/src/actions/SignVerifyActions.js
index 6e035159..e07d0e9f 100644
--- a/src/actions/SignVerifyActions.js
+++ b/src/actions/SignVerifyActions.js
@@ -23,10 +23,13 @@ export const sign = (
     hex: boolean = false,
 ): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
     const selected = getState().wallet.selectedDevice;
-    const devicePath = selected.path;
-    const input = {
+    if (!selected) return;
+
+    dispatch({ type: SIGN_VERIFY.SIGN_PROGRESS, isSignProgress: true });
+
+    const response = await TrezorConnect.ethereumSignMessage({
         device: {
-            path: devicePath,
+            path: selected.path,
             instance: selected.instance,
             state: selected.state,
         },
@@ -34,11 +37,7 @@ export const sign = (
         hex,
         message,
         useEmptyPassphrase: selected.useEmptyPassphrase,
-    };
-
-    dispatch({ type: SIGN_VERIFY.SIGN_PROGRESS, isSignProgress: true });
-
-    const response = await TrezorConnect.ethereumSignMessage(input);
+    });
 
     dispatch({ type: SIGN_VERIFY.SIGN_PROGRESS, isSignProgress: false });
 
@@ -74,15 +73,19 @@ export const verify = (
     hex: boolean = false,
 ): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
     const selected = getState().wallet.selectedDevice;
-    const input = {
+    if (!selected) return;
+    const response = await TrezorConnect.ethereumVerifyMessage({
+        device: {
+            path: selected.path,
+            instance: selected.instance,
+            state: selected.state,
+        },
         address,
         message,
         signature,
         hex,
         useEmptyPassphrase: selected.useEmptyPassphrase,
-    };
-
-    const response = await TrezorConnect.ethereumVerifyMessage(input);
+    });
 
     if (response && response.success) {
         dispatch({