arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-13 20:08:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'feature/connect-7.0.2-electron' into feature/trezor-ui-components

Browse Source
This commit is contained in:
slowbackspace 2019-03-28 10:44:05 +01:00
commit 52bb65d463
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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.10",
"wallet-address-validator": "^0.2.4",
"web3": "1.0.0-beta.35",

2
src/actions/TrezorConnectActions.js
View File

@ -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;
}

7
src/flowtype/index.js
View File

@ -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

4
src/reducers/TrezorConnectReducer.js
View File

@ -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,

8
yarn.lock
View File

@ -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"