From 872952ecb7df26de6a7bd1d93ac266281b6e1578 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Sat, 29 Feb 2020 11:11:39 +0300
Subject: [PATCH] Fix

---
 app/scripts/metamask-controller.js              |  3 ++-
 old-ui/app/components/connect-hardware/index.js |  2 +-
 old-ui/app/components/connect-hardware/util.js  | 12 ++++++------
 package-lock.json                               |  3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bc89f9f41..ed78bd6a9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -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,
diff --git a/old-ui/app/components/connect-hardware/index.js b/old-ui/app/components/connect-hardware/index.js
index acac90afc..8b1b3f8bc 100644
--- a/old-ui/app/components/connect-hardware/index.js
+++ b/old-ui/app/components/connect-hardware/index.js
@@ -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}
diff --git a/old-ui/app/components/connect-hardware/util.js b/old-ui/app/components/connect-hardware/util.js
index b97d7fb0e..3583d77fb 100644
--- a/old-ui/app/components/connect-hardware/util.js
+++ b/old-ui/app/components/connect-hardware/util.js
@@ -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`
diff --git a/package-lock.json b/package-lock.json
index 65dc38e95..74a55ffc5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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": {