♻️ Update hwWallet middleware validate device model

LiskHQ · Jul 3, 2019 · 4903c6f · 4903c6f
1 parent 021815e
commit 4903c6f
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/store/middlewares/hwWallet.js b/src/store/middlewares/hwWallet.js
@@ -37,21 +37,23 @@ const hwWalletMiddleware = store => next => (action) => {
       const { account, settings } = state;
       const activeToken = settings.token.active || 'LSK';
 
-      if (account.info[activeToken].address) {
-        if (account.hwInfo && account.hwInfo.deviceId) {
-          store.dispatch(dialogDisplayed({
-            childComponent: Alert,
-            childComponentProps: {
-              title: 'You are disconnected',
-              text: `There is no connection to the ${model}. Please check the cables if it happened by accident.`,
-              closeDialog: () => {
-                store.dispatch(dialogHidden());
-                location.reload(); // eslint-disable-line
-              },
+      if (account.info[activeToken].address
+        && account.hwInfo
+        && account.hwInfo.deviceId
+        && account.hwInfo.deviceModel === model
+      ) {
+        store.dispatch(dialogDisplayed({
+          childComponent: Alert,
+          childComponentProps: {
+            title: 'You are disconnected',
+            text: `There is no connection to the ${model}. Please check the cables if it happened by accident.`,
+            closeDialog: () => {
+              store.dispatch(dialogHidden());
+              location.reload(); // eslint-disable-line
             },
-          }));
-          store.dispatch(accountLoggedOut());
-        }
+          },
+        }));
+        store.dispatch(accountLoggedOut());
       }
 
       store.dispatch({