Update new HD PAth

8 files changed, 16 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a4d602d..318ec489 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Develop Branch
 
+## 1.3.2 Fri Apr 19 2019
+
 ## 1.3.1 Wed Apr 17 2019
 
 ## 1.3.0 Sat Apr 06 2019
diff --git a/app/manifest.json b/app/manifest.json
index f8f9c692..4976b56e 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "manifest_version": 2,
   "author": "https://dexon.org",
   "description": "__MSG_appDescription__",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 8054f678..03ff7769 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -49,8 +49,8 @@ const GWEI_BN = new BN('1000000000')
 const percentile = require('percentile')
 const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
 const log = require('loglevel')
-const TrezorKeyring = require('eth-trezor-keyring')
-const LedgerBridgeKeyring = require('eth-ledger-bridge-keyring')
+const TrezorKeyring = require('@dexon-foundation/eth-trezor-keyring')
+const LedgerBridgeKeyring = require('@dexon-foundation/eth-ledger-bridge-keyring')
 const HW_WALLETS_KEYRINGS = [TrezorKeyring.type, LedgerBridgeKeyring.type]
 const EthQuery = require('eth-query')
 const ethUtil = require('ethereumjs-util')
diff --git a/development/states/navigate-txs.json b/development/states/navigate-txs.json
index d8b8dc67..28f9695e 100644
--- a/development/states/navigate-txs.json
+++ b/development/states/navigate-txs.json
@@ -272,8 +272,8 @@
     "gasIsLoading": false,
     "networkNonce": "0x92",
     "defaultHdPaths": {
-      "trezor": "m/44'/60'/0'/0",
-      "ledger": "m/44'/60'/0'/0/0"
+      "trezor": "m/44'/237'/0'/0",
+      "ledger": "m/44'/237'/0'/0/0"
     }
   },
   "localeMessages": {},
diff --git a/package.json b/package.json
index 91a44ca8..5d269b15 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,8 @@
     "@dexon-foundation/dekusan-inpage-provider": "^1.2.3",
     "@dexon-foundation/dexon-keyring-controller": "^4.0.0",
     "@dexon-foundation/eth-json-rpc-filters": "^3.0.1",
+    "@dexon-foundation/eth-ledger-bridge-keyring": "^0.2.0",
+    "@dexon-foundation/eth-trezor-keyring": "^0.4.0",
     "@dexon-foundation/jazzicon": "^2.0.0",
     "@material-ui/core": "^3.1.0",
     "@zxing/library": "^0.8.0",
@@ -122,11 +124,9 @@
     "eth-hd-keyring": "^1.2.2",
     "eth-json-rpc-infura": "^3.0.0",
     "eth-keyring-controller": "^3.3.1",
-    "eth-ledger-bridge-keyring": "^0.1.1",
     "eth-method-registry": "^1.0.0",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
-    "eth-trezor-keyring": "^0.2.0",
     "eth-sig-util": "^2.0.2",
     "eth-token-tracker": "^1.1.5",
     "ethereumjs-abi": "^0.6.4",
diff --git a/test/unit/ui/app/reducers/app.spec.js b/test/unit/ui/app/reducers/app.spec.js
index d8e964a6..b927aca5 100644
--- a/test/unit/ui/app/reducers/app.spec.js
+++ b/test/unit/ui/app/reducers/app.spec.js
@@ -665,14 +665,14 @@ describe('App State', () => {
 
   it('sets hardware wallet default hd path', () => {
     const hdPaths = {
-      trezor: "m/44'/60'/0'/0",
-      ledger: "m/44'/60'/0'",
+      trezor: "m/44'/237'/0'/0",
+      ledger: "m/44'/237'/0'/0",
     }
     const state = reduceApp(metamaskState, {
       type: actions.SET_HARDWARE_WALLET_DEFAULT_HD_PATH,
       value: {
         device: 'ledger',
-        path: "m/44'/60'/0'",
+        path: "m/44'/237'/0'/0",
       },
     })
 
diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index 2408c371..aafa3f72 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -409,7 +409,7 @@
   }
 
   &__item:nth-of-type(even) {
-    background-color: $geyser;
+    background-color: white;
   }
 
   &__item:nth-of-type(odd) {
@@ -469,8 +469,8 @@
     background: #fff;
     height: 19px;
     display: flex;
-    color: $dexon-purple;
-    background-color: $dark-gray;
+    color: black;
+    background-color: white;
     font-size: 14px;
     line-height: 19px;
     border: none;
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 307ef31c..b2674788 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -74,7 +74,7 @@ function reduceApp (state, action) {
     networkNonce: null,
     defaultHdPaths: {
       trezor: `m/44'/237'/0'/0`,
-      ledger: `m/44'/237'/0'/0/0`,
+      ledger: `m/44'/237'/0'/0`,
     },
   }, state.appState)