Merge branch 'master' into fix/intl-losing-local-state

5 years ago · 7d609c741f
parent cd7a6b7ba1 fe146e9cc1
commit 7d609c741f
12 changed files with 73 additions and 70 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -3,6 +3,7 @@ build
 coverage
 cache/**
 node_modules
 scripts/solidity/**
 src/flowtype/npm
 scripts/solidity/.*
 **/_old/*
--- a/.prettierignore
+++ b/.prettierignore
@ -2,6 +2,7 @@ public
 build
 coverage
 cache/**
 scripts/solidity/**
 node_modules
 src/flowtype/npm
 scripts/solidity/.*
--- a/babel.config.js
+++ b/babel.config.js
@ -1,4 +1,4 @@
-module.exports = (api) => {
+module.exports = api => {
    // api.cache.forever();
    const presets = [
@ -27,13 +27,9 @@ module.exports = (api) => {
        [
            'module-resolver',
            {
-                root: [
+                root: ['./src'],
                    './src',
                ],
                alias: {
-                    public: [
+                    public: ['./public'],
                        './public',
                    ],
                },
            },
        ],
@ -45,19 +41,17 @@ module.exports = (api) => {
    }
    if (api.env('translations')) {
-        plugins.push(
+        plugins.push([
-            [
+            'react-intl',
-                'react-intl',
+            {
-                {
+                messagesDir: './translations/extractedMessages/',
-                    messagesDir: './translations/extractedMessages/',
+                extractSourceLocation: true,
-                    extractSourceLocation: true,
+            },
-                },
+        ]);
            ],
        );
    }
    return {
        presets,
        plugins,
    };
-};
+};
--- a/jest.config.js
+++ b/jest.config.js
@ -11,10 +11,7 @@ module.exports = {
        'utils/promiseUtils.js',
        'utils/networkUtils.js',
    ],
-    collectCoverageFrom: [
+    collectCoverageFrom: ['utils/**.js', 'reducers/utils/**.js'],
        'utils/**.js',
        'reducers/utils/**.js',
    ],
    // coverageThreshold: {
    //     global: {
    //         branches: 100,
@ -23,9 +20,7 @@ module.exports = {
    //         statements: 100,
    //     },
    // },
-    setupFiles: [
+    setupFiles: ['./support/setupJest.js'],
        './support/setupJest.js',
    ],
    transform: {
        '^.+\\.jsx?$': 'babel-jest',
    },
--- a/package.json
+++ b/package.json
@ -19,7 +19,7 @@
        "translations:download": "yarn ttm build-translations && sleep 1 && yarn ttm export-translations",
        "flow": "flow check src",
        "lint": "run-s lint:*",
-        "lint:js": "npx eslint ./src ./webpack",
+        "lint:js": "npx eslint .",
        "lint:css": "npx stylelint './src/**/*.js'",
        "lint-fix": "npx eslint ./src ./webpack --fix",
        "test": "run-s test:*",
--- a/server/index.js
+++ b/server/index.js
@ -19,7 +19,11 @@ const app = express();
 const PORT = process.env.PORT || 8080;
 // Setup logger
-app.use(morgan(':remote-addr - :remote-user [:date[clf]] ":method :url HTTP/:http-version" :status :res[content-length] :response-time ms'));
+app.use(
    morgan(
        ':remote-addr - :remote-user [:date[clf]] ":method :url HTTP/:http-version" :status :res[content-length] :response-time ms'
    )
 );
 // Serve static assets
 app.use(express.static(path.resolve(__dirname, '..', 'build', commander.buildType)));
--- a/src/index.html
+++ b/src/index.html
@ -1,38 +1,48 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
-<head>
+    <head>
-    <meta charset="UTF-8" />
+        <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+        <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <title>Trezor Wallet</title>
+        <title>Trezor Wallet</title>
-    <meta name="title" content="Trezor Wallet" />
+        <meta name="title" content="Trezor Wallet" />
-    <meta name="description" content="Trezor Wallet" />
+        <meta name="description" content="Trezor Wallet" />
-    <meta name="keywords" content="trezor wallet" />
+        <meta name="keywords" content="trezor wallet" />
-    <meta name="author" content="SatoshiLabs s.r.o." />
+        <meta name="author" content="SatoshiLabs s.r.o." />
-    <meta name="google" value="notranslate" />
+        <meta name="google" value="notranslate" />
-    <link media="all" rel="stylesheet" href="./fonts/fonts.css" />
+        <link media="all" rel="stylesheet" href="./fonts/fonts.css" />
-    <!--[if lt IE 8]>
+        <!--[if lt IE 8]>
-        <link media="all" rel="stylesheet" href="./unsupported-browsers/style.css" />
+            <link media="all" rel="stylesheet" href="./unsupported-browsers/style.css" />
-    <![endif]-->
+        <![endif]-->
-</head>
+    </head>
-<body>
+    <body>
-    <!--[if lt IE 8]>
+        <!--[if lt IE 8]>
-    <div class="unsupported-browsers">
+            <div class="unsupported-browsers">
-        <div class="header"></div>
+                <div class="header"></div>
-        <h1>Your browser is not supported</h1>
+                <h1>Your browser is not supported</h1>
-        <p>Please choose one of the supported browsers</p>
+                <p>Please choose one of the supported browsers</p>
-        <div class="main">
+                <div class="main">
-            <div class="box left">
+                    <div class="box left">
-                <img src="./unsupported-browsers/browser-chrome.png">
+                        <img src="./unsupported-browsers/browser-chrome.png" />
-                <a href="https://www.google.com/chrome/" target="_blank" rel="noreferrer noopener">Get Chrome</a>
+                        <a
                            href="https://www.google.com/chrome/"
                            target="_blank"
                            rel="noreferrer noopener"
                            >Get Chrome</a
                        >
                    </div>
                    <div class="box right">
                        <img src="./unsupported-browsers/browser-firefox.png" />
                        <a
                            href="https://www.mozilla.org/en-US/firefox/new/"
                            target="_blank"
                            rel="noreferrer noopener"
                            >Get Firefox</a
                        >
                    </div>
                </div>
            </div>
-            <div class="box right">
+        <![endif]-->
-                <img src="./unsupported-browsers/browser-firefox.png">
+        <div id="trezor-wallet-root"></div>
-                <a href="https://www.mozilla.org/en-US/firefox/new/" target="_blank" rel="noreferrer noopener">Get Firefox</a>
+    </body>
            </div>
        </div>
    </div>
    <![endif]-->
    <div id="trezor-wallet-root"></div>
 </body>
 </html>
--- a/src/views/Wallet/index.js
+++ b/src/views/Wallet/index.js
@ -110,7 +110,7 @@ const Body = styled.div`
 `;
 const Wallet = (props: Props) => (
-    <AppWrapper>
+    <AppWrapper lang={props.wallet.language}>
        <Header
            sidebarEnabled={!!props.wallet.selectedDevice}
            sidebarOpened={props.wallet.showSidebar}
--- a/test/integration/dashboard.spec.js
+++ b/test/integration/dashboard.spec.js
@ -23,4 +23,4 @@ describe('Dashboard page', () => {
            .should('be.visible')
            .matchImageSnapshot();
    });
-});
+});
--- a/test/plugins/index.js
+++ b/test/plugins/index.js
@ -1,7 +1,5 @@
-const {
+const { addMatchImageSnapshotPlugin } = require('cypress-image-snapshot/plugin');
    addMatchImageSnapshotPlugin,
 } = require('cypress-image-snapshot/plugin');
-module.exports = (on) => {
+module.exports = on => {
    addMatchImageSnapshotPlugin(on);
-};
+};
--- a/test/scripts/init-device.js
+++ b/test/scripts/init-device.js
@ -3,4 +3,4 @@ import { initSeedAllDevice } from 'trezor-bridge-communicator';
 (async () => {
    await initSeedAllDevice();
-})();
+})();
--- a/test/support/index.js
+++ b/test/support/index.js
@ -3,4 +3,4 @@ import './commands';
 beforeEach(() => {
    window.localStorage.setItem('/betaModalPrivacy', true);
-});
+});