merge master

.eslintrc

@@ -17,6 +17,7 @@
         "import/prefer-default-export": 0,
         "no-use-before-define": 0,
         "no-plusplus": 0,
+        "jest/no-disabled-tests": 0,
         "class-methods-use-this": 0,
         "react/require-default-props": 0,
         "react/forbid-prop-types": 0,

package.json

@@ -44,18 +44,18 @@
         "express": "^4.16.4",
         "friendly-errors-webpack-plugin": "^1.7.0",
         "git-revision-webpack-plugin": "^3.0.3",
-        "hdkey": "^0.8.0",
+        "hdkey": "^1.1.0",
         "history": "^4.7.2",
         "html-webpack-plugin": "^3.2.0",
-        "jest-fetch-mock": "^1.6.5",
+        "jest-fetch-mock": "^2.1.0",
         "morgan": "^1.9.1",
         "npm-run-all": "^4.1.5",
         "prop-types": "^15.6.2",
         "raf": "^3.4.1",
         "raven-js": "^3.27.0",
         "rc-tooltip": "^3.7.3",
-        "react": "^16.7.0",
+        "react": "^16.8.0",
-        "react-dom": "^16.7.0",
+        "react-dom": "^16.8.0",
         "react-hot-loader": "^4.6.5",
         "react-intl": "^2.8.0",
         "react-json-view": "^1.19.1",
@@ -80,11 +80,11 @@
         "trezor-bridge-communicator": "1.0.2",
         "trezor-connect": "7.0.0-beta.2",
         "wallet-address-validator": "^0.2.4",
-        "web3": "1.0.0-beta.35",
+        "web3": "1.0.0-beta.41",
         "webpack": "^4.29.1",
         "webpack-build-notifier": "^0.1.30",
         "webpack-bundle-analyzer": "^3.0.3",
-        "whatwg-fetch": "^2.0.4",
+        "whatwg-fetch": "^3.0.0",
         "yarn-run-all": "^3.1.1"
     },
     "devDependencies": {
@@ -131,7 +131,7 @@
         "trezor-translations-manager": "^1.0.3",
         "webpack-cli": "^3.2.3",
         "webpack-dev-server": "^3.1.14",
-        "yargs": "11.0.0"
+        "yargs": "12.0.5"
     },
     "optionalDependencies": {
         "fsevents": "1.2.7"

src/utils/__tests__/device.test.js

@@ -40,9 +40,9 @@ describe('device utils', () => {
 
     it('isWebUSB', () => {
         const data = [
-            { transport: { type: 'ParallelTransport', version: 'webusb' } },
+            { transport: { type: 'webusb', version: '1.6.0' } },
             { transport: { type: null, version: 'aaaaaa' } },
-            { transport: { type: 'ParallelTransport', version: 'webusb' } },
+            { transport: { type: 'webusb' } },
         ];
 
         data.forEach((item) => {

src/utils/device.js

@@ -79,7 +79,7 @@ export const getStatusName = (deviceStatus: string): string => {
     }
 };
 
-export const isWebUSB = (transport: Transport) => !!((transport.type && transport.version.indexOf('webusb') >= 0));
+export const isWebUSB = (transport: Transport) => !!((transport.type && transport.type === 'webusb'));
 
 export const isDisabled = (selectedDevice: TrezorDevice, devices: Array<TrezorDevice>, transport: Transport) => {
     if (isWebUSB(transport)) return false; // always enabled if webusb

src/views/Wallet/components/LeftNavigation/index.js

@@ -236,7 +236,7 @@ class LeftNavigation extends React.PureComponent<Props, State> {
                     isOpen={this.props.wallet.dropdownOpened}
                     icon={(
                         <React.Fragment>
-                            {showWalletType ? (
+                            {showWalletType && (
                                 <Tooltip
                                     content={walletTooltipMsg}
                                     maxWidth={200}
@@ -258,7 +258,7 @@ class LeftNavigation extends React.PureComponent<Props, State> {
                                         />
                                     </WalletTypeIconWrapper>
                                 </Tooltip>
-                            ) : null
+                            )
                             }
                             {this.props.devices.length > 1 && (
                                 <Tooltip

src/views/Wallet/views/Account/SignVerify/index.js

@@ -108,9 +108,9 @@ class SignVerify extends Component <Props> {
         const verifyAddressError = this.getError('verifyAddress');
         return (
             <Content>
-                <Title>Sign &amp; Verify</Title>
                 <Wrapper>
                     <Sign>
+                        <Title>Sign Message</Title>
                         <Row>
                             <Input
                                 topLabel="Address"
@@ -157,6 +157,7 @@ class SignVerify extends Component <Props> {
                         </RowButtons>
                     </Sign>
                     <Verify>
+                        <Title>Verify message</Title>
                         <Row>
                             <Input
                                 topLabel="Address"

test/integration/dashboard.spec.js

@@ -10,7 +10,7 @@ describe('Dashboard page', () => {
             .matchImageSnapshot();
     });
 
-    it('content', () => {
+    it.skip('content', () => {
         cy.getTestElement('Dashboard__page__content')
             .should('be.visible')
             .matchImageSnapshot();
@@ -18,7 +18,7 @@ describe('Dashboard page', () => {
 
     // Menu
 
-    it('device header', () => {
+    it.skip('device header', () => {
         cy.getTestElement('Main__page__device__header')
             .should('be.visible')
             .matchImageSnapshot();

test/support/index.js

@@ -1,3 +1,4 @@
+import '@babel/polyfill';
 import './commands';
 
 beforeEach(() => {