From 76b6100a60a9180acfba75eb4f77ca641d989534 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Tue, 26 Mar 2019 10:52:32 +0100 Subject: [PATCH 1/3] update trezor-connect@7.0.2-electron.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e9b199e7..fc1162d7 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "styled-components": "^4.1.3", "styled-normalize": "^8.0.6", "trezor-bridge-communicator": "1.0.2", - "trezor-connect": "7.0.0-beta.3", + "trezor-connect": "7.0.2-electron.4", "trezor-ui-components": "^1.0.0-beta.4", "wallet-address-validator": "^0.2.4", "web3": "1.0.0-beta.35", diff --git a/yarn.lock b/yarn.lock index a30cf87b..db5d0365 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11151,10 +11151,10 @@ trezor-bridge-communicator@1.0.2: request "^2.88.0" whatwg-fetch "^3.0.0" -trezor-connect@7.0.0-beta.3: - version "7.0.0-beta.3" - resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-7.0.0-beta.3.tgz#34aff422e36745eac24a266bcdfa266282ac5255" - integrity sha512-aRh+Vzfqy/2GMJnsvtrzGhwi9j9wjOkBrNN62HTD2sDXLrcROlQMHBCd5lPjSZaJk1npjw5rrvhPS3G9IeyiVw== +trezor-connect@7.0.2-electron.4: + version "7.0.2-electron.4" + resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-7.0.2-electron.4.tgz#2fad96f11f0136dada5ae6a4dbc4a24b8408a131" + integrity sha512-c+DyAnaSI5GeSw7ETSK3CzekDsHR2vI5qltNavpmg8B16aBLvyeL89VCkXZQrxdZGESvO5/vcOMbr1Rdp/sGPQ== dependencies: "@babel/runtime" "^7.3.1" events "^3.0.0" From fe744ca81ffe782d73c98529bbb7f752c2cc4d44 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Tue, 26 Mar 2019 10:52:50 +0100 Subject: [PATCH 2/3] update sisyfos endpoint --- src/actions/TrezorConnectActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actions/TrezorConnectActions.js b/src/actions/TrezorConnectActions.js index 0b5ce5f2..e7d7315e 100644 --- a/src/actions/TrezorConnectActions.js +++ b/src/actions/TrezorConnectActions.js @@ -155,7 +155,7 @@ export const init = (): AsyncAction => async ( if (buildUtils.isDev()) { // eslint-disable-next-line window.__TREZOR_CONNECT_SRC = - typeof LOCAL === 'string' ? LOCAL : 'https://sisyfos.trezor.io/connect/'; // eslint-disable-line no-underscore-dangle + typeof LOCAL === 'string' ? LOCAL : 'https://sisyfos.trezor.io/connect-electron/'; // 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; } From 869c2ac302e066962736c9e9414947ebcc7cbcb0 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Tue, 26 Mar 2019 10:53:15 +0100 Subject: [PATCH 3/3] udpate IFRAME.LOADED action --- src/flowtype/index.js | 7 ------- src/reducers/TrezorConnectReducer.js | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/flowtype/index.js b/src/flowtype/index.js index 88445c32..be8638cf 100644 --- a/src/flowtype/index.js +++ b/src/flowtype/index.js @@ -119,15 +119,8 @@ type UiEventAction = { // }, }; -// TODO: join this message with uiMessage -type IFrameHandshake = { - type: 'iframe_handshake', - payload: any, -}; - export type Action = | RouterAction - | IFrameHandshake | TransportEventAction | DeviceEventAction | UiEventAction diff --git a/src/reducers/TrezorConnectReducer.js b/src/reducers/TrezorConnectReducer.js index 7d087f18..135a1dd4 100644 --- a/src/reducers/TrezorConnectReducer.js +++ b/src/reducers/TrezorConnectReducer.js @@ -1,5 +1,5 @@ /* @flow */ -import { TRANSPORT, UI } from 'trezor-connect'; +import { TRANSPORT, IFRAME } from 'trezor-connect'; import * as CONNECT from 'actions/constants/TrezorConnect'; import type { Action } from 'flowtype'; @@ -66,7 +66,7 @@ export default function connect(state: State = initialState, action: Action): St error: action.error, }; // trezor-connect iframe loaded - case UI.IFRAME_HANDSHAKE: + case IFRAME.LOADED: return { ...state, initialized: true,