git.iko.soy/bridge
on master help sign in
Merge pull request #76 from urbit/trezor-fixes
da9327aFang
package.json+1−1
compare with master
unifiedsplit
@@ -42,7 +42,7 @@
42 "react-scripts": "^2.1.1",
42 "react-scripts": "^2.1.1",
43 "secp256k1": "^3.5.2",
43 "secp256k1": "^3.5.2",
44 "sigil-js": "github:urbit/sigil-js#f7f29c5",
44 "sigil-js": "github:urbit/sigil-js#f7f29c5",
45− "trezor-connect": "^6.0.3",
45+ "trezor-connect": "^7.0.1",
46 "urbit-key-generation": "0.12.1",
46 "urbit-key-generation": "0.12.1",
47 "urbit-ob": "^3.1.0",
47 "urbit-ob": "^3.1.0",
48 "web3": "1.0.0-beta.33"
48 "web3": "1.0.0-beta.33"
src/views/Trezor.js+4
@@ -31,6 +31,10 @@ class Trezor extends React.Component {
31 const { setWallet, setWalletHdPath } = this.props
31 const { setWallet, setWalletHdPath } = this.props
32 const { hdpath } = this.state
32 const { hdpath } = this.state
33
33
34+ TrezorConnect.manifest({
35+ email: 'bridge-trezor@urbit.org',
36+ appUrl: 'https://github.com/urbit/bridge'
37+ });
34 TrezorConnect.getPublicKey({ path: hdpath })
38 TrezorConnect.getPublicKey({ path: hdpath })
35 .then(info => {
39 .then(info => {
36 if (info.success === true) {
40 if (info.success === true) {
src/views/Wallet.js−6
@@ -91,12 +91,6 @@ class Wallet extends React.Component {
91
91
92 <DropdownItem
92 <DropdownItem
93 onClick={ () => this.selectClose(() => props.setWalletType(WALLET_NAMES.TREZOR)) }
93 onClick={ () => this.selectClose(() => props.setWalletType(WALLET_NAMES.TREZOR)) }
94− disabled={
95− props.web3.matchWith({
96− Nothing: () => true,
97− Just: () => false
98− })
99− }
100 >
94 >
101 { 'Trezor' }
95 { 'Trezor' }
102 </DropdownItem>
96 </DropdownItem>