on master help sign in
Merge pull request #76 from urbit/trezor-fixes

Use latest Trezor Connect

commitda9327a4302a406b696d5be4035c49504c547e39 authorFang <Fang-@users.noreply.github.com> dateMon 18 Mar 2019, 19:00 (8 years ago) parentcc26d7d015e59b
3 files changed+5−7
package.json+1−1 src/views/Trezor.js+4 src/views/Wallet.js−6
package.json+1−1
@@ -42,7 +42,7 @@
4242 "react-scripts": "^2.1.1",
4343 "secp256k1": "^3.5.2",
4444 "sigil-js": "github:urbit/sigil-js#f7f29c5",
45− "trezor-connect": "^6.0.3",
45+ "trezor-connect": "^7.0.1",
4646 "urbit-key-generation": "0.12.1",
4747 "urbit-ob": "^3.1.0",
4848 "web3": "1.0.0-beta.33"
src/views/Trezor.js+4
@@ -31,6 +31,10 @@ class Trezor extends React.Component {
3131 const { setWallet, setWalletHdPath } = this.props
3232 const { hdpath } = this.state
3333
34+ TrezorConnect.manifest({
35+ email: 'bridge-trezor@urbit.org',
36+ appUrl: 'https://github.com/urbit/bridge'
37+ });
3438 TrezorConnect.getPublicKey({ path: hdpath })
3539 .then(info => {
3640 if (info.success === true) {
src/views/Wallet.js−6
@@ -91,12 +91,6 @@ class Wallet extends React.Component {
9191
9292 <DropdownItem
9393 onClick={ () => this.selectClose(() => props.setWalletType(WALLET_NAMES.TREZOR)) }
94− disabled={
95− props.web3.matchWith({
96− Nothing: () => true,
97− Just: () => false
98− })
99− }
10094 >
10195 { 'Trezor' }
10296 </DropdownItem>