From 3774110a83137fbb59e2165858c4ed8cb3f2092f Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Mon, 26 Nov 2018 15:20:30 +0100
Subject: [PATCH] handle NOT_SUPPORTED methods in Discovery

---
 src/actions/DiscoveryActions.js    | 18 ++++++++++++++++--
 src/actions/constants/discovery.js |  1 +
 src/reducers/DiscoveryReducer.js   | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/actions/DiscoveryActions.js b/src/actions/DiscoveryActions.js
index dacd66f9..773caeb1 100644
--- a/src/actions/DiscoveryActions.js
+++ b/src/actions/DiscoveryActions.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import TrezorConnect from 'trezor-connect';
+import TrezorConnect, { UI } from 'trezor-connect';
 import * as DISCOVERY from 'actions/constants/discovery';
 import * as ACCOUNT from 'actions/constants/account';
 import * as NOTIFICATION from 'actions/constants/notification';
@@ -23,7 +23,7 @@ import * as RippleDiscoveryActions from './ripple/RippleDiscoveryActions';
 export type DiscoveryStartAction = EthereumDiscoveryActions.DiscoveryStartAction | RippleDiscoveryActions.DiscoveryStartAction;
 
 export type DiscoveryWaitingAction = {
-    type: typeof DISCOVERY.WAITING_FOR_DEVICE | typeof DISCOVERY.WAITING_FOR_BLOCKCHAIN,
+    type: typeof DISCOVERY.WAITING_FOR_DEVICE | typeof DISCOVERY.WAITING_FOR_BLOCKCHAIN | typeof DISCOVERY.NOT_SUPPORTED,
     device: TrezorDevice,
     network: string,
 }
@@ -78,6 +78,10 @@ const start = (device: TrezorDevice, network: string, ignoreCompleted?: boolean)
     const { discovery } = getState();
     const discoveryProcess: ?Discovery = discovery.find(d => d.deviceState === device.state && d.network === network);
 
+    if (discoveryProcess && discoveryProcess.notSupported) {
+        return;
+    }
+
     if (!selected.connected && (!discoveryProcess || !discoveryProcess.completed)) {
         dispatch({
             type: DISCOVERY.WAITING_FOR_DEVICE,
@@ -188,6 +192,16 @@ const discoverAccount = (device: TrezorDevice, discoveryProcess: Discovery): Asy
             throw new Error(`DiscoveryActions.discoverAccount: Unknown network type: ${network.type}`);
         }
     } catch (error) {
+        // handle unsupported firmware error
+        if (error.message === UI.FIRMWARE_NOT_SUPPORTED) {
+            dispatch({
+                type: DISCOVERY.NOT_SUPPORTED,
+                device,
+                network: discoveryProcess.network,
+            });
+            return;
+        }
+
         dispatch({
             type: DISCOVERY.STOP,
             device,
diff --git a/src/actions/constants/discovery.js b/src/actions/constants/discovery.js
index e7287b1e..3b6a49a0 100644
--- a/src/actions/constants/discovery.js
+++ b/src/actions/constants/discovery.js
@@ -3,6 +3,7 @@
 
 export const START: 'discovery__start' = 'discovery__start';
 export const STOP: 'discovery__stop' = 'discovery__stop';
+export const NOT_SUPPORTED: 'discovery__not_supported' = 'discovery__not_supported';
 export const COMPLETE: 'discovery__complete' = 'discovery__complete';
 export const WAITING_FOR_DEVICE: 'discovery__waiting_for_device' = 'discovery__waiting_for_device';
 export const WAITING_FOR_BLOCKCHAIN: 'discovery__waiting_for_blockchain' = 'discovery__waiting_for_blockchain';
diff --git a/src/reducers/DiscoveryReducer.js b/src/reducers/DiscoveryReducer.js
index 3bebcf1b..e42bd9c5 100644
--- a/src/reducers/DiscoveryReducer.js
+++ b/src/reducers/DiscoveryReducer.js
@@ -26,6 +26,7 @@ export type Discovery = {
     completed: boolean;
     waitingForDevice: boolean;
     waitingForBlockchain: boolean;
+    notSupported: boolean;
 
     publicKey: string; // used in ethereum only
     chainCode: string; // used in ethereum only
@@ -43,6 +44,7 @@ const defaultDiscovery: Discovery = {
     completed: false,
     waitingForDevice: false,
     waitingForBlockchain: false,
+    notSupported: false,
 
     publicKey: '',
     chainCode: '',
@@ -156,6 +158,26 @@ const waitingForBlockchain = (state: State, action: DiscoveryWaitingAction): Sta
     return newState;
 };
 
+const notSupported = (state: State, action: DiscoveryWaitingAction): State => {
+    const deviceState: string = action.device.state || '0';
+    const instance: Discovery = {
+        ...defaultDiscovery,
+        network: action.network,
+        deviceState,
+        notSupported: true,
+    };
+
+    const index: number = findIndex(state, action.network, deviceState);
+    const newState: State = [...state];
+    if (index >= 0) {
+        newState[index] = instance;
+    } else {
+        newState.push(instance);
+    }
+
+    return newState;
+};
+
 export default function discovery(state: State = initialState, action: Action): State {
     switch (action.type) {
         case DISCOVERY.START:
@@ -170,6 +192,8 @@ export default function discovery(state: State = initialState, action: Action):
             return waitingForDevice(state, action);
         case DISCOVERY.WAITING_FOR_BLOCKCHAIN:
             return waitingForBlockchain(state, action);
+        case DISCOVERY.NOT_SUPPORTED:
+            return notSupported(state, action);
         case DISCOVERY.FROM_STORAGE:
             return action.payload.map((d) => {
                 const hdKey: HDKey = new HDKey();