Merge pull request #267 from poanetwork/develop

NW release 4.11.1

.circleci/config.yml

@@ -17,9 +17,9 @@ workflows:
     - test-lint:
         requires:
         - prep-deps-npm
-    - test-deps:
-        requires:
-        - prep-deps-npm
+    # - test-deps:
+    #     requires:
+    #     - prep-deps-npm
     - test-e2e-chrome:
         requires:
         - prep-deps-npm
@@ -100,7 +100,7 @@ jobs:
     - run:
         name: Install npm 6 + deps via npm
         command: |
-          sudo npm install -g npm@6.4.1 && npm install --no-save
+          sudo npm install -g npm@6.9.0 && npm install --no-save
     - save_cache:
         key: dependency-cache-{{ .Revision }}
         paths:
@@ -170,16 +170,16 @@ jobs:
         name: Test
         command: npm run lint
 
-  test-deps:
-    docker:
-    - image: circleci/node:8.12.0-browsers
-    steps:
-    - checkout
-    - restore_cache:
-        key: dependency-cache-{{ .Revision }}
-    - run:
-        name: Test
-        command: sudo npm install -g npm@6.4.1 && npm audit
+  # test-deps:
+  #   docker:
+  #   - image: circleci/node:8.12.0-browsers
+  #   steps:
+  #   - checkout
+  #   - restore_cache:
+  #       key: dependency-cache-{{ .Revision }}
+  #   - run:
+  #       name: Test
+  #       command: sudo npm install -g npm@6.4.1 && npm audit
 
   test-e2e-chrome:
     docker:

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Current Master
 
+## 4.11.1 Wed Mar 20 2019
+
+- [#266](https://github.com/poanetwork/nifty-wallet/pull/266): (Fix) Support of the latest trezor-connect version 7
+- [#263](https://github.com/poanetwork/nifty-wallet/pull/263): (Refactoring) Refine dropdown components
+
 ## 4.11.0 Fri Feb 08 2019
 
 ### Features

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "manifest_version": 2,
   "author": "POA Network",
   "description": "__MSG_appDescription__",

app/scripts/controllers/network/enums.js

@@ -35,6 +35,11 @@ const DROPDOWN_RINKEBY_DISPLAY_NAME = 'Rinkeby Test Net'
 const DROPDOWN_KOVAN_DISPLAY_NAME = 'Kovan Test Net'
 const DROPDOWN_GOERLI_TESTNET_DISPLAY_NAME = 'Görli Test Net'
 
+const chainTypes = {
+  TEST: 1,
+  PROD: 2,
+}
+
 module.exports = {
   POA,
   DAI,
@@ -69,4 +74,5 @@ module.exports = {
   DROPDOWN_RINKEBY_DISPLAY_NAME,
   DROPDOWN_KOVAN_DISPLAY_NAME,
   DROPDOWN_GOERLI_TESTNET_DISPLAY_NAME,
+  chainTypes,
 }

app/scripts/controllers/network/util.js

@@ -31,12 +31,15 @@ const {
   DROPDOWN_RINKEBY_DISPLAY_NAME,
   DROPDOWN_KOVAN_DISPLAY_NAME,
   DROPDOWN_GOERLI_TESTNET_DISPLAY_NAME,
+  chainTypes,
 } = require('./enums')
 
+const { TEST, PROD } = chainTypes
 const networks = {}
 
 const POA_OBJ = {
   order: 1,
+  chainType: PROD,
   providerName: POA,
   networkID: POA_CODE,
   displayName: POA_DISPLAY_NAME,
@@ -47,6 +50,7 @@ networks[POA] = POA_OBJ
 
 const DAI_OBJ = {
   order: 2,
+  chainType: PROD,
   providerName: DAI,
   networkID: DAI_CODE,
   displayName: DAI_DISPLAY_NAME,
@@ -57,6 +61,7 @@ networks[DAI] = DAI_OBJ
 
 const POA_SOKOL_OBJ = {
   order: 3,
+  chainType: TEST,
   providerName: POA_SOKOL,
   networkID: POA_SOKOL_CODE,
   displayName: POA_SOKOL_DISPLAY_NAME,
@@ -67,6 +72,7 @@ networks[POA_SOKOL] = POA_SOKOL_OBJ
 
 const MAINNET_OBJ = {
   order: 4,
+  chainType: PROD,
   providerName: MAINNET,
   networkID: MAINNET_CODE,
   displayName: MAINNET_DISPLAY_NAME,
@@ -77,6 +83,7 @@ networks[MAINNET] = MAINNET_OBJ
 
 const ROPSTEN_OBJ = {
   order: 5,
+  chainType: TEST,
   providerName: ROPSTEN,
   networkID: ROPSTEN_CODE,
   displayName: ROPSTEN_DISPLAY_NAME,
@@ -87,6 +94,7 @@ networks[ROPSTEN] = ROPSTEN_OBJ
 
 const KOVAN_OBJ = {
   order: 6,
+  chainType: TEST,
   providerName: KOVAN,
   networkID: KOVAN_CODE,
   displayName: KOVAN_DISPLAY_NAME,
@@ -97,6 +105,7 @@ networks[KOVAN] = KOVAN_OBJ
 
 const RINKEBY_OBJ = {
   order: 7,
+  chainType: TEST,
   providerName: RINKEBY,
   networkID: RINKEBY_CODE,
   displayName: RINKEBY_DISPLAY_NAME,

app/trezor-usb-permissions.html

@@ -28,6 +28,6 @@
     </style>
 </head>
 <body>
-    <iframe id="trezor-usb-permissions" src="https://connect.trezor.io/6/extension-permissions.html" allow="usb" frameborder="0" width="100%" height="100%"></iframe>
+    <iframe id="trezor-usb-permissions" src="https://connect.trezor.io/7/extension-permissions.html" allow="usb" frameborder="0" width="100%" height="100%"></iframe>
     <script type="text/javascript" src="./vendor/trezor/usb-permissions.js"></script>
 </body>

old-ui/app/account-detail.js

@@ -13,7 +13,7 @@ const ethUtil = require('ethereumjs-util')
 const EditableLabel = require('./components/editable-label')
 const TabBar = require('./components/tab-bar')
 const TokenList = require('./components/token-list')
-const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns
+const AccountDropdowns = require('./components/account-dropdowns/account-dropdowns.component').AccountDropdowns
 const CopyButton = require('./components/copy/copy-button')
 const ToastComponent = require('./components/toast')
 import { getMetaMaskAccounts } from '../../ui/app/selectors'

old-ui/app/app.js

@@ -35,7 +35,7 @@ const Import = require('./accounts/import')
 const ForgetDeviceScreen = require('./components/connect-hardware/forget-screen')
 import ConnectHardwareForm from './components/connect-hardware/index'
 const InfoScreen = require('./info')
-const AppBar = require('./components/app-bar')
+const AppBar = require('./components/app-bar/app-bar.component')
 const Loading = require('./components/loading')
 const BuyView = require('./components/buy-button-subview')
 const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete')