poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix

This commit is contained in:
Victor Baranov 2020-02-29 11:11:39 +03:00
parent 3a964cbe23
commit 872952ecb7
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scripts/metamask-controller.js
View File

@ -161,7 +161,8 @@ module.exports = class MetamaskController extends EventEmitter {
})
// key mgmt
const additionalKeyrings = [TrezorKeyring, LedgerBridgeKeyring]
// const trezorKeyring = new TrezorKeyring({hdPath: `m/44'/137'/0'/0`})
const additionalKeyrings = [new TrezorKeyring({hdPath: `m/44'/137'/0'/0`}), LedgerBridgeKeyring]
this.keyringController = new KeyringController({
keyringTypes: additionalKeyrings,
initState: initState.KeyringController,

2
old-ui/app/components/connect-hardware/index.js
View File

@ -204,7 +204,7 @@ class ConnectHardwareForm extends Component {
return (
<AccountList
onPathChange={this.onPathChange}
selectedPath={this.props.defaultHdPaths[this.state.device]}
selectedPath={this._setHdPath(this.state.device)}
device={this.state.device}
accounts={this.state.accounts}
selectedAccount={this.state.selectedAccount}

12
old-ui/app/components/connect-hardware/util.js
View File

@ -38,13 +38,13 @@ function getHdPaths (network) {
return hdPaths
}
const hdRSKMainnetTrezorPath = `m/44’/137’/0’/0`
const hdRSKMainnetLedgerPath = `m/44’/137’/0’/0`
const hdRSKMainnetLedgerLivePath = `m/44’/137’/0’/0`
const hdRSKMainnetTrezorPath = `m/44'/137'/0'/0`
const hdRSKMainnetLedgerPath = `m/44'/137'/0'/0`
const hdRSKMainnetLedgerLivePath = `m/44'/137'/0'/0`
const hdRSKTestnetTrezorPath = `m/44’/37310’/0’/0`
const hdRSKTestnetLedgerPath = `m/44’/37310’/0’/0`
const hdRSKTestnetLedgerLivePath = `m/44’/37310’/0’/0`
const hdRSKTestnetTrezorPath = `m/44'/37310'/0'/0`
const hdRSKTestnetLedgerPath = `m/44'/37310'/0'/0`
const hdRSKTestnetLedgerLivePath = `m/44'/37310'/0'/0`
const hdETCTrezorPath = `m/44'/61'/0'/0`
const hdETCLedgerPath = `m/44'/61'/0'/0/0`

3
package-lock.json generated
View File

@ -50683,7 +50683,8 @@
},
"tree-kill": {
"version": "1.2.1",
"resolved": "",
"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
"dev": true
},
"trezor-connect": {