Merge pull request #299 from poanetwork/node-10-support

Node 10 support
poanetwork · Jul 2, 2019 · 1e60763 · 1e60763
2 parents c2a653b + 3d18e6b
commit 1e60763
Show file tree

Hide file tree

Showing 35 changed files with 10,681 additions and 14,247 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,10 +31,10 @@ workflows:
     - test-unit:
         requires:
         - prep-deps-npm
-    - test-integration-mascara-chrome:
-        requires:
-        - prep-deps-npm
-        - prep-scss
+    # - test-integration-mascara-chrome:
+    #     requires:
+    #     - prep-deps-npm
+    #     - prep-scss
     # - test-integration-mascara-firefox:
     #     requires:
     #     - prep-deps-npm
@@ -53,7 +53,7 @@ workflows:
         - test-unit
         - test-e2e-chrome
         # - test-e2e-firefox
-        - test-integration-mascara-chrome
+        # - test-integration-mascara-chrome
         # - test-integration-mascara-firefox
         - test-integration-flat-chrome
         - test-integration-flat-firefox
@@ -92,7 +92,7 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -108,7 +108,7 @@ jobs:
 
   prep-build:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -127,7 +127,7 @@ jobs:
 
   prep-docs:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -142,7 +142,7 @@ jobs:
 
   prep-scss:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -161,7 +161,7 @@ jobs:
 
   test-lint:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -172,7 +172,7 @@ jobs:
 
   # test-deps:
   #   docker:
-  #   - image: circleci/node:8.15.0-browsers
+  #   - image: circleci/node:10.16.0-browsers
   #   steps:
   #   - checkout
   #   - restore_cache:
@@ -183,7 +183,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -208,7 +208,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -229,7 +229,7 @@ jobs:
 
   test-e2e-beta-chrome:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -245,7 +245,7 @@ jobs:
 
   test-e2e-beta-firefox:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -266,7 +266,7 @@ jobs:
 
   job-screens:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -283,7 +283,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -310,7 +310,7 @@ jobs:
 
   job-publish-release:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -323,7 +323,7 @@ jobs:
 
   job-publish-postrelease:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -346,7 +346,7 @@ jobs:
 
   test-unit:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -359,7 +359,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -383,7 +383,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -402,7 +402,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -426,7 +426,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -443,7 +443,7 @@ jobs:
 
   all-tests-pass:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - run:
         name: All Tests Passed

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v8.15.0
+v10.16.0
diff --git a/old-ui/app/add-suggested-token.js b/old-ui/app/add-suggested-token.js
@@ -58,13 +58,16 @@ AddSuggestedTokenScreen.prototype.render = function () {
 
           h('div', [
             h(Tooltip, {
-              position: 'top',
               title: 'The contract of the actual token contract. Click for more info.',
+              position: 'top',
+              id: 'addSuggestedToken',
             }, [
               h('a', {
                 style: { fontWeight: 'bold', paddingRight: '10px'},
                 href: 'https://support.metamask.io/kb/article/24-what-is-a-token-contract-address',
                 target: '_blank',
+                'data-tip': '',
+                'data-for': 'addSuggestedToken',
               }, [
                 h('span', 'Token Contract Address  '),
                 h('i.fa.fa-question-circle'),

diff --git a/old-ui/app/app.js b/old-ui/app/app.js
@@ -27,9 +27,9 @@ const NoticeScreen = require('./components/notice')
 const generateLostAccountsNotice = require('../lib/lost-accounts-notice')
 // other views
 const ConfigScreen = require('./config')
-const AddTokenScreen = require('./components/add-token')
+import AddTokenScreen from './components/add-token'
 const ConfirmAddTokenScreen = require('./components/confirm-add-token')
-const RemoveTokenScreen = require('./remove-token')
+import RemoveTokenScreen from './remove-token'
 const AddSuggestedTokenScreen = require('./add-suggested-token')
 const Import = require('./accounts/import')
 const ForgetDeviceScreen = require('./components/connect-hardware/forget-screen')

diff --git a/old-ui/app/components/add-token/add-token.component.js b/old-ui/app/components/add-token/add-token.component.js
@@ -20,7 +20,7 @@ const CUSTOM_TOKEN_TAB = 'CUSTOM_TOKEN'
 
 const { POA_CODE, MAINNET_CODE } = require('../../../../app/scripts/controllers/network/enums')
 
-class AddTokenScreen extends Component {
+export default class AddTokenScreen extends Component {
 
   static contextTypes = {
     t: PropTypes.func,
@@ -175,11 +175,14 @@ class AddTokenScreen extends Component {
 
         h('div', [
           h(Tooltip, {
-            position: 'top',
             title: 'The contract of the actual token contract.',
+            position: 'top',
+            id: 'addToken',
           }, [
             h('span', {
               style: { fontWeight: 'bold'},
+              'data-tip': '',
+              'data-for': 'addToken',
             }, 'Token Address' /* this.context.t('tokenAddress')*/),
           ]),
         ]),
@@ -556,5 +559,3 @@ class AddTokenScreen extends Component {
     return validDecimals
   }
 }
-
-module.exports = AddTokenScreen
diff --git a/old-ui/app/components/add-token/add-token.container.js b/old-ui/app/components/add-token/add-token.container.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import AddToken from './add-token.component'
+import AddTokenScreen from './add-token.component'
 
 const { setPendingTokens, clearPendingTokens, displayWarning, goHome, addToken, showConfirmAddTokensPage } = require('../../../../ui/app/actions')
 
@@ -26,4 +26,4 @@ const mapDispatchToProps = dispatch => {
 }
 
 
-export default connect(mapStateToProps, mapDispatchToProps)(AddToken)
+export default connect(mapStateToProps, mapDispatchToProps)(AddTokenScreen)
diff --git a/old-ui/app/components/add-token/token-list/token-list.component.js b/old-ui/app/components/add-token/token-list/token-list.component.js
@@ -42,7 +42,10 @@ export default class InfoBox extends Component {
                       'token-list__token--disabled': tokenAlreadyAdded,
                     })}
                     onClick={() => !tokenAlreadyAdded && onToggleToken(results[i])}
-                    key={key || 'tokenRow'}>
+                    key={key || 'tokenRow'}
+                    data-tip=""
+                    data-for={`addToken{key}`}
+                    >
                       <div
                         className="token-list__token-icon"
                         style={{
@@ -60,8 +63,9 @@ export default class InfoBox extends Component {
                       position="top"
                       title={title}
                       key={i}
+                      id={`addToken{i}`}
                     >
-                      {tokenRow()}
+                      {tokenRow(i)}
                     </Tooltip> : tokenRow(i)
                   )
                 })

diff --git a/old-ui/app/components/balance.js b/old-ui/app/components/balance.js