diff --git a/src/actions/DiscoveryActions.js b/src/actions/DiscoveryActions.js index be0ddb03..5feebc38 100644 --- a/src/actions/DiscoveryActions.js +++ b/src/actions/DiscoveryActions.js @@ -205,7 +205,7 @@ const discoverAccount = (device: TrezorDevice, discoveryProcess: Discovery): Asy } // handle outdated firmware error - if (error.message === UI.FIRMWARE) { + if (error.message === UI.FIRMWARE_OLD) { dispatch({ type: DISCOVERY.FIRMWARE_OUTDATED, device, diff --git a/src/actions/ReceiveActions.js b/src/actions/ReceiveActions.js index 116a5c15..70523e30 100644 --- a/src/actions/ReceiveActions.js +++ b/src/actions/ReceiveActions.js @@ -94,6 +94,9 @@ export const showAddress = (path: Array): AsyncAction => async (dispatch type: RECEIVE.HIDE_ADDRESS, }); + // special case: device no-backup permissions not granted + if (response.payload.code === 403) return; + dispatch({ type: NOTIFICATION.ADD, payload: { diff --git a/src/actions/TrezorConnectActions.js b/src/actions/TrezorConnectActions.js index dfbde361..f25f5477 100644 --- a/src/actions/TrezorConnectActions.js +++ b/src/actions/TrezorConnectActions.js @@ -120,7 +120,7 @@ export const init = (): AsyncAction => async (dispatch: Dispatch, getState: GetS if (buildUtils.isDev()) { window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' ? LOCAL : 'https://sisyfos.trezor.io/connect/'; // eslint-disable-line no-underscore-dangle - // window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' ? LOCAL : 'https://connect.trezor.io/5/'; // eslint-disable-line no-underscore-dangle + // window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' ? LOCAL : 'https://localhost:8088/'; // eslint-disable-line no-underscore-dangle window.TrezorConnect = TrezorConnect; } @@ -131,6 +131,10 @@ export const init = (): AsyncAction => async (dispatch: Dispatch, getState: GetS popup: false, webusb: true, pendingTransportEvent: (getState().devices.length < 1), + manifest: { + email: 'info@trezor.io', + appUrl: 'http://beta-wallet.trezor.io/next/', + }, }); } catch (error) { dispatch({ diff --git a/src/flowtype/index.js b/src/flowtype/index.js index e5e24d07..88cd5e0e 100644 --- a/src/flowtype/index.js +++ b/src/flowtype/index.js @@ -38,6 +38,7 @@ import type { Device, Features, DeviceStatus, + FirmwareRelease, DeviceFirmwareStatus, DeviceMode, DeviceMessageType, @@ -55,6 +56,7 @@ export type AcquiredDevice = $Exact<{ +label: string, +features: Features, +firmware: DeviceFirmwareStatus, + +firmwareRelease: ?FirmwareRelease, status: DeviceStatus, +mode: DeviceMode, state: ?string,