From 32b428809c70dbd52786b0aea4ec1529110dc25f Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 15:33:23 +0200
Subject: [PATCH 001/103] h2 refactored to component

---
 .stylelintrc                                  |  10 +
 package.json                                  |   4 +
 src/js/components/common/Heading.js           |  25 +-
 src/js/components/common/Log.js               |   3 +-
 src/js/components/common/Notification.js      |   6 +-
 src/js/components/landing/ConnectDevice.js    |   8 +-
 src/js/components/landing/LandingPage.js      |   3 +-
 .../account/send/PendingTransactions.js       |   3 +-
 .../wallet/account/send/SendForm.js           |   3 +-
 .../wallet/account/sign/SignVerify.js         |   8 +-
 .../wallet/account/summary/Summary.js         |   5 +-
 src/js/components/wallet/pages/Bootloader.js  |   4 +-
 src/js/components/wallet/pages/Dashboard.js   |   6 +-
 .../components/wallet/pages/DeviceSettings.js |   6 +-
 src/js/components/wallet/pages/Initialize.js  |   5 +-
 src/styles/acquire.less                       |   9 -
 yarn.lock                                     | 790 +++++++++++++++++-
 17 files changed, 830 insertions(+), 68 deletions(-)
 create mode 100644 .stylelintrc

diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 00000000..aadcf1e1
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,10 @@
+{
+    "processors": [
+        "stylelint-processor-styled-components"
+    ],
+    "extends": [
+        "stylelint-config-standard",
+        "stylelint-config-styled-components"
+    ],
+    "syntax": "scss"
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 25730063..28a43a7e 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,10 @@
         "jest": "^23.4.2",
         "less": "^3.0.1",
         "less-loader": "4.1.0",
+        "stylelint": "^9.4.0",
+        "stylelint-config-standard": "^18.2.0",
+        "stylelint-config-styled-components": "^0.1.1",
+        "stylelint-processor-styled-components": "^1.3.2",
         "webpack-cli": "^2.1.3",
         "webpack-dev-server": "^3.1.4",
         "yargs": "11.0.0"
diff --git a/src/js/components/common/Heading.js b/src/js/components/common/Heading.js
index 9db6fb9f..88ffb4aa 100644
--- a/src/js/components/common/Heading.js
+++ b/src/js/components/common/Heading.js
@@ -1,5 +1,3 @@
-// @flow
-
 import styled, { css } from 'styled-components';
 import colors from '~/js/config/colors';
 
@@ -11,30 +9,33 @@ const baseStyles = css`
 `;
 
 const H1 = styled.h1`
-  ${baseStyles}
-  font-size: 16px;
+    ${baseStyles}
+    font-size: 18px;
 `;
 
 const H2 = styled.h2`
-  ${baseStyles};
-  font-size: 14px;
+    ${baseStyles};
+    font-size: 16px;
+
+    ${props => props.claim && css`
+        font-size: 36px;
+        padding-bottom: 24px;
+    `}
 `;
 
 const H3 = styled.h3`
   ${baseStyles};
-  font-size: 12px;
+  font-size: 14px;
 `;
 
 const H4 = styled.h4`
   ${baseStyles};
-  font-size: 10px;
+  font-size: 12px;
 `;
 
-const Heading = {
+export {
     H1,
     H2,
     H3,
     H4,
-};
-
-module.exports = Heading;
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/js/components/common/Log.js b/src/js/components/common/Log.js
index e0b8ef2d..d104ee32 100644
--- a/src/js/components/common/Log.js
+++ b/src/js/components/common/Log.js
@@ -4,6 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
+import { H2 } from '~/js/components/common/Heading';
 
 import * as LogActions from '~/js/actions/LogActions';
 import type { State, Dispatch } from '~/flowtype';
@@ -25,7 +26,7 @@ const Log = (props: Props): ?React$Element<string> => {
     return (
         <div className="log">
             <button className="log-close transparent" onClick={props.toggle} />
-            <h2>Log</h2>
+            <H2>Log</H2>
             <p>Attention: The log contains your XPUBs. Anyone with your XPUBs can see your account history.</p>
             <textarea value={JSON.stringify(props.log.entries)} readOnly />
         </div>
diff --git a/src/js/components/common/Notification.js b/src/js/components/common/Notification.js
index ab02f555..9722dd66 100644
--- a/src/js/components/common/Notification.js
+++ b/src/js/components/common/Notification.js
@@ -2,6 +2,7 @@
 
 
 import React from 'react';
+import { H2 } from '~/js/components/common/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
@@ -42,7 +43,7 @@ export const Notification = (props: NProps): React$Element<string> => {
                 />
             ) : null }
             <div className="notification-body">
-                <h2>{ props.title }</h2>
+                <H2>{ props.title }</H2>
                 { props.message ? (<p dangerouslySetInnerHTML={{ __html: props.message }} />) : null }
             </div>
             { props.actions && props.actions.length > 0 ? (
@@ -53,7 +54,8 @@ export const Notification = (props: NProps): React$Element<string> => {
             { props.loading ? (
                 <Loader
                     className="info"
-                    size="50" />
+                    size="50"
+                />
             ) : null }
 
         </div>
diff --git a/src/js/components/landing/ConnectDevice.js b/src/js/components/landing/ConnectDevice.js
index 2baf3f8a..8d9afefb 100644
--- a/src/js/components/landing/ConnectDevice.js
+++ b/src/js/components/landing/ConnectDevice.js
@@ -1,8 +1,8 @@
 /* @flow */
 
-
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
+import { H2 } from '~/js/components/common/Heading';
 
 import type { State, TrezorDevice } from '~/flowtype';
 
@@ -15,7 +15,7 @@ const DisconnectDevice = (props: Props) => {
     if (!props.disconnectRequest) return null;
     return (
         <main>
-            <h2 className="claim">The private bank in your hands.</h2>
+            <H2 claim>The private bank in your hands.</H2>
             <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
             <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
             <div className="row">
@@ -32,7 +32,7 @@ const DisconnectDevice = (props: Props) => {
 
 const ConnectHIDDevice = (props: Props) => (
     <main>
-        <h2 className="claim">The private bank in your hands.</h2>
+        <H2 claim>The private bank in your hands.</H2>
         <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
         <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
         <div className="row">
@@ -70,7 +70,7 @@ class ConnectWebUsbDevice extends Component<Props> {
     render() {
         return (
             <main>
-                <h2 className="claim">The private bank in your hands.</h2>
+                <H2 claim>The private bank in your hands.</H2>
                 <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
                 <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
                 <div className="row webusb">
diff --git a/src/js/components/landing/LandingPage.js b/src/js/components/landing/LandingPage.js
index 9062c513..3ae8c115 100644
--- a/src/js/components/landing/LandingPage.js
+++ b/src/js/components/landing/LandingPage.js
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import Preloader from './Preloader';
+import { H2 } from '~/js/components/common/Heading';
 import ConnectDevice from './ConnectDevice';
 import InstallBridge from './InstallBridge';
 import LocalStorageError from './LocalStorageError';
@@ -16,7 +17,7 @@ import type { Props } from './index';
 
 const BrowserNotSupported = (props: {}): React$Element<string> => (
     <main>
-        <h2>Your browser is not supported</h2>
+        <H2>Your browser is not supported</H2>
         <p>Please choose one of the supported browsers</p>
         <div className="row">
             <div className="chrome">
diff --git a/src/js/components/wallet/account/send/PendingTransactions.js b/src/js/components/wallet/account/send/PendingTransactions.js
index b12d3457..c04ea709 100644
--- a/src/js/components/wallet/account/send/PendingTransactions.js
+++ b/src/js/components/wallet/account/send/PendingTransactions.js
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import ColorHash from 'color-hash';
+import { H2 } from '~/js/components/common/Heading';
 import ScaleText from 'react-scale-text';
 
 import { findAccountTokens } from '~/js/reducers/TokensReducer';
@@ -85,7 +86,7 @@ const PendingTransactions = (props: Props) => {
 
     return (
         <div className="pending-transactions">
-            <h2>Pending transactions</h2>
+            <H2>Pending transactions</H2>
             { pendingTxs }
         </div>
     );
diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
index 83ecdff3..d321c011 100644
--- a/src/js/components/wallet/account/send/SendForm.js
+++ b/src/js/components/wallet/account/send/SendForm.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-
 import React, { Component } from 'react';
 import Select from 'react-select';
 import AdvancedForm from './AdvancedForm';
@@ -117,7 +116,7 @@ const Send = (props: Props) => {
 
     return (
         <section className="send-form">
-            <h2>Send Ethereum or tokens</h2>
+            <H2>Send Ethereum or tokens</H2>
             <div className="row address-input">
                 <label>Address</label>
                 <input
diff --git a/src/js/components/wallet/account/sign/SignVerify.js b/src/js/components/wallet/account/sign/SignVerify.js
index 839a146a..1c7dcb41 100644
--- a/src/js/components/wallet/account/sign/SignVerify.js
+++ b/src/js/components/wallet/account/sign/SignVerify.js
@@ -1,14 +1,12 @@
-/* @flow */
-
-
 import React from 'react';
+import { H2 } from '~/js/components/common/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 const SignVerify = () => (
     <section className="signverify">
         <div className="sign">
-            <h2>Sign message</h2>
+            <H2>Sign message</H2>
             <label>Message</label>
             <textarea rows="4" maxLength="255" />
             <label>Address</label>
@@ -17,7 +15,7 @@ const SignVerify = () => (
             <textarea rows="4" maxLength="255" readOnly="readonly" />
         </div>
         <div className="verify">
-            <h2>Verify message</h2>
+            <H2>Verify message</H2>
             <label>Message</label>
             <textarea rows="4" maxLength="255" />
             <label>Address</label>
diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
index aebeb640..655d98ec 100644
--- a/src/js/components/wallet/account/summary/Summary.js
+++ b/src/js/components/wallet/account/summary/Summary.js
@@ -2,6 +2,7 @@
 
 
 import React, { Component } from 'react';
+import { H2 } from '~/js/components/common/Heading';
 import BigNumber from 'bignumber.js';
 import { Async as AsyncSelect } from 'react-select';
 import Tooltip from 'rc-tooltip';
@@ -55,7 +56,7 @@ const Summary = (props: Props) => {
                 onToggle={props.onDetailsToggle}
             />
 
-            <h2>
+            <H2>
                 Tokens
                 <Tooltip
                     arrowContent={<div className="rc-tooltip-arrow-inner" />}
@@ -64,7 +65,7 @@ const Summary = (props: Props) => {
                 >
                     <span className="what-is-it" />
                 </Tooltip>
-            </h2>
+            </H2>
             {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 Lahod */}
             {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 T01 */}
             <div className="filter">
diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/components/wallet/pages/Bootloader.js
index b591fec4..ab62488e 100644
--- a/src/js/components/wallet/pages/Bootloader.js
+++ b/src/js/components/wallet/pages/Bootloader.js
@@ -1,14 +1,14 @@
 /* @flow */
 
-
 import React from 'react';
+import { H2 } from '~/js/components/common/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 const Bootloader = () => (
     <section className="device-settings">
         <div className="row">
-            <h2>Your device is in firmware update mode</h2>
+            <H2>Your device is in firmware update mode</H2>
             <p>Please re-connect it</p>
         </div>
     </section>
diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/components/wallet/pages/Dashboard.js
index 08132ac6..9b744ad6 100644
--- a/src/js/components/wallet/pages/Dashboard.js
+++ b/src/js/components/wallet/pages/Dashboard.js
@@ -2,15 +2,15 @@
 
 
 import React from 'react';
-import { bindActionCreators } from 'redux';
+import { H2 } from '~/js/components/common/Heading';
 import { connect } from 'react-redux';
 import DashboardImg from '~/images/dashboard.png';
 
 const Dashboard = () => (
     <section className="dashboard">
-        <h2>Dashboard</h2>
+        <H2>Dashboard</H2>
         <div className="row">
-            <h2>Please select your coin</h2>
+            <H2>Please select your coin</H2>
             <p>You will gain access to recieving &amp; sending selected coin</p>
             <img src={DashboardImg} height="34" width="auto" alt="Dashboard" />
         </div>
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index b1c87c95..e2ed8fdf 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -1,14 +1,12 @@
-/* @flow */
-
-
 import React from 'react';
+import { H2 } from '~/js/components/common/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 export const DeviceSettings = () => (
     <section className="device-settings">
         <div className="row">
-            <h2>Device settings is under construction</h2>
+            <H2>Device settings is under construction</H2>
             <p>Please use Bitcoin wallet interface to change your device settings</p>
             <a className="button" href="https://wallet.trezor.io/">Take me to the Bitcoin wallet</a>
         </div>
diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/components/wallet/pages/Initialize.js
index dd512890..d3ba5502 100644
--- a/src/js/components/wallet/pages/Initialize.js
+++ b/src/js/components/wallet/pages/Initialize.js
@@ -1,6 +1,5 @@
 /* @flow */
-
-
+import { H2 } from '~/js/components/common/Heading';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -8,7 +7,7 @@ import { connect } from 'react-redux';
 const Initialize = () => (
     <section className="device-settings">
         <div className="row">
-            <h2>Your device is in not initialized</h2>
+            <H2>Your device is in not initialized</H2>
             <p>Please use Bitcoin wallet interface to start initialization process</p>
             <a className="button" href="https://wallet.trezor.io/">Take me to the Bitcoin wallet</a>
         </div>
diff --git a/src/styles/acquire.less b/src/styles/acquire.less
index 93eb6b3f..39db34ee 100644
--- a/src/styles/acquire.less
+++ b/src/styles/acquire.less
@@ -38,13 +38,4 @@
         }
 
     }
-
-    // h2 {
-    //     line-height: 74px;
-    //     padding-left: 50px;
-    // }
-
-    // p {
-    //     padding-left: 50px;
-    // }
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index f638cbff..2bb4b2e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,6 +8,12 @@
   dependencies:
     "@babel/highlight" "7.0.0-beta.44"
 
+"@babel/code-frame@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-rc.1.tgz#5c2154415d6c09959a71845ef519d11157e95d10"
+  dependencies:
+    "@babel/highlight" "7.0.0-rc.1"
+
 "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0-beta.55"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.55.tgz#71f530e7b010af5eb7a7df7752f78921dd57e9ee"
@@ -24,6 +30,16 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-rc.1.tgz#739c87d70b31aeed802bd6bc9fd51480065c45e8"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-annotate-as-pure@^7.0.0-beta.37":
   version "7.0.0-beta.55"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.55.tgz#3c3e4c00e14e7dea917938e35ed5d9156cdd35ce"
@@ -38,18 +54,38 @@
     "@babel/template" "7.0.0-beta.44"
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-function-name@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-rc.1.tgz#20b2cc836a53c669f297c8d309fc553385c5cdde"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-get-function-arity@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-get-function-arity@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-rc.1.tgz#60185957f72ed73766ce74c836ac574921743c46"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-split-export-declaration@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-split-export-declaration@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-rc.1.tgz#b00323834343fd0210f1f46c7a53521ad53efa5e"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/highlight@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
@@ -66,6 +102,18 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/highlight@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-rc.1.tgz#e0ca4731fa4786f7b9500421d6ff5e5a7753e81e"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/parser@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-rc.1.tgz#d009a9bba8175d7b971e30cd03535b278c44082d"
+
 "@babel/template@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
@@ -75,6 +123,15 @@
     babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
+"@babel/template@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-rc.1.tgz#5f9c0a481c9f22ecdb84697b3c3a34eadeeca23c"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/traverse@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
@@ -90,6 +147,20 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
+"@babel/traverse@^7.0.0-beta.40":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-rc.1.tgz#867b4b45ada2d51ae2d0076f1c1d5880f8557158"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/generator" "7.0.0-rc.1"
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/helper-split-export-declaration" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
 "@babel/types@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
@@ -106,6 +177,14 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@babel/types@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-rc.1.tgz#6abf6d14ddd9fc022617e5b62e6b32f4fa6526ad"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -330,6 +409,10 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
+ajv-keywords@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+
 ajv-keywords@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
@@ -350,6 +433,15 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.0.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.1"
+
 ajv@^6.1.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
@@ -511,6 +603,10 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
+array-iterate@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.2.tgz#f66a57e84426f8097f4197fbb6c051b8e5cdf7d8"
+
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
@@ -634,6 +730,17 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
+autoprefixer@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.0.tgz#566a70d1148046b96b31efa08090f1999ffb6d8c"
+  dependencies:
+    browserslist "^4.0.1"
+    caniuse-lite "^1.0.30000872"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.2"
+    postcss-value-parser "^3.2.3"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -1479,10 +1586,14 @@ babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
-babylon@^7.0.0-beta.30:
+babylon@^7.0.0-beta.30, babylon@^7.0.0-beta.40:
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80"
 
+bail@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3"
+
 balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1719,6 +1830,14 @@ browserslist@^2.1.2:
     caniuse-lite "^1.0.30000770"
     electron-to-chromium "^1.3.27"
 
+browserslist@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.1.tgz#61c05ce2a5843c7d96166408bc23d58b5416e818"
+  dependencies:
+    caniuse-lite "^1.0.30000865"
+    electron-to-chromium "^1.3.52"
+    node-releases "^1.0.0-alpha.10"
+
 bs58@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d"
@@ -1844,6 +1963,14 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  dependencies:
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
+
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
@@ -1873,6 +2000,10 @@ caniuse-lite@^1.0.30000770:
   version "1.0.30000770"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000770.tgz#bc8e7f50b073273390db6ab357378909a14e9bdb"
 
+caniuse-lite@^1.0.30000865, caniuse-lite@^1.0.30000872:
+  version "1.0.30000874"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz#a641b1f1c420d58d9b132920ef6ba87bbdcd2223"
+
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -1883,6 +2014,10 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+ccount@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -1904,7 +2039,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -1936,6 +2071,22 @@ chalk@~0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
+character-entities-html4@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz#c44fdde3ce66b52e8d321d6c1bf46101f0150610"
+
+character-entities-legacy@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz#7c6defb81648498222c9855309953d05f4d63a9c"
+
+character-entities@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz#58c8f371c0774ef0ba9b2aca5f00d8f100e6e363"
+
+character-reference-invalid@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz#21e421ad3d84055952dab4a43a04e73cd425d3ed"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -2095,6 +2246,13 @@ clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
 
+clone-regexp@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.1.tgz#051805cd33173375d82118fc0918606da39fd60f"
+  dependencies:
+    is-regexp "^1.0.0"
+    is-supported-regexp-flag "^1.0.0"
+
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -2150,6 +2308,10 @@ coinstring@^2.0.0:
     bs58 "^2.0.1"
     create-hash "^1.1.1"
 
+collapse-white-space@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.4.tgz#ce05cf49e54c3277ae573036a26851ba430a0091"
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2376,6 +2538,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cosmiconfig@^5.0.0:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -2642,13 +2812,20 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
+debug@^3.0.0, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -2868,7 +3045,7 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domelementtype@1:
+domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2888,6 +3065,12 @@ domhandler@2.1:
   dependencies:
     domelementtype "1"
 
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  dependencies:
+    domelementtype "1"
+
 domutils@1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
@@ -2901,6 +3084,19 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+dot-prop@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  dependencies:
+    is-obj "^1.0.0"
+
 drbg.js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b"
@@ -2948,6 +3144,10 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27:
   version "1.3.27"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
 
+electron-to-chromium@^1.3.52:
+  version "1.3.57"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.57.tgz#61b2446f16af26fb8873210007a7637ad644c82d"
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -3004,7 +3204,7 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.4.0"
     tapable "^1.0.0"
 
-entities@~1.1.1:
+entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
@@ -3396,6 +3596,12 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
+  dependencies:
+    clone-regexp "^1.0.0"
+
 exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -3493,14 +3699,14 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.0, extend@~3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+
 extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-extend@~3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-
 external-editor@^2.0.4, external-editor@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
@@ -3536,6 +3742,10 @@ fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+
 fast-glob@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.2.tgz#71723338ac9b4e0e2fff1d6748a2a13d5ed352bf"
@@ -3873,6 +4083,10 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4019,6 +4233,16 @@ globby@^8.0.0, globby@^8.0.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+
+gonzales-pe@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2"
+  dependencies:
+    minimist "1.1.x"
+
 got@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
@@ -4312,6 +4536,10 @@ html-minifier@^3.2.3:
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
+html-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
+
 html-webpack-plugin@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
@@ -4324,6 +4552,17 @@ html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
+htmlparser2@^3.9.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
 htmlparser2@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
@@ -4433,10 +4672,18 @@ ignore@^3.3.5:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
+ignore@^4.0.0:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.5.tgz#333535a20325ba4852c4ddb135d47392aa035e6d"
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
 
+import-lazy@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc"
+
 import-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
@@ -4579,6 +4826,21 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-alphabetical@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz#1fa6e49213cb7885b75d15862fb3f3d96c884f41"
+
+is-alphanumeric@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4"
+
+is-alphanumerical@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz#1138e9ae5040158dc6ff76b820acd6b7a181fd40"
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4589,7 +4851,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.4, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -4625,6 +4887,10 @@ is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-decimal@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz#894662d6a8709d307f3a276ca4339c8fa5dff0ff"
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -4641,6 +4907,10 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -4711,6 +4981,10 @@ is-hex-prefixed@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"
 
+is-hexadecimal@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz#b6e710d7d07bb66b98cb8cece5c9b4921deeb835"
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4727,6 +5001,10 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
@@ -4787,6 +5065,10 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -4805,6 +5087,10 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-supported-regexp-flag@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca"
+
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
@@ -4823,10 +5109,18 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-whitespace-character@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz#ede53b4c6f6fb3874533751ec9280d01928d03ed"
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
+is-word-character@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz#46a5dac3f2a1840898b91e576cd40d493f3ae553"
+
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
@@ -5243,7 +5537,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.7.0, js-yaml@^3.9.1:
+js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -5356,6 +5650,10 @@ json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
 
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -5444,6 +5742,10 @@ kleur@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.1.tgz#7cc64b0d188d0dcbc98bdcdfdda2cc10619ddce8"
 
+known-css-properties@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.6.1.tgz#31b5123ad03d8d1a3f36bd4155459c981173478b"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -5652,7 +5954,7 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
-log-symbols@^2.1.0, log-symbols@^2.2.0:
+log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
@@ -5684,6 +5986,10 @@ long@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
 
+longest-streak@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -5754,6 +6060,10 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
@@ -5764,10 +6074,22 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+markdown-escapes@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz#e639cbde7b99c841c0bacc8a07982873b46d2122"
+
+markdown-table@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
+
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
+mathml-tag-names@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -5775,6 +6097,13 @@ md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+mdast-util-compact@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz#cdb5f84e2b6a2d3114df33bd05d9cb32e3c4083a"
+  dependencies:
+    unist-util-modify-children "^1.0.0"
+    unist-util-visit "^1.1.0"
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -5831,6 +6160,20 @@ meow@^3.3.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
+meow@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+    yargs-parser "^10.0.0"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -5964,10 +6307,21 @@ minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
+minimist@1.1.x:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+
 minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
@@ -6206,6 +6560,12 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+node-releases@^1.0.0-alpha.10:
+  version "1.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.10.tgz#61c8d5f9b5b2e05d84eba941d05b6f5202f68a2a"
+  dependencies:
+    semver "^5.3.0"
+
 nomnom@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
@@ -6239,6 +6599,10 @@ normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
+normalize-selector@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
@@ -6562,6 +6926,17 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-entities@^1.0.2, parse-entities@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.2.tgz#9eaf719b29dc3bd62246b4332009072e01527777"
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -6799,6 +7174,29 @@ postcss-filter-plugins@^2.0.0:
     postcss "^5.0.4"
     uniqid "^4.0.0"
 
+postcss-html@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.31.0.tgz#ea6ae2e95df60a03032e9ab5aba72143d8ca0325"
+  dependencies:
+    htmlparser2 "^3.9.2"
+
+postcss-less@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-2.0.0.tgz#5d190b8e057ca446d60fe2e2587ad791c9029fb8"
+  dependencies:
+    postcss "^5.2.16"
+
+postcss-markdown@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.31.0.tgz#e4c699ad34b14a29ad5d47132bb1b3100b60ef75"
+  dependencies:
+    remark "^9.0.0"
+    unist-util-find-all-after "^1.0.2"
+
+postcss-media-query-parser@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
@@ -6930,6 +7328,38 @@ postcss-reduce-transforms@^1.0.3:
     postcss "^5.0.8"
     postcss-value-parser "^3.0.1"
 
+postcss-reporter@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3"
+  dependencies:
+    chalk "^2.0.1"
+    lodash "^4.17.4"
+    log-symbols "^2.0.0"
+    postcss "^6.0.8"
+
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+
+postcss-safe-parser@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz#8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-sass@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.2.tgz#17f3074cecb28128b156f1a4407c6ad075d7e00c"
+  dependencies:
+    gonzales-pe "4.2.3"
+    postcss "6.0.22"
+
+postcss-scss@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
+  dependencies:
+    postcss "^7.0.0"
+
 postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
@@ -6938,6 +7368,18 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
+  dependencies:
+    dot-prop "^4.1.1"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-styled@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.31.0.tgz#ab532a2b3c469dfcca306a7623c4d4a98bb077d5"
+
 postcss-svgo@^2.1.1:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
@@ -6947,6 +7389,10 @@ postcss-svgo@^2.1.1:
     postcss-value-parser "^3.2.3"
     svgo "^0.7.0"
 
+postcss-syntax@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.31.0.tgz#13d955c705d339595d10a19efa4a1bee82dfb78f"
+
 postcss-unique-selectors@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
@@ -6967,6 +7413,14 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
+postcss@6.0.22:
+  version "6.0.22"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
@@ -6984,6 +7438,22 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^4.4.0"
 
+postcss@^6.0.14, postcss@^6.0.8:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+postcss@^7.0.0, postcss@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.2.tgz#7b5a109de356804e27f95a960bef0e4d5bc9bb18"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -7199,6 +7669,10 @@ querystringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
 
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+
 raf@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
@@ -7584,6 +8058,13 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -7688,6 +8169,53 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
+remark-parse@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
+  dependencies:
+    collapse-white-space "^1.0.2"
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    is-word-character "^1.0.0"
+    markdown-escapes "^1.0.0"
+    parse-entities "^1.1.0"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    trim "0.0.1"
+    trim-trailing-lines "^1.0.0"
+    unherit "^1.0.4"
+    unist-util-remove-position "^1.0.0"
+    vfile-location "^2.0.0"
+    xtend "^4.0.1"
+
+remark-stringify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
+  dependencies:
+    ccount "^1.0.0"
+    is-alphanumeric "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    longest-streak "^2.0.1"
+    markdown-escapes "^1.0.0"
+    markdown-table "^1.1.0"
+    mdast-util-compact "^1.0.0"
+    parse-entities "^1.0.2"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    stringify-entities "^1.0.1"
+    unherit "^1.0.4"
+    xtend "^4.0.1"
+
+remark@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
+  dependencies:
+    remark-parse "^5.0.0"
+    remark-stringify "^5.0.0"
+    unified "^6.0.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -7706,7 +8234,7 @@ repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -7720,7 +8248,7 @@ replace-ext@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
 
-replace-ext@^1.0.0:
+replace-ext@1.0.0, replace-ext@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
 
@@ -7830,6 +8358,10 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
@@ -8327,6 +8859,10 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
+specificity@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.0.tgz#301b1ab5455987c37d6d94f8c956ef9d9fb48c1d"
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -8367,6 +8903,10 @@ stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
+state-toggle@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -8476,6 +9016,15 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^1.0.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz#a98417e5471fd227b3e45d3db1861c11caf668f7"
+  dependencies:
+    character-entities-html4 "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -8529,10 +9078,18 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+
 styled-components@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686"
@@ -8548,6 +9105,77 @@ styled-components@^3.3.3:
     stylis-rule-sheet "^0.0.10"
     supports-color "^3.2.3"
 
+stylelint-config-recommended@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858"
+
+stylelint-config-standard@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-18.2.0.tgz#6283149aba7f64f18731aef8f0abfb35cf619e06"
+  dependencies:
+    stylelint-config-recommended "^2.1.0"
+
+stylelint-config-styled-components@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz#b408388d7c687833ab4be4c4e6522d97d2827ede"
+
+stylelint-processor-styled-components@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.3.2.tgz#092cf8fb064b31c6d0d3bedf0c4844349e1e8f0f"
+  dependencies:
+    "@babel/traverse" "^7.0.0-beta.40"
+    babylon "^7.0.0-beta.40"
+    postcss "^6.0.14"
+
+stylelint@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.4.0.tgz#2f2b82ae9db53a06735ae0724f41b134fdb84a10"
+  dependencies:
+    autoprefixer "^9.0.0"
+    balanced-match "^1.0.0"
+    chalk "^2.4.1"
+    cosmiconfig "^5.0.0"
+    debug "^3.0.0"
+    execall "^1.0.0"
+    file-entry-cache "^2.0.0"
+    get-stdin "^6.0.0"
+    globby "^8.0.0"
+    globjoin "^0.1.4"
+    html-tags "^2.0.0"
+    ignore "^4.0.0"
+    import-lazy "^3.1.0"
+    imurmurhash "^0.1.4"
+    known-css-properties "^0.6.0"
+    lodash "^4.17.4"
+    log-symbols "^2.0.0"
+    mathml-tag-names "^2.0.1"
+    meow "^5.0.0"
+    micromatch "^2.3.11"
+    normalize-selector "^0.2.0"
+    pify "^3.0.0"
+    postcss "^7.0.0"
+    postcss-html "^0.31.0"
+    postcss-less "^2.0.0"
+    postcss-markdown "^0.31.0"
+    postcss-media-query-parser "^0.2.3"
+    postcss-reporter "^5.0.0"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-safe-parser "^4.0.0"
+    postcss-sass "^0.3.0"
+    postcss-scss "^2.0.0"
+    postcss-selector-parser "^3.1.0"
+    postcss-styled "^0.31.0"
+    postcss-syntax "^0.31.0"
+    postcss-value-parser "^3.3.0"
+    resolve-from "^4.0.0"
+    signal-exit "^3.0.2"
+    specificity "^0.4.0"
+    string-width "^2.1.0"
+    style-search "^0.1.0"
+    sugarss "^1.0.0"
+    svg-tags "^1.0.0"
+    table "^4.0.1"
+
 stylis-rule-sheet@^0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
@@ -8556,6 +9184,12 @@ stylis@^3.0.0, stylis@^3.5.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546"
 
+sugarss@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
+  dependencies:
+    postcss "^6.0.14"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -8572,7 +9206,7 @@ supports-color@^4.0.0, supports-color@^4.4.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0:
+supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
@@ -8584,6 +9218,10 @@ supports-color@^5.2.0:
   dependencies:
     has-flag "^3.0.0"
 
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -8623,6 +9261,17 @@ table@4.0.2:
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
+table@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+  dependencies:
+    ajv "^6.0.1"
+    ajv-keywords "^3.0.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
 tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
@@ -8800,10 +9449,26 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+trim-trailing-lines@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz#e0ec0810fd3c3f1730516b45f49083caaf2774d9"
+
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+
+trough@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz#e29bd1614c6458d44869fc28b255ab7857ef7c24"
+
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -8902,6 +9567,24 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+unherit@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz#132748da3e88eab767e08fabfbb89c5e9d28628c"
+  dependencies:
+    inherits "^2.0.1"
+    xtend "^4.0.1"
+
+unified@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^1.1.0"
+    trough "^1.0.0"
+    vfile "^2.0.0"
+    x-is-string "^0.1.0"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -8937,6 +9620,44 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+unist-util-find-all-after@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz#9be49cfbae5ca1566b27536670a92836bf2f8d6d"
+  dependencies:
+    unist-util-is "^2.0.0"
+
+unist-util-is@^2.0.0, unist-util-is@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz#1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db"
+
+unist-util-modify-children@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz#c7f1b91712554ee59c47a05b551ed3e052a4e2d1"
+  dependencies:
+    array-iterate "^1.0.0"
+
+unist-util-remove-position@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz#86b5dad104d0bbfbeb1db5f5c92f3570575c12cb"
+  dependencies:
+    unist-util-visit "^1.1.0"
+
+unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
+
+unist-util-visit-parents@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz#63fffc8929027bee04bfef7d2cce474f71cb6217"
+  dependencies:
+    unist-util-is "^2.1.2"
+
+unist-util-visit@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.0.tgz#1cb763647186dc26f5e1df5db6bd1e48b3cc2fb1"
+  dependencies:
+    unist-util-visit-parents "^2.0.0"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -8960,6 +9681,12 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+uri-js@^4.2.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  dependencies:
+    punycode "^2.1.0"
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -9092,6 +9819,25 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vfile-location@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.3.tgz#083ba80e50968e8d420be49dd1ea9a992131df77"
+
+vfile-message@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.1.tgz#51a2ccd8a6b97a7980bb34efb9ebde9632e93677"
+  dependencies:
+    unist-util-stringify-position "^1.1.1"
+
+vfile@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
+  dependencies:
+    is-buffer "^1.1.4"
+    replace-ext "1.0.0"
+    unist-util-stringify-position "^1.0.0"
+    vfile-message "^1.0.0"
+
 vinyl-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
@@ -9433,6 +10179,10 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
+x-is-string@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
+
 xhr2@*:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
@@ -9445,7 +10195,7 @@ xmlhttprequest@*:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
-xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -9465,6 +10215,12 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
+yargs-parser@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"

From a591c5ea8fcac423879a4df96ad8a76df0a978a7 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 15:36:44 +0200
Subject: [PATCH 002/103] colors unified

---
 src/js/components/common/Header.js  | 10 ++++----
 src/js/components/common/Heading.js |  2 +-
 src/js/config/colors.js             | 40 ++++++++++++++---------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 3d984198..d6d47c78 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -6,10 +6,10 @@ import colors from '~/js/config/colors';
 const Wrapper = styled.header`
     width: 100%;
     height: 52px;
-    background: ${colors.color_header};
+    background: ${colors.HEADER};
 
     svg {
-         fill: ${colors.color_white};
+         fill: ${colors.WHITE};
          height: 28px;         
          width: 100px;
          flex: 1;
@@ -27,11 +27,11 @@ const LayoutWrapper = styled.div`
 `;
 
 const A = styled.a`
-    color: ${colors.color_white};
+    color: ${colors.WHITE};
     margin-left: 24px;
 
     &:visited {
-        color: ${colors.color_white};
+        color: ${colors.WHITE};
         margin-left: 24px;
     }
 
@@ -41,7 +41,7 @@ const A = styled.a`
 
     &:hover,
     &:active {
-        color: ${colors.color_text_secondary};
+        color: ${colors.TEXT_SECONDARY};
     }
 `;
 
diff --git a/src/js/components/common/Heading.js b/src/js/components/common/Heading.js
index 88ffb4aa..610e17bd 100644
--- a/src/js/components/common/Heading.js
+++ b/src/js/components/common/Heading.js
@@ -4,7 +4,7 @@ import colors from '~/js/config/colors';
 const baseStyles = css`
     -webkit-font-smoothing: antialiased;
     text-rendering: optimizeLegibility;
-    color: ${colors.black};
+    color: ${colors.BLACK};
     font-weight: bold;
 `;
 
diff --git a/src/js/config/colors.js b/src/js/config/colors.js
index 67da0cff..4ec40050 100644
--- a/src/js/config/colors.js
+++ b/src/js/config/colors.js
@@ -1,30 +1,30 @@
 export default {
-    color_white: '#ffffff',
+    WHITE: '#FFFFFF',
 
-    color_header: '#212121',
-    color_body: '#E3E3E3',
-    color_main: '#FBFBFB',
-    color_landing: '#F9F9F9',
+    HEADER: '#212121',
+    BODY: '#E3E3E3',
+    MAIN: '#FBFBFB',
+    LANDING: '#F9F9F9',
 
-    color_text_primary: '#494949',
-    color_text_secondary: '#757575',
+    TEXT_PRIMARY: '#494949',
+    TEXT_SECONDARY: '#757575',
 
-    color_gray_light: '#F2F2F2', // hover menu
-    color_divider: '#E3E3E3', //#EBEBEB,
+    GRAY_LIGHT: '#F2F2F2',
+    DIVIDER: '#E3E3E3',
 
-    color_green_primary: '#01B757',
-    color_green_secondary: '#00AB51',
-    color_green_tertiary: '#009546',
+    GREEN_PRIMARY: '#01B757',
+    GREEN_SECONDARY: '#00AB51',
+    GREEN_TERTIARY: '#009546',
 
-    color_info_primary: '#1E7FF0',
-    color_info_secondary: '#E1EFFF',
+    INFO_PRIMARY: '#1E7FF0',
+    INFO_SECONDARY: '#E1EFFF',
 
-    color_warning_primary: '#EB8A00',
-    color_warning_secondary: '#FFEFD9',
+    WARNING_PRIMARY: '#EB8A00',
+    WARNING_SECONDARY: '#FFEFD9',
 
-    color_success_primary: '#01B757',
-    color_success_secondary: '#DFFFEE',
+    SUCCESS_PRIMARY: '#01B757',
+    SUCCESS_SECONDARY: '#DFFFEE',
 
-    color_error_primary: '#ED1212',
-    color_error_secondary: '#FFE9E9',
+    ERROR_PRIMARY: '#ED1212',
+    ERROR_SECONDARY: '#FFE9E9',
 };
\ No newline at end of file

From b7e5dba3d08a538032ede8798f0eab4786bccd07 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 16:01:12 +0200
Subject: [PATCH 003/103] Sign and verify migrated to styled components

---
 .../wallet/account/sign/SignVerify.js         | 83 ++++++++++++++-----
 src/js/config/colors.js                       |  2 +
 src/styles/index.less                         |  1 -
 src/styles/signverify.less                    | 36 --------
 4 files changed, 62 insertions(+), 60 deletions(-)
 delete mode 100644 src/styles/signverify.less

diff --git a/src/js/components/wallet/account/sign/SignVerify.js b/src/js/components/wallet/account/sign/SignVerify.js
index 1c7dcb41..20a9b4b5 100644
--- a/src/js/components/wallet/account/sign/SignVerify.js
+++ b/src/js/components/wallet/account/sign/SignVerify.js
@@ -1,29 +1,66 @@
 import React from 'react';
+import styled from 'styled-components';
+
 import { H2 } from '~/js/components/common/Heading';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
+import colors from '~/js/config/colors';
+
+const Wrapper = styled.div`
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    background: ${colors.WHITE};
+    padding: 50px;
+`;
+
+const StyledH2 = styled(H2)`
+    padding-bottom: 10px;
+`;
+
+const Column = styled.div`
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+`;
+
+const Sign = styled(Column)``;
+
+const Verify = styled(Column)`
+    padding-left: 20px;
+`;
+
+const Label = styled.div`
+    color: ${colors.LABEL};
+    padding: 5px 0px;
+`;
+
+const Textarea = styled.textarea`
+    resize: vertical;
+    width: 100%;
+`;
+
+const Input = styled.input``;
 
 const SignVerify = () => (
-    <section className="signverify">
-        <div className="sign">
-            <H2>Sign message</H2>
-            <label>Message</label>
-            <textarea rows="4" maxLength="255" />
-            <label>Address</label>
-            <input type="text" />
-            <label>Signature</label>
-            <textarea rows="4" maxLength="255" readOnly="readonly" />
-        </div>
-        <div className="verify">
-            <H2>Verify message</H2>
-            <label>Message</label>
-            <textarea rows="4" maxLength="255" />
-            <label>Address</label>
-            <input type="text" />
-            <label>Signature</label>
-            <textarea rows="4" maxLength="255" />
-        </div>
-    </section>
+    <Wrapper>
+        <Sign>
+            <StyledH2>Sign message</StyledH2>
+            <Label>Message</Label>
+            <Textarea rows="4" maxLength="255" />
+            <Label>Address</Label>
+            <Input type="text" />
+            <Label>Signature</Label>
+            <Textarea rows="4" maxLength="255" readOnly="readonly" />
+        </Sign>
+        <Verify>
+            <StyledH2>Verify message</StyledH2>
+            <Label>Message</Label>
+            <Textarea rows="4" maxLength="255" />
+            <Label>Address</Label>
+            <Input type="text" />
+            <Label>Signature</Label>
+            <Textarea rows="4" maxLength="255" />
+        </Verify>
+    </Wrapper>
 );
 
-export default connect(null, null)(SignVerify);
\ No newline at end of file
+export default SignVerify;
\ No newline at end of file
diff --git a/src/js/config/colors.js b/src/js/config/colors.js
index 4ec40050..e3ab71a3 100644
--- a/src/js/config/colors.js
+++ b/src/js/config/colors.js
@@ -27,4 +27,6 @@ export default {
 
     ERROR_PRIMARY: '#ED1212',
     ERROR_SECONDARY: '#FFE9E9',
+
+    LABEL_COLOR: '#A9A9A9',
 };
\ No newline at end of file
diff --git a/src/styles/index.less b/src/styles/index.less
index 2b44b544..0e0f8c7f 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -16,7 +16,6 @@
 @import './send.less';
 @import './receive.less';
 @import './summary.less';
-@import './signverify.less';
 @import './deviceSettings.less';
 
 @import './landingPage.less';
diff --git a/src/styles/signverify.less b/src/styles/signverify.less
deleted file mode 100644
index 356da153..00000000
--- a/src/styles/signverify.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.signverify {
-    flex: 1;
-    display: flex;
-    flex-direction: row;
-    background: @color_white;
-
-    h2 {
-        line-height: 74px;
-    }
-
-    .sign,
-    .verify {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        padding-left: 50px;
-
-        textarea {
-            resize: vertical;
-            width: 100%;
-        }
-
-        // textarea[readonly] {
-        //     background: #A9A9A9;
-        // }
-    }
-
-    label {
-        color: #A9A9A9;
-        padding: 5px 0px;
-    }
-
-    .verify {
-        padding-right: 20px;
-    }
-}
\ No newline at end of file

From d8995cbb49afe04ae7c5169b3ec123fe210b0f7d Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 16:03:28 +0200
Subject: [PATCH 004/103] Add missing import

---
 src/js/components/wallet/account/send/SendForm.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
index d321c011..b78b49a5 100644
--- a/src/js/components/wallet/account/send/SendForm.js
+++ b/src/js/components/wallet/account/send/SendForm.js
@@ -2,6 +2,7 @@
 
 import React, { Component } from 'react';
 import Select from 'react-select';
+import { H2 } from '~/js/components/common/Heading';
 import AdvancedForm from './AdvancedForm';
 import PendingTransactions from './PendingTransactions';
 import { FeeSelectValue, FeeSelectOption } from './FeeSelect';

From 1ab5e9c8ab1ba1b73ee8783b623c9a5e6940d0e8 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 16:44:36 +0200
Subject: [PATCH 005/103] Footer rewrited and used react prop types instead of
 flow

---
 src/js/components/common/Footer.js | 56 +++++++++++++++++++-----------
 src/styles/footer.less             | 22 ------------
 src/styles/index.less              |  1 -
 3 files changed, 35 insertions(+), 44 deletions(-)
 delete mode 100644 src/styles/footer.less

diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js
index b61f2003..162e1c93 100644
--- a/src/js/components/common/Footer.js
+++ b/src/js/components/common/Footer.js
@@ -1,31 +1,45 @@
-/* @flow */
-
-
+import styled from 'styled-components';
+import PropTypes from 'prop-types';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
+import colors from '~/js/config/colors';
 import * as LogActions from '~/js/actions/LogActions';
-import type { State, Dispatch } from '~/flowtype';
 
-type Props = {
-    toggle: typeof LogActions.toggle
-}
+const Wrapper = styled.div`
+    width: 100%;
+    font-size: 12px;
+    color: ${colors.TEXT_SECONDARY};
+    padding: 22px 48px;
+    border-top: 1px solid ${colors.DIVIDER};
+    display: flex;
+`;
 
-const Footer = (props: Props): React$Element<string> => (
-    <footer>
-        <span>© 2018</span>
-        <a href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" className="satoshi green">SatoshiLabs</a>
-        <a href="tos.pdf" target="_blank" rel="noreferrer noopener" className="green">Terms</a>
-        <a onClick={props.toggle} className="green">Show Log</a>
-    </footer>
+const A = styled.a`
+    margin: 0px 6px;
+    margin-right: 20px;
+`;
+
+const Copy = styled.div`
+    margin-right: 20px;
+`;
+
+const Footer = ({ toggle }) => (
+    <Wrapper>
+        <Copy>© 2018</Copy>
+        <A href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" className="satoshi green">SatoshiLabs</A>
+        <A href="tos.pdf" target="_blank" rel="noreferrer noopener" className="green">Terms</A>
+        <A onClick={toggle} className="green">Show Log</A>
+    </Wrapper>
 );
 
-export default connect(
-    (state: State) => ({
+Footer.propTypes = {
+    toggle: PropTypes.func.isRequired,
+};
 
-    }),
-    (dispatch: Dispatch) => ({
-        toggle: bindActionCreators(LogActions.toggle, dispatch),
-    }),
-)(Footer);
+const mapDispatchToProps = dispatch => ({
+    toggle: bindActionCreators(LogActions.toggle, dispatch),
+});
+
+export default connect(null, mapDispatchToProps)(Footer);
diff --git a/src/styles/footer.less b/src/styles/footer.less
deleted file mode 100644
index 2cb033b8..00000000
--- a/src/styles/footer.less
+++ /dev/null
@@ -1,22 +0,0 @@
-footer {
-    width: 100%;
-    font-size: 12px;
-    color: @color_text_secondary;
-    padding: 22px 48px;
-    border-top: 1px solid @color_divider;
-    display: flex;
-
-    span, a {
-        white-space: nowrap;
-    }
-
-    span {
-        margin-right: 10px;
-    }
-
-    a {
-        margin: 0px 6px;
-        font-weight: 500;
-        margin-right: 20px;
-    }
-}
diff --git a/src/styles/index.less b/src/styles/index.less
index 0e0f8c7f..80aeb0e8 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -5,7 +5,6 @@
 @import './header.less';
 @import './aside.less';
 @import './content.less';
-@import './footer.less';
 @import './modal.less';
 
 @import './reactSelect.less';

From eac49bd78d15587d1b99a2421fb926444e895ff9 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 17:18:22 +0200
Subject: [PATCH 006/103] Fixed hot loader and year in footer

---
 .babelrc                           |  1 +
 package.json                       |  3 +-
 src/js/components/common/Footer.js |  3 +-
 src/js/index.js                    |  9 ++----
 src/js/router/index.js             | 10 +++---
 src/js/services/WalletService.js   |  5 ---
 webpack/config.dev.babel.js        |  2 +-
 webpack/config.dev.local.babel.js  | 52 ++++++++++++++----------------
 yarn.lock                          |  8 ++---
 9 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/.babelrc b/.babelrc
index 16b8d93a..8194dcfa 100644
--- a/.babelrc
+++ b/.babelrc
@@ -7,6 +7,7 @@
         "react"
     ],
     "plugins": [
+        "react-hot-loader/babel",
         "transform-class-properties",
         "transform-object-rest-spread",
         "transform-flow-strip-types",
diff --git a/package.json b/package.json
index 28a43a7e..40ee7e19 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
         "babel-core": "^6.26.3",
         "color-hash": "^1.0.3",
         "copy-webpack-plugin": "^4.5.2",
+        "date-fns": "^1.29.0",
         "ethereumjs-tx": "^1.3.3",
         "ethereumjs-units": "^0.2.0",
         "ethereumjs-util": "^5.1.4",
@@ -41,7 +42,7 @@
         "react": "^16.2.0",
         "react-css-transition": "^0.7.4",
         "react-dom": "^16.2.0",
-        "react-hot-loader": "4.2.0",
+        "react-hot-loader": "^4.3.4",
         "react-qr-svg": "^2.1.0",
         "react-redux": "^5.0.7",
         "react-router-dom": "^4.2.2",
diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js
index 162e1c93..28e09aae 100644
--- a/src/js/components/common/Footer.js
+++ b/src/js/components/common/Footer.js
@@ -1,6 +1,7 @@
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import React from 'react';
+import { getYear } from 'date-fns';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
@@ -27,7 +28,7 @@ const Copy = styled.div`
 
 const Footer = ({ toggle }) => (
     <Wrapper>
-        <Copy>© 2018</Copy>
+        <Copy>© {getYear(new Date())}</Copy>
         <A href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" className="satoshi green">SatoshiLabs</A>
         <A href="tos.pdf" target="_blank" rel="noreferrer noopener" className="green">Terms</A>
         <A onClick={toggle} className="green">Show Log</A>
diff --git a/src/js/index.js b/src/js/index.js
index 83fb3211..ec0ac5c4 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2,22 +2,17 @@
 import React from 'react';
 import { render } from 'react-dom';
 import store from './store';
-import router from './router';
+import App from './router';
 import { onBeforeUnload } from './actions/WalletActions';
 import styles from '~/styles/index.less';
 
 const root: ?HTMLElement = document.getElementById('root');
 if (root) {
-    render(router, root);
+    render(<App />, root);
 }
 
 window.onbeforeunload = () => {
     store.dispatch(onBeforeUnload());
 };
 
-if (typeof module !== undefined && module.hasOwnProperty('hot')) {
-    // $FlowIssue
-    module.hot.accept();
-}
-
 // Application life cycle starts in ./services/WalletService.js
\ No newline at end of file
diff --git a/src/js/router/index.js b/src/js/router/index.js
index 42391876..68ad389c 100644
--- a/src/js/router/index.js
+++ b/src/js/router/index.js
@@ -1,7 +1,5 @@
-/* @flow */
-
-
 import React from 'react';
+import { hot } from 'react-hot-loader';
 import { Route, Switch } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
@@ -22,7 +20,7 @@ import SignVerifyContainer from '../components/wallet/account/sign/SignVerify';
 import DeviceSettingsContainer from '../components/wallet/pages/DeviceSettings';
 import WalletSettingsContainer from '../components/wallet/pages/WalletSettings';
 
-export default (
+const App = () => (
     <Provider store={store}>
         <ConnectedRouter history={history}>
             <Switch>
@@ -49,4 +47,6 @@ export default (
             </Switch>
         </ConnectedRouter>
     </Provider>
-);
\ No newline at end of file
+);
+
+export default hot(module)(App);
\ No newline at end of file
diff --git a/src/js/services/WalletService.js b/src/js/services/WalletService.js
index 284eb049..7c08c0a7 100644
--- a/src/js/services/WalletService.js
+++ b/src/js/services/WalletService.js
@@ -4,7 +4,6 @@
 import { DEVICE } from 'trezor-connect';
 import { LOCATION_CHANGE } from 'react-router-redux';
 import * as WALLET from '../actions/constants/wallet';
-import * as SEND from '../actions/constants/wallet';
 
 import * as WalletActions from '../actions/WalletActions';
 import * as LocalStorageActions from '../actions/LocalStorageActions';
@@ -15,11 +14,7 @@ import type {
     Middleware,
     MiddlewareAPI,
     MiddlewareDispatch,
-    State,
-    Dispatch,
     Action,
-    GetState,
-    TrezorDevice,
 } from '~/flowtype';
 
 /**
diff --git a/webpack/config.dev.babel.js b/webpack/config.dev.babel.js
index 6a79af31..d7bfe2af 100644
--- a/webpack/config.dev.babel.js
+++ b/webpack/config.dev.babel.js
@@ -9,7 +9,7 @@ module.exports = {
     mode: 'development',
     devtool: 'inline-source-map',
     entry: {
-        index: ['react-hot-loader/patch', `${SRC}js/index.js`],
+        index: [`${SRC}js/index.js`],
     },
     output: {
         filename: '[name].[hash].js',
diff --git a/webpack/config.dev.local.babel.js b/webpack/config.dev.local.babel.js
index 6ef01e70..e3506e9c 100644
--- a/webpack/config.dev.local.babel.js
+++ b/webpack/config.dev.local.babel.js
@@ -1,3 +1,7 @@
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import {
     TREZOR_CONNECT_ROOT,
     TREZOR_CONNECT_HTML,
@@ -5,26 +9,20 @@ import {
     TREZOR_CONNECT, TREZOR_IFRAME, TREZOR_POPUP, TREZOR_WEBUSB,
     SRC,
     BUILD,
-    PORT
+    PORT,
 } from './constants';
 
-
-import webpack from 'webpack';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-
 module.exports = {
     watch: true,
     mode: 'development',
     devtool: 'inline-source-map',
     entry: {
-        'index': ['react-hot-loader/patch', `${SRC}js/index.js`],
+        index: [`${SRC}js/index.js`],
         'trezor-connect-npm': `${TREZOR_CONNECT}.js`,
         // 'extension-permissions': `${TREZOR_CONNECT_ROOT}src/js/extensionPermissions.js`,
-        'iframe': TREZOR_IFRAME,
-        'popup': TREZOR_POPUP,
-        'webusb': TREZOR_WEBUSB,
+        iframe: TREZOR_IFRAME,
+        popup: TREZOR_POPUP,
+        webusb: TREZOR_WEBUSB,
     },
     output: {
         filename: '[name].[hash].js',
@@ -44,18 +42,18 @@ module.exports = {
             {
                 test: /\.jsx?$/,
                 exclude: /node_modules/,
-                use: ['babel-loader']
+                use: ['babel-loader'],
             },
             {
                 test: /\.less$/,
                 use: [
                     {
                         loader: MiniCssExtractPlugin.loader,
-                        options: { publicPath: '../' }
+                        options: { publicPath: '../' },
                     },
                     'css-loader',
                     'less-loader',
-                ]
+                ],
             },
             {
                 test: /\.(png|gif|jpg)$/,
@@ -63,7 +61,7 @@ module.exports = {
                 query: {
                     outputPath: './images',
                     name: '[name].[ext]',
-                }
+                },
             },
             {
                 test: /\.(ttf|eot|svg|woff|woff2)$/,
@@ -96,11 +94,11 @@ module.exports = {
     resolve: {
         modules: [SRC, 'node_modules', `${TREZOR_CONNECT_ROOT}/node_modules`],
         alias: {
-            'trezor-connect': `${TREZOR_CONNECT}`
-        }
+            'trezor-connect': `${TREZOR_CONNECT}`,
+        },
     },
     performance: {
-        hints: false
+        hints: false,
     },
     plugins: [
         new MiniCssExtractPlugin({
@@ -112,26 +110,26 @@ module.exports = {
             chunks: ['index'],
             template: `${SRC}index.html`,
             filename: 'index.html',
-            inject: true
+            inject: true,
         }),
 
         new HtmlWebpackPlugin({
             chunks: ['iframe'],
-            filename: `iframe.html`,
+            filename: 'iframe.html',
             template: `${TREZOR_CONNECT_HTML}iframe.html`,
-            inject: false
+            inject: false,
         }),
         new HtmlWebpackPlugin({
             chunks: ['popup'],
             filename: 'popup.html',
             template: `${TREZOR_CONNECT_HTML}popup.html`,
-            inject: false
+            inject: false,
         }),
         new HtmlWebpackPlugin({
             chunks: ['webusb'],
-            filename: `webusb.html`,
+            filename: 'webusb.html',
             template: `${TREZOR_CONNECT_HTML}webusb.html`,
-            inject: true
+            inject: true,
         }),
         // new HtmlWebpackPlugin({
         //     chunks: ['extension-permissions'],
@@ -158,7 +156,7 @@ module.exports = {
     ],
     // ignoring "fs" import in fastxpub
     node: {
-        fs: "empty",
-        path: "empty",
+        fs: 'empty',
+        path: 'empty',
     },
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 2bb4b2e3..1bfd2ea9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2794,7 +2794,7 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.0.0"
     whatwg-url "^6.4.0"
 
-date-fns@^1.27.2:
+date-fns@^1.27.2, date-fns@^1.29.0:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
@@ -7785,9 +7785,9 @@ react-css-transition@^0.7.4:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-hot-loader@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.2.0.tgz#4a2ec79114f872e28ea786e04889d643ad3dfb7c"
+react-hot-loader@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.3.4.tgz#4f9bdd55bb20d77a6ae8931fa1c187e5f0ce6279"
   dependencies:
     fast-levenshtein "^2.0.6"
     global "^4.3.0"

From 03af4fdfcec0a8474e066b3b683a950435fe499b Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 17:51:53 +0200
Subject: [PATCH 007/103] Dashboard refactored

---
 src/js/components/wallet/pages/Dashboard.js | 44 ++++++++++++++++-----
 src/styles/dashboard.less                   | 24 -----------
 src/styles/index.less                       |  2 -
 3 files changed, 34 insertions(+), 36 deletions(-)
 delete mode 100644 src/styles/dashboard.less

diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/components/wallet/pages/Dashboard.js
index 9b744ad6..7335a712 100644
--- a/src/js/components/wallet/pages/Dashboard.js
+++ b/src/js/components/wallet/pages/Dashboard.js
@@ -1,20 +1,44 @@
-/* @flow */
-
-
 import React from 'react';
-import { H2 } from '~/js/components/common/Heading';
+import styled from 'styled-components';
 import { connect } from 'react-redux';
+
+import { H2 } from '~/js/components/common/Heading';
 import DashboardImg from '~/images/dashboard.png';
 
+const Wrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+`;
+
+const StyledH2 = styled(H2)`
+    padding: 24px 48px;
+`;
+
+const Row = styled.div`
+    flex: 1;
+    display: flex;
+    padding: 0px 48px;
+    
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+`;
+
+const P = styled.p`
+    padding: 24px 0px;
+    text-align: center;
+`;
+
 const Dashboard = () => (
-    <section className="dashboard">
-        <H2>Dashboard</H2>
-        <div className="row">
+    <Wrapper>
+        <StyledH2>Dashboard</StyledH2>
+        <Row>
             <H2>Please select your coin</H2>
-            <p>You will gain access to recieving &amp; sending selected coin</p>
+            <P>You will gain access to recieving &amp; sending selected coin</P>
             <img src={DashboardImg} height="34" width="auto" alt="Dashboard" />
-        </div>
-    </section>
+        </Row>
+    </Wrapper>
 );
 
 export default connect(null, null)(Dashboard);
diff --git a/src/styles/dashboard.less b/src/styles/dashboard.less
deleted file mode 100644
index 4d99066f..00000000
--- a/src/styles/dashboard.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.dashboard {
-
-    //height: 1000px;
-
-    .row {
-        flex: 1;
-        
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        padding: 0px 48px;
-        padding-bottom: 98px;
-
-        h2 {
-            padding: 0;
-        }
-
-        p {
-            padding: 24px 0px;
-            text-align: center;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/styles/index.less b/src/styles/index.less
index 80aeb0e8..23b95022 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -10,7 +10,6 @@
 @import './reactSelect.less';
 @import './rcTooltip.less';
 
-
 @import './history.less';
 @import './send.less';
 @import './receive.less';
@@ -19,7 +18,6 @@
 
 @import './landingPage.less';
 
-@import './dashboard.less';
 @import './acquire.less';
 @import './notification.less';
 

From db8c711ec4e637216f55c95955f3a7aae1890d79 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 18:28:35 +0200
Subject: [PATCH 008/103] Created base styles

---
 package.json                                  |  1 +
 src/js/components/common/Header.js            |  2 +-
 src/js/components/common/Link.js              | 14 +++++++++++
 .../components/wallet/pages/DeviceSettings.js |  1 -
 src/js/index.js                               |  7 +++++-
 src/js/services/index.js                      |  3 ---
 src/js/support/BaseStyles.js                  | 24 +++++++++++++++++++
 src/styles/base.less                          | 15 ------------
 yarn.lock                                     |  4 ++++
 9 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 src/js/components/common/Link.js
 create mode 100644 src/js/support/BaseStyles.js

diff --git a/package.json b/package.json
index 40ee7e19..27d29990 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
         "redux-raven-middleware": "^1.2.0",
         "redux-thunk": "^2.2.0",
         "styled-components": "^3.3.3",
+        "styled-normalize": "^8.0.0",
         "trezor-connect": "^5.0.28",
         "web3": "^0.19.0",
         "webpack": "^4.16.3",
diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index d6d47c78..adb2d320 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -13,7 +13,7 @@ const Wrapper = styled.header`
          height: 28px;         
          width: 100px;
          flex: 1;
-     }
+    }
 `;
 
 const LayoutWrapper = styled.div`
diff --git a/src/js/components/common/Link.js b/src/js/components/common/Link.js
new file mode 100644
index 00000000..e5bb7a9c
--- /dev/null
+++ b/src/js/components/common/Link.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import styled from 'styled-components';
+import colors from '~/js/config/colors';
+
+const StyledLink = styled.a`
+    color: red;
+    text-decoration
+`;
+
+const Link = ({ href, name }) => (
+    <Link href={href} />
+);
+
+export default StyledLink;
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index e2ed8fdf..f1a55c3e 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { H2 } from '~/js/components/common/Heading';
-import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 export const DeviceSettings = () => (
diff --git a/src/js/index.js b/src/js/index.js
index ec0ac5c4..4979d9bc 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1,6 +1,7 @@
 /* @flow */
 import React from 'react';
 import { render } from 'react-dom';
+import baseStyles from '~/js/support/BaseStyles';
 import store from './store';
 import App from './router';
 import { onBeforeUnload } from './actions/WalletActions';
@@ -8,7 +9,11 @@ import styles from '~/styles/index.less';
 
 const root: ?HTMLElement = document.getElementById('root');
 if (root) {
-    render(<App />, root);
+    baseStyles();
+    render(
+        <App />,
+        root,
+    );
 }
 
 window.onbeforeunload = () => {
diff --git a/src/js/services/index.js b/src/js/services/index.js
index ebcb6937..b2ed5a5b 100644
--- a/src/js/services/index.js
+++ b/src/js/services/index.js
@@ -1,6 +1,3 @@
-/* @flow */
-
-
 import WalletService from './WalletService';
 import LogService from './LogService';
 import RouterService from './RouterService';
diff --git a/src/js/support/BaseStyles.js b/src/js/support/BaseStyles.js
new file mode 100644
index 00000000..15eb6c9a
--- /dev/null
+++ b/src/js/support/BaseStyles.js
@@ -0,0 +1,24 @@
+import { injectGlobal } from 'styled-components';
+
+import normalize from 'styled-normalize';
+
+const baseStyles = () => injectGlobal`
+    ${normalize};
+    
+    * , *:before , *:after {
+        box-sizing: border-box;
+    }
+
+    * {
+        margin: 0;
+        padding: 0;
+    }
+
+    *:focus, *:active, *:active:focus, *::selection, *::-moz-selection {
+        outline: 0 !important;
+        -webkit-appearance: none;
+        -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    }
+`;
+
+export default baseStyles;
diff --git a/src/styles/base.less b/src/styles/base.less
index 54d6d27d..f4fdda8a 100644
--- a/src/styles/base.less
+++ b/src/styles/base.less
@@ -1,18 +1,3 @@
-* , *:before , *:after {
-    box-sizing: border-box;
-}
-
-* {
-    margin: 0;
-    padding: 0;
-}
-
-*:focus, *:active, *:active:focus, *::selection, *::-moz-selection {
-    outline: 0 !important;
-    -webkit-appearance: none;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
 html, body {
     width: 100%;
     height: 100%;
diff --git a/yarn.lock b/yarn.lock
index 1bfd2ea9..7ba42c8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9105,6 +9105,10 @@ styled-components@^3.3.3:
     stylis-rule-sheet "^0.0.10"
     supports-color "^3.2.3"
 
+styled-normalize@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/styled-normalize/-/styled-normalize-8.0.0.tgz#54881c9389540bf9fb2a3d34dca2e2d4d68601f2"
+
 stylelint-config-recommended@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858"

From c51612f13e071d2755d3e3e9f7904326621a74ba Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 18:29:58 +0200
Subject: [PATCH 009/103] More base styles merged into styled components

---
 src/js/support/BaseStyles.js | 14 +++++++++++++-
 src/styles/base.less         | 18 ------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/js/support/BaseStyles.js b/src/js/support/BaseStyles.js
index 15eb6c9a..280e56be 100644
--- a/src/js/support/BaseStyles.js
+++ b/src/js/support/BaseStyles.js
@@ -4,7 +4,7 @@ import normalize from 'styled-normalize';
 
 const baseStyles = () => injectGlobal`
     ${normalize};
-    
+
     * , *:before , *:after {
         box-sizing: border-box;
     }
@@ -19,6 +19,18 @@ const baseStyles = () => injectGlobal`
         -webkit-appearance: none;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     }
+
+    a {
+        text-decoration: none;
+        cursor: pointer;
+    }
+
+    a:focus, 
+    button:focus, 
+    input:focus, 
+    textarea:focus {
+        outline: 0;
+    }
 `;
 
 export default baseStyles;
diff --git a/src/styles/base.less b/src/styles/base.less
index f4fdda8a..c19d86d0 100644
--- a/src/styles/base.less
+++ b/src/styles/base.less
@@ -37,22 +37,4 @@ main {
         border-radius: 0px;
         margin-top: 0px;
     }
-}
-
-
-a {
-    text-decoration: none;
-    cursor: pointer;
-}
-
-a:focus, 
-button:focus, 
-input:focus, 
-textarea:focus {
-    outline: 0;
-}
-
-h1, h2, h3 {
-    -webkit-font-smoothing: antialiased;
-    text-rendering: optimizeLegibility;
 }
\ No newline at end of file

From 063f76b5b16e31b53e2100643831aa6ae0d71056 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 18:42:58 +0200
Subject: [PATCH 010/103] Base font for styled components

---
 src/js/support/BaseStyles.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/js/support/BaseStyles.js b/src/js/support/BaseStyles.js
index 280e56be..334d375b 100644
--- a/src/js/support/BaseStyles.js
+++ b/src/js/support/BaseStyles.js
@@ -5,6 +5,15 @@ import normalize from 'styled-normalize';
 const baseStyles = () => injectGlobal`
     ${normalize};
 
+    html, body {
+        width: 100%;
+        height: 100%;
+        position: relative;
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Arial, sans-serif;
+        font-weight: 400;
+        font-size: 14px;
+    }
+
     * , *:before , *:after {
         box-sizing: border-box;
     }
@@ -31,6 +40,26 @@ const baseStyles = () => injectGlobal`
     textarea:focus {
         outline: 0;
     }
+
+    @font-face {
+    font-family: 'Roboto Zero';
+    src: url('../fonts/roboto/RobotoZero.eot') format('embedded-opentype'),
+         url('../fonts/roboto/RobotoZero.eot?#iefix') format('embedded-opentype'),
+         url('../fonts/roboto/RobotoZero.woff') format('woff'),
+         url('../fonts/roboto/RobotoZero.ttf') format('truetype');
+    }
+
+    @font-face {
+        font-family: 'Roboto Mono';
+        font-style: normal;
+        src: url('../fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.eot') format('embedded-opentype'), /* IE9 Compat Modes */
+            url('../fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('../fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */
+            url('../fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff') format('woff'), /* Modern Browsers */
+            url('../fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('../fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */
+    }
+
 `;
 
-export default baseStyles;
+export default baseStyles;
\ No newline at end of file

From fbb34a87b18f199da66164a77c66fc3789842216 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 18:47:39 +0200
Subject: [PATCH 011/103] Removed header less

---
 src/styles/base.less   | 10 ----------
 src/styles/header.less | 37 -------------------------------------
 src/styles/index.less  |  1 -
 3 files changed, 48 deletions(-)
 delete mode 100644 src/styles/header.less

diff --git a/src/styles/base.less b/src/styles/base.less
index c19d86d0..48d40a03 100644
--- a/src/styles/base.less
+++ b/src/styles/base.less
@@ -1,13 +1,3 @@
-html, body {
-    width: 100%;
-    height: 100%;
-    position: relative;
-    background-color: @color_body;
-    font-family: @font-default;
-    font-weight: 400;
-    font-size: 14px;
-}
-
 .app {
     position: relative;
     min-height: 100vh;
diff --git a/src/styles/header.less b/src/styles/header.less
deleted file mode 100644
index b3a680e9..00000000
--- a/src/styles/header.less
+++ /dev/null
@@ -1,37 +0,0 @@
-header {
-    width: 100%;
-    height: 52px;
-    background: @color_header;
-
-    svg {
-        fill: @color_white;
-        height: 28px;
-        width: 100px;
-        flex: 1;
-    }
-
-    .layout-wrapper {
-        width: 100%;
-        height: 100%;
-        max-width: 1170px;
-        margin: 0 auto;
-        padding: 0 32px;
-        display: flex;
-        align-items: center;
-    }
-
-    a, a:visited {
-        color: @color_white;
-        margin-left: 24px;
-        .hover();
-        
-        &:first-child {
-            margin: 0px;
-        }
-
-        &:hover,
-        &:active {
-            color: @color_text_secondary;
-        }
-    }
-}
diff --git a/src/styles/index.less b/src/styles/index.less
index 23b95022..56948856 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -2,7 +2,6 @@
 @import './colors.less';
 @import './mixins.less';
 @import './base.less';
-@import './header.less';
 @import './aside.less';
 @import './content.less';
 @import './modal.less';

From 6f83bba6b55ccb72b7a06a6b10bf95d061cc67e5 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 19:07:51 +0200
Subject: [PATCH 012/103] Fixed eslint import warning

---
 .babelrc     |  9 ++++++++-
 .eslintrc    |  9 +--------
 package.json |  1 +
 yarn.lock    | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.babelrc b/.babelrc
index 8194dcfa..e6f68a95 100644
--- a/.babelrc
+++ b/.babelrc
@@ -17,7 +17,14 @@
         }],
         ["babel-plugin-root-import", {
             "rootPathSuffix": "./src",
-            "rootPathPrefix": "~"
+            "rootPathPrefix": "~",
+            "alias": {
+                "components": "./src/js/components",
+                "config": "./src/js/config",
+                "reducers": "./src/js/reducers",
+                "actions": "./src/js/actions",
+                "services": "./src/js/services"
+            }
         }],
         "babel-plugin-styled-components"
     ],
diff --git a/.eslintrc b/.eslintrc
index 4e1391be..0b2f5878 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -32,14 +32,7 @@
     ],
     "settings": {
         "import/parser": "babel-eslint",
-        "import/resolver": {
-            "node": {
-                "moduleDirectory": [
-                    "src",
-                    "node_modules"
-                ]
-            }
-        },
+        "import/resolver": "babel-plugin-root-import",
         "import/ignore": [
             "\\.(scss|less|css)$"
         ]
diff --git a/package.json b/package.json
index 27d29990..3f474cc3 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
         "css-loader": "0.28.11",
         "eslint": "^4",
         "eslint-config-airbnb": "^17.0.0",
+        "eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
         "eslint-plugin-flowtype": "^2.50.0",
         "eslint-plugin-import": "^2.13.0",
         "eslint-plugin-jest": "^21.18.0",
diff --git a/yarn.lock b/yarn.lock
index 7ba42c8e..f1aa3e7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3323,6 +3323,21 @@ eslint-config-airbnb@^17.0.0:
     object.assign "^4.1.0"
     object.entries "^1.0.4"
 
+eslint-import-resolver-babel-plugin-root-import@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-plugin-root-import/-/eslint-import-resolver-babel-plugin-root-import-1.1.1.tgz#b060f1177557918389f7ed476e5b36a43854a381"
+  dependencies:
+    eslint-import-resolver-node "^0.2.1"
+    json5 "^0.5.0"
+
+eslint-import-resolver-node@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+  dependencies:
+    debug "^2.2.0"
+    object-assign "^4.0.1"
+    resolve "^1.1.6"
+
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"

From cd25b3f459568238ed1247bdc5f8c05dae92d76c Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 19:09:23 +0200
Subject: [PATCH 013/103] Revert "Removed header less"

This reverts commit fbb34a87b18f199da66164a77c66fc3789842216.
---
 src/styles/base.less   | 10 ++++++++++
 src/styles/header.less | 37 +++++++++++++++++++++++++++++++++++++
 src/styles/index.less  |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 src/styles/header.less

diff --git a/src/styles/base.less b/src/styles/base.less
index 48d40a03..c19d86d0 100644
--- a/src/styles/base.less
+++ b/src/styles/base.less
@@ -1,3 +1,13 @@
+html, body {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    background-color: @color_body;
+    font-family: @font-default;
+    font-weight: 400;
+    font-size: 14px;
+}
+
 .app {
     position: relative;
     min-height: 100vh;
diff --git a/src/styles/header.less b/src/styles/header.less
new file mode 100644
index 00000000..b3a680e9
--- /dev/null
+++ b/src/styles/header.less
@@ -0,0 +1,37 @@
+header {
+    width: 100%;
+    height: 52px;
+    background: @color_header;
+
+    svg {
+        fill: @color_white;
+        height: 28px;
+        width: 100px;
+        flex: 1;
+    }
+
+    .layout-wrapper {
+        width: 100%;
+        height: 100%;
+        max-width: 1170px;
+        margin: 0 auto;
+        padding: 0 32px;
+        display: flex;
+        align-items: center;
+    }
+
+    a, a:visited {
+        color: @color_white;
+        margin-left: 24px;
+        .hover();
+        
+        &:first-child {
+            margin: 0px;
+        }
+
+        &:hover,
+        &:active {
+            color: @color_text_secondary;
+        }
+    }
+}
diff --git a/src/styles/index.less b/src/styles/index.less
index 56948856..23b95022 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -2,6 +2,7 @@
 @import './colors.less';
 @import './mixins.less';
 @import './base.less';
+@import './header.less';
 @import './aside.less';
 @import './content.less';
 @import './modal.less';

From e226847cccf842b489c3f3fbf9e57b627df9cdf1 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 12:19:10 +0200
Subject: [PATCH 014/103] Added support for icons and styled components

---
 .babelrc                                      |  9 +---
 .eslintrc                                     |  1 +
 src/js/components/common/Header.js            |  6 ++-
 src/js/components/common/Icon.js              | 42 +++++++++++++++++++
 src/js/components/common/LoaderCircle.js      |  3 +-
 src/js/components/landing/InstallBridge.js    | 11 +----
 .../components/wallet/pages/DeviceSettings.js | 42 ++++++++++++++++---
 src/js/constants/bridge.js                    |  8 ++++
 src/js/constants/icons.js                     |  3 ++
 src/js/utils/networkUtils.js                  |  4 +-
 src/styles/content.less                       |  6 ---
 src/styles/deviceSettings.less                | 32 --------------
 src/styles/index.less                         |  1 -
 src/styles/landingPage.less                   |  5 ---
 14 files changed, 99 insertions(+), 74 deletions(-)
 create mode 100644 src/js/components/common/Icon.js
 create mode 100644 src/js/constants/bridge.js
 create mode 100644 src/js/constants/icons.js
 delete mode 100644 src/styles/deviceSettings.less

diff --git a/.babelrc b/.babelrc
index e6f68a95..8194dcfa 100644
--- a/.babelrc
+++ b/.babelrc
@@ -17,14 +17,7 @@
         }],
         ["babel-plugin-root-import", {
             "rootPathSuffix": "./src",
-            "rootPathPrefix": "~",
-            "alias": {
-                "components": "./src/js/components",
-                "config": "./src/js/config",
-                "reducers": "./src/js/reducers",
-                "actions": "./src/js/actions",
-                "services": "./src/js/services"
-            }
+            "rootPathPrefix": "~"
         }],
         "babel-plugin-styled-components"
     ],
diff --git a/.eslintrc b/.eslintrc
index 0b2f5878..3e9c178c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,6 +10,7 @@
         "jest": true
     },
     "rules": {
+        "react/destructuring-assignment": 0,
         "react/jsx-one-expression-per-line": 0,
         "react/jsx-indent": [2, 4],
         "react/jsx-indent-props": [2, 4],
diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index adb2d320..6136aed6 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -16,6 +16,8 @@ const Wrapper = styled.header`
     }
 `;
 
+const LinkWrapper = styled.div``;
+
 const LayoutWrapper = styled.div`
     width: 100%;
     height: 100%;
@@ -57,12 +59,12 @@ const Header = (): React$Element<string> => (
                 <path d="M79.4,20.3c0-4.5-3.1-7.4-7.7-7.4H61.2v22.3H67v-7.5h2.2l4.1,7.5H80l-4.9-8.3C77.2,26.1,79.4,24,79.4,20.3z M71,22.5h-4V18 h4c1.5,0,2.5,0.9,2.5,2.2C73.5,21.6,72.5,22.5,71,22.5z" />
                 <polygon points="40.5,12.8 58.6,12.8 58.6,18.1 52.4,18.1 52.4,35.2 46.6,35.2 46.6,18.1 40.5,18.1 " />
             </svg>
-            <div>
+            <LinkWrapper>
                 <A href="https://trezor.io/" target="_blank" rel="noreferrer noopener">TREZOR</A>
                 <A href="https://doc.satoshilabs.com/trezor-user/" target="_blank" rel="noreferrer noopener">Docs</A>
                 <A href="https://blog.trezor.io/" target="_blank" rel="noreferrer noopener">Blog</A>
                 <A href="https://trezor.io/support/" target="_blank" rel="noreferrer noopener">Support</A>
-            </div>
+            </LinkWrapper>
         </LayoutWrapper>
     </Wrapper>
 );
diff --git a/src/js/components/common/Icon.js b/src/js/components/common/Icon.js
new file mode 100644
index 00000000..213b2132
--- /dev/null
+++ b/src/js/components/common/Icon.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Icon = (props) => {
+    const styles = {
+        svg: {
+            display: 'inline-block',
+            verticalAlign: 'middle',
+        },
+        path: {
+            fill: props.color,
+        },
+    };
+
+    return (
+        <svg
+            style={styles.svg}
+            width={`${props.size}`}
+            height={`${props.size}`}
+            viewBox="0 0 16 16"
+        >
+            <path
+                style={styles.path}
+                d={props.icon}
+
+            />
+        </svg>
+    );
+};
+
+Icon.propTypes = {
+    icon: PropTypes.string.isRequired,
+    size: PropTypes.number,
+    color: PropTypes.string,
+};
+
+Icon.defaultProps = {
+    size: 30,
+    color: 'black',
+};
+
+export default Icon;
\ No newline at end of file
diff --git a/src/js/components/common/LoaderCircle.js b/src/js/components/common/LoaderCircle.js
index 5443c5d4..ba209cd8 100644
--- a/src/js/components/common/LoaderCircle.js
+++ b/src/js/components/common/LoaderCircle.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-
 import React from 'react';
 
 export default (props: { size: string, label?: string, className?: string }): React$Element<string> => {
@@ -11,7 +10,7 @@ export default (props: { size: string, label?: string, className?: string }): Re
     };
 
     return (
-        <div className={ className } style={style}>
+        <div className={className} style={style}>
             <p>{ props.label }</p>
             <svg className="circular" viewBox="25 25 50 50">
                 <circle className="route" cx="50" cy="50" r="20" fill="none" stroke="" strokeWidth="1" strokeMiterlimit="10" />
diff --git a/src/js/components/landing/InstallBridge.js b/src/js/components/landing/InstallBridge.js
index dc7f3e5d..0ab6a9c3 100644
--- a/src/js/components/landing/InstallBridge.js
+++ b/src/js/components/landing/InstallBridge.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-
+import installers from '~/js/constants/bridge';
 import React, { Component } from 'react';
 import Select from 'react-select';
 import Preloader from './Preloader';
@@ -17,15 +17,6 @@ type InstallTarget = {
     label: string;
 }
 
-const installers: Array<InstallTarget> = [
-    { id: 'Windows', value: 'trezor-bridge-2.0.11-win32-install.exe', label: 'Windows' },
-    { id: 'macOS', value: 'trezor-bridge-2.0.11.pkg', label: 'Mac OS X' },
-    { id: 'Linux', value: 'trezor-bridge_2.0.11_amd64.deb', label: 'Linux 64-bit (deb)' },
-    { id: 'Linux-rpm', value: 'trezor-bridge_2.0.11_amd64.rpm', label: 'Linux 64-bit (rpm)' },
-    { id: '01', value: 'trezor-bridge_2.0.11_amd32.deb', label: 'Linux 32-bit (deb)' },
-    { id: '02', value: 'trezor-bridge_2.0.11_amd32.rpm', label: 'Linux 32-bit (rpm)' },
-];
-
 // import type { Props } from './index';
 
 type Props = {
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index f1a55c3e..a02a2f62 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -1,15 +1,45 @@
 import React from 'react';
+import styled from 'styled-components';
 import { H2 } from '~/js/components/common/Heading';
+import Icon from '~/js/components/common/Icon';
+import colors from '~/js/config/colors';
+import ICONS from '~/js/constants/icons';
 import { connect } from 'react-redux';
 
+const Section = styled.section`
+`;
+
+const P = styled.p`
+    padding: 12px 0px 24px 0px;
+    text-align: center;
+`;
+
+const StyledH2 = styled(H2)`
+    padding-top: 15px;
+`;
+
+const Row = styled.div`
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 0px 48px;
+    padding-bottom: 98px;
+`;
+
 export const DeviceSettings = () => (
-    <section className="device-settings">
-        <div className="row">
-            <H2>Device settings is under construction</H2>
-            <p>Please use Bitcoin wallet interface to change your device settings</p>
+    <Section>
+        <Row>
+            <Icon
+                color={colors.WARNING_PRIMARY}
+                icon={ICONS.WARNING}
+            />
+            <StyledH2>Device settings is under construction</StyledH2>
+            <P>Please use Bitcoin wallet interface to change your device settings</P>
             <a className="button" href="https://wallet.trezor.io/">Take me to the Bitcoin wallet</a>
-        </div>
-    </section>
+        </Row>
+    </Section>
 );
 
 export default connect(null, null)(DeviceSettings);
diff --git a/src/js/constants/bridge.js b/src/js/constants/bridge.js
new file mode 100644
index 00000000..cfd8914d
--- /dev/null
+++ b/src/js/constants/bridge.js
@@ -0,0 +1,8 @@
+export default [
+    { id: 'Windows', value: 'trezor-bridge-2.0.11-win32-install.exe', label: 'Windows' },
+    { id: 'macOS', value: 'trezor-bridge-2.0.11.pkg', label: 'Mac OS X' },
+    { id: 'Linux', value: 'trezor-bridge_2.0.11_amd64.deb', label: 'Linux 64-bit (deb)' },
+    { id: 'Linux-rpm', value: 'trezor-bridge_2.0.11_amd64.rpm', label: 'Linux 64-bit (rpm)' },
+    { id: '01', value: 'trezor-bridge_2.0.11_amd32.deb', label: 'Linux 32-bit (deb)' },
+    { id: '02', value: 'trezor-bridge_2.0.11_amd32.rpm', label: 'Linux 32-bit (rpm)' },
+];
diff --git a/src/js/constants/icons.js b/src/js/constants/icons.js
new file mode 100644
index 00000000..bb2f7fa6
--- /dev/null
+++ b/src/js/constants/icons.js
@@ -0,0 +1,3 @@
+export default {
+    WARNING: 'M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z',
+};
\ No newline at end of file
diff --git a/src/js/utils/networkUtils.js b/src/js/utils/networkUtils.js
index 546ceff2..360168d9 100644
--- a/src/js/utils/networkUtils.js
+++ b/src/js/utils/networkUtils.js
@@ -10,9 +10,9 @@ export const httpRequest = async (url: string, type: string = 'text'): any => {
             const txt: string = await response.text();
             return JSON.parse(txt);
         } if (type === 'binary') {
-            return await response.arrayBuffer();
+            await response.arrayBuffer();
         }
-        return await response.text();
+        await response.text();
     }
     throw new Error(`${url} ${response.statusText}`);
 
diff --git a/src/styles/content.less b/src/styles/content.less
index f203e483..6e68ec81 100644
--- a/src/styles/content.less
+++ b/src/styles/content.less
@@ -59,12 +59,6 @@ article {
         display: flex;
         flex-direction: column;
         background: @color_white;
-
-        h2 {
-            font-size: 16px;
-            font-weight: 600;
-            padding: 24px 48px;
-        }
     
         p {
             padding: 0px 48px;
diff --git a/src/styles/deviceSettings.less b/src/styles/deviceSettings.less
deleted file mode 100644
index 0f26d5f5..00000000
--- a/src/styles/deviceSettings.less
+++ /dev/null
@@ -1,32 +0,0 @@
-.device-settings {
-    .row {
-        flex: 1;
-        
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        padding: 0px 48px;
-        padding-bottom: 98px;
-
-        h2 {
-            padding: 0;
-            position: relative;
-            &:before {
-                .icomoon-warning;
-                position: absolute;
-                color: @color_warning_primary;
-                font-size: 48px;
-                top: -48px;
-                left: 0;
-                right: 0;
-                text-align: center;
-            }
-        }
-
-        p {
-            padding: 12px 0px 24px 0px;
-            text-align: center;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/styles/index.less b/src/styles/index.less
index 23b95022..d50a8bab 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -14,7 +14,6 @@
 @import './send.less';
 @import './receive.less';
 @import './summary.less';
-@import './deviceSettings.less';
 
 @import './landingPage.less';
 
diff --git a/src/styles/landingPage.less b/src/styles/landingPage.less
index 69614a38..8223e8ff 100644
--- a/src/styles/landingPage.less
+++ b/src/styles/landingPage.less
@@ -169,11 +169,6 @@
 
         main {
 
-            h2.claim {
-                font-size: 36px;
-                padding-bottom: 24px;
-            }
-
             .row {
                 display: flex;
                 flex-direction: row;

From 909c657454be2492df390a7b26df1bee700d23d7 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 13:03:52 +0200
Subject: [PATCH 015/103] Refactored menu rendering

---
 src/js/components/common/Header.js            |  2 +-
 .../components/wallet/aside/CoinSelection.js  | 95 +++++++++----------
 .../components/wallet/pages/DeviceSettings.js |  5 +-
 src/js/constants/navigation.js                | 26 +++++
 src/styles/history.less                       |  2 -
 5 files changed, 73 insertions(+), 57 deletions(-)
 create mode 100644 src/js/constants/navigation.js

diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 6136aed6..2fe37ee7 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -47,7 +47,7 @@ const A = styled.a`
     }
 `;
 
-const Header = (): React$Element<string> => (
+const Header = () => (
     <Wrapper>
         <LayoutWrapper>
             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 163.7 41.9" width="100%" height="100%" preserveAspectRatio="xMinYMin meet">
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 10445424..550f65d6 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,61 +1,54 @@
-/* @flow */
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { NavLink } from 'react-router-dom';
+import navigationConstants from '~/js/constants/navigation';
 
-
-import React from 'react';
-import { Link, NavLink } from 'react-router-dom';
-
-import type { Props } from './index';
-import type { TrezorDevice } from '~/flowtype';
-
-const CoinSelection = (props: Props): React$Element<string> => {
-    const { location } = props.router;
-    const { config } = props.localStorage;
-    const { selectedDevice } = props.wallet;
-
-    let baseUrl: string = '';
-    if (selectedDevice && selectedDevice.features) {
-        baseUrl = `/device/${selectedDevice.features.device_id}`;
-        if (selectedDevice.instance) {
-            baseUrl += `:${selectedDevice.instance}`;
+class CoinSelection extends Component {
+    getBaseUrl() {
+        const { selectedDevice } = this.props.wallet;
+        let baseUrl = '';
+        if (selectedDevice && selectedDevice.features) {
+            baseUrl = `/device/${selectedDevice.features.device_id}`;
+            if (selectedDevice.instance) {
+                baseUrl += `:${selectedDevice.instance}`;
+            }
         }
+        return baseUrl;
     }
 
-    const walletCoins = config.coins.map((item) => {
-        const url = `${baseUrl}/network/${item.network}/account/0`;
-        const className = `coin ${item.network}`;
+    render() {
+        const { config } = this.props.localStorage;
         return (
-            <NavLink key={item.network} to={url} className={className}>
-                { item.name }
-            </NavLink>
+            <section>
+                {config.coins.map(item => (
+                    <NavLink
+                        key={item.network}
+                        to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
+                    >{ item.name }
+                    </NavLink>
+                ))}
+                <div className="coin-divider">
+                    Other coins <span>(You will be redirected)</span>
+                </div>
+                {navigationConstants.map(item => (
+                    <a
+                        key={item.coinName}
+                        rel="noopener noreferrer"
+                        target="_blank"
+                        href={item.url}
+                    >{item.coinName}
+                    </a>
+                ))}
+            </section>
         );
-    });
+    }
+}
 
-    return (
-        <section>
-            { walletCoins }
-            <div className="coin-divider">
-                Other coins <span>(You will be redirected)</span>
-            </div>
-            <a href="https://wallet.trezor.io/#/coin/btc" className="coin btc external">
-                Bitcoin
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/ltc" className="coin ltc external">
-                Litecoin
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/bch" className="coin bch external">
-                Bitcoin Cash
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/btg" className="coin btg external">
-                Bitcoin Gold
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/dash" className="coin dash external">
-                Dash
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/zec" className="coin zec external">
-                Zcash
-            </a>
-        </section>
-    );
+CoinSelection.propTypes = {
+    config: PropTypes.object,
+    wallet: PropTypes.object,
+    selectedDevice: PropTypes.object,
+    localStorage: PropTypes.object,
 };
 
 export default CoinSelection;
\ No newline at end of file
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index a02a2f62..f14f5484 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -6,8 +6,7 @@ import colors from '~/js/config/colors';
 import ICONS from '~/js/constants/icons';
 import { connect } from 'react-redux';
 
-const Section = styled.section`
-`;
+const Section = styled.section``;
 
 const P = styled.p`
     padding: 12px 0px 24px 0px;
@@ -28,7 +27,7 @@ const Row = styled.div`
     padding-bottom: 98px;
 `;
 
-export const DeviceSettings = () => (
+const DeviceSettings = () => (
     <Section>
         <Row>
             <Icon
diff --git a/src/js/constants/navigation.js b/src/js/constants/navigation.js
new file mode 100644
index 00000000..4dd85eb1
--- /dev/null
+++ b/src/js/constants/navigation.js
@@ -0,0 +1,26 @@
+export default [
+    {
+        coinName: 'Bitcoin',
+        url: 'https://wallet.trezor.io/#/coin/btc',
+    },
+    {
+        coinName: 'Litecoin',
+        url: 'https://wallet.trezor.io/#/coin/ltc',
+    },
+    {
+        coinName: 'Bitcoin Cash',
+        url: 'https://wallet.trezor.io/#/coin/bch',
+    },
+    {
+        coinName: 'Bitcoin Gold',
+        url: 'https://wallet.trezor.io/#/coin/btg',
+    },
+    {
+        coinName: 'Dash',
+        url: 'https://wallet.trezor.io/#/coin/dash',
+    },
+    {
+        coinName: 'Zcash',
+        url: 'https://wallet.trezor.io/#/coin/zec',
+    },
+];
\ No newline at end of file
diff --git a/src/styles/history.less b/src/styles/history.less
index c340272e..bdd03ceb 100644
--- a/src/styles/history.less
+++ b/src/styles/history.less
@@ -8,8 +8,6 @@
 
     .history-transaction {
 
-        
-
         .amount, .time, .address {
             margin-left: 10px;
         }

From ce635fe979a290067f8dd1be84985cab2ed694e7 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 14:19:19 +0200
Subject: [PATCH 016/103] Refactored menu rendering - styled

---
 .eslintrc                                     |  1 +
 .../components/wallet/aside/CoinSelection.js  | 75 ++++++++++++++++---
 src/js/constants/navigation.js                |  6 ++
 src/styles/aside.less                         | 48 ------------
 4 files changed, 71 insertions(+), 59 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 3e9c178c..4bef41c6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,6 +11,7 @@
     },
     "rules": {
         "react/destructuring-assignment": 0,
+        "class-methods-use-this": 0,
         "react/jsx-one-expression-per-line": 0,
         "react/jsx-indent": [2, 4],
         "react/jsx-indent-props": [2, 4],
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 550f65d6..0dfc35b5 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,8 +1,52 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import colors from '~/js/config/colors';
+import styled from 'styled-components';
 import { NavLink } from 'react-router-dom';
 import navigationConstants from '~/js/constants/navigation';
 
+const Wrapper = styled.div`
+    padding: 0 0 20px 0;
+`;
+
+const ImgActive = styled.img`
+    margin-right: 20px;
+`;
+
+const ImgRedirect = styled.img`
+    margin-right: 15px;
+`;
+
+const Link = styled(NavLink)`
+    display: flex;
+    align-items: center;
+`;
+
+const LinkRedirect = styled.a`
+    display: flex;
+    align-items: center;
+`;
+
+const Divider = styled.div`
+    font-size: 12px;
+    display: flex;
+    justify-content: space-between;
+    color: ${colors.TEXT_SECONDARY};
+    background: ${colors.GRAY_LIGHT};
+    padding: 8px 28px 8px 24px;
+    border-top: 1px solid ${colors.DIVIDER};
+    border-bottom: 1px solid ${colors.DIVIDER};
+`;
+
+const RedirectText = styled.span`
+    display: flex;
+    justify-content: flex-end;
+`;
+
+const Name = styled.div`
+    height: 100%;
+`;
+
 class CoinSelection extends Component {
     getBaseUrl() {
         const { selectedDevice } = this.props.wallet;
@@ -16,30 +60,39 @@ class CoinSelection extends Component {
         return baseUrl;
     }
 
+    getImagePath(symbol, network) {
+        const coindId = (symbol === 'tETH' ? network : symbol);
+        return `../../../../images/${coindId}-logo.png`;
+    }
+
     render() {
         const { config } = this.props.localStorage;
         return (
-            <section>
+            <Wrapper>
                 {config.coins.map(item => (
-                    <NavLink
+                    <Link
                         key={item.network}
                         to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
-                    >{ item.name }
-                    </NavLink>
+                    >
+                        <ImgActive width="12px" src={this.getImagePath(item.symbol, item.network)} />
+                        <Name>{ item.name }</Name>
+                    </Link>
                 ))}
-                <div className="coin-divider">
-                    Other coins <span>(You will be redirected)</span>
-                </div>
+                <Divider>
+                    Other coins <RedirectText>(You will be redirected)</RedirectText>
+                </Divider>
                 {navigationConstants.map(item => (
-                    <a
+                    <LinkRedirect
                         key={item.coinName}
                         rel="noopener noreferrer"
                         target="_blank"
                         href={item.url}
-                    >{item.coinName}
-                    </a>
+                    >
+                        <ImgRedirect src={item.image} width="20px" />
+                        {item.coinName}
+                    </LinkRedirect>
                 ))}
-            </section>
+            </Wrapper>
         );
     }
 }
diff --git a/src/js/constants/navigation.js b/src/js/constants/navigation.js
index 4dd85eb1..5e95c53e 100644
--- a/src/js/constants/navigation.js
+++ b/src/js/constants/navigation.js
@@ -2,25 +2,31 @@ export default [
     {
         coinName: 'Bitcoin',
         url: 'https://wallet.trezor.io/#/coin/btc',
+        image: '../images/btc-logo.png',
     },
     {
         coinName: 'Litecoin',
         url: 'https://wallet.trezor.io/#/coin/ltc',
+        image: '../images/ltc-logo.png',
     },
     {
         coinName: 'Bitcoin Cash',
         url: 'https://wallet.trezor.io/#/coin/bch',
+        image: '../images/bch-logo.png',
     },
     {
         coinName: 'Bitcoin Gold',
         url: 'https://wallet.trezor.io/#/coin/btg',
+        image: '../images/btg-logo.png',
     },
     {
         coinName: 'Dash',
         url: 'https://wallet.trezor.io/#/coin/dash',
+        image: '../images/dash-logo.png',
     },
     {
         coinName: 'Zcash',
         url: 'https://wallet.trezor.io/#/coin/zec',
+        image: '../images/zec-logo.png',
     },
 ];
\ No newline at end of file
diff --git a/src/styles/aside.less b/src/styles/aside.less
index ac253b83..0657c062 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -415,54 +415,6 @@ aside {
             background-size: auto 20px;
             background-position: 2px 0px;
         }
-
-        
-        &.ethereum:before {
-            background-image: url('../images/eth-logo.png');
-        }
-        &.ethereum-classic:before {
-            background-image: url('../images/etc-logo.png');
-        }
-        &.ropsten:before {
-            background-image: url('../images/ropsten-logo.png');
-        }
-        &.rinkeby:before {
-            background-image: url('../images/rinkeby-logo.png');
-        }
-
-        &.btc:before {
-            background-image: url('../images/btc-logo.png');
-        }
-        &.bch:before {
-            background-image: url('../images/bch-logo.png');
-        }
-        &.btg:before {
-            background-image: url('../images/btg-logo.png');
-        }
-        &.ltc:before {
-            background-image: url('../images/ltc-logo.png');
-        }
-        &.dash:before {
-            background-image: url('../images/dash-logo.png');
-        }
-        &.zec:before {
-            background-image: url('../images/zec-logo.png');
-        }
-    }
-
-    .coin-divider {
-        font-size: 12px;
-        display: flex;
-        justify-content: space-between;
-        color: @color_text_secondary;
-        background: @color_gray_light;
-        padding: 8px 28px 8px 24px;
-        border-top: 1px solid @color_divider;
-        border-bottom: 1px solid @color_divider;
-        span {
-            display: flex;
-            justify-content: flex-end;
-        }
     }
 
     .device-divider {

From 7c1f928ac69bf4c98d94c82a653e7aac36e89348 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 14:22:22 +0200
Subject: [PATCH 017/103] Revert "Refactored menu rendering - styled"

This reverts commit ce635fe979a290067f8dd1be84985cab2ed694e7.
---
 .eslintrc                                     |  1 -
 .../components/wallet/aside/CoinSelection.js  | 75 +++----------------
 src/js/constants/navigation.js                |  6 --
 src/styles/aside.less                         | 48 ++++++++++++
 4 files changed, 59 insertions(+), 71 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 4bef41c6..3e9c178c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,7 +11,6 @@
     },
     "rules": {
         "react/destructuring-assignment": 0,
-        "class-methods-use-this": 0,
         "react/jsx-one-expression-per-line": 0,
         "react/jsx-indent": [2, 4],
         "react/jsx-indent-props": [2, 4],
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 0dfc35b5..550f65d6 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,52 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import colors from '~/js/config/colors';
-import styled from 'styled-components';
 import { NavLink } from 'react-router-dom';
 import navigationConstants from '~/js/constants/navigation';
 
-const Wrapper = styled.div`
-    padding: 0 0 20px 0;
-`;
-
-const ImgActive = styled.img`
-    margin-right: 20px;
-`;
-
-const ImgRedirect = styled.img`
-    margin-right: 15px;
-`;
-
-const Link = styled(NavLink)`
-    display: flex;
-    align-items: center;
-`;
-
-const LinkRedirect = styled.a`
-    display: flex;
-    align-items: center;
-`;
-
-const Divider = styled.div`
-    font-size: 12px;
-    display: flex;
-    justify-content: space-between;
-    color: ${colors.TEXT_SECONDARY};
-    background: ${colors.GRAY_LIGHT};
-    padding: 8px 28px 8px 24px;
-    border-top: 1px solid ${colors.DIVIDER};
-    border-bottom: 1px solid ${colors.DIVIDER};
-`;
-
-const RedirectText = styled.span`
-    display: flex;
-    justify-content: flex-end;
-`;
-
-const Name = styled.div`
-    height: 100%;
-`;
-
 class CoinSelection extends Component {
     getBaseUrl() {
         const { selectedDevice } = this.props.wallet;
@@ -60,39 +16,30 @@ class CoinSelection extends Component {
         return baseUrl;
     }
 
-    getImagePath(symbol, network) {
-        const coindId = (symbol === 'tETH' ? network : symbol);
-        return `../../../../images/${coindId}-logo.png`;
-    }
-
     render() {
         const { config } = this.props.localStorage;
         return (
-            <Wrapper>
+            <section>
                 {config.coins.map(item => (
-                    <Link
+                    <NavLink
                         key={item.network}
                         to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
-                    >
-                        <ImgActive width="12px" src={this.getImagePath(item.symbol, item.network)} />
-                        <Name>{ item.name }</Name>
-                    </Link>
+                    >{ item.name }
+                    </NavLink>
                 ))}
-                <Divider>
-                    Other coins <RedirectText>(You will be redirected)</RedirectText>
-                </Divider>
+                <div className="coin-divider">
+                    Other coins <span>(You will be redirected)</span>
+                </div>
                 {navigationConstants.map(item => (
-                    <LinkRedirect
+                    <a
                         key={item.coinName}
                         rel="noopener noreferrer"
                         target="_blank"
                         href={item.url}
-                    >
-                        <ImgRedirect src={item.image} width="20px" />
-                        {item.coinName}
-                    </LinkRedirect>
+                    >{item.coinName}
+                    </a>
                 ))}
-            </Wrapper>
+            </section>
         );
     }
 }
diff --git a/src/js/constants/navigation.js b/src/js/constants/navigation.js
index 5e95c53e..4dd85eb1 100644
--- a/src/js/constants/navigation.js
+++ b/src/js/constants/navigation.js
@@ -2,31 +2,25 @@ export default [
     {
         coinName: 'Bitcoin',
         url: 'https://wallet.trezor.io/#/coin/btc',
-        image: '../images/btc-logo.png',
     },
     {
         coinName: 'Litecoin',
         url: 'https://wallet.trezor.io/#/coin/ltc',
-        image: '../images/ltc-logo.png',
     },
     {
         coinName: 'Bitcoin Cash',
         url: 'https://wallet.trezor.io/#/coin/bch',
-        image: '../images/bch-logo.png',
     },
     {
         coinName: 'Bitcoin Gold',
         url: 'https://wallet.trezor.io/#/coin/btg',
-        image: '../images/btg-logo.png',
     },
     {
         coinName: 'Dash',
         url: 'https://wallet.trezor.io/#/coin/dash',
-        image: '../images/dash-logo.png',
     },
     {
         coinName: 'Zcash',
         url: 'https://wallet.trezor.io/#/coin/zec',
-        image: '../images/zec-logo.png',
     },
 ];
\ No newline at end of file
diff --git a/src/styles/aside.less b/src/styles/aside.less
index 0657c062..ac253b83 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -415,6 +415,54 @@ aside {
             background-size: auto 20px;
             background-position: 2px 0px;
         }
+
+        
+        &.ethereum:before {
+            background-image: url('../images/eth-logo.png');
+        }
+        &.ethereum-classic:before {
+            background-image: url('../images/etc-logo.png');
+        }
+        &.ropsten:before {
+            background-image: url('../images/ropsten-logo.png');
+        }
+        &.rinkeby:before {
+            background-image: url('../images/rinkeby-logo.png');
+        }
+
+        &.btc:before {
+            background-image: url('../images/btc-logo.png');
+        }
+        &.bch:before {
+            background-image: url('../images/bch-logo.png');
+        }
+        &.btg:before {
+            background-image: url('../images/btg-logo.png');
+        }
+        &.ltc:before {
+            background-image: url('../images/ltc-logo.png');
+        }
+        &.dash:before {
+            background-image: url('../images/dash-logo.png');
+        }
+        &.zec:before {
+            background-image: url('../images/zec-logo.png');
+        }
+    }
+
+    .coin-divider {
+        font-size: 12px;
+        display: flex;
+        justify-content: space-between;
+        color: @color_text_secondary;
+        background: @color_gray_light;
+        padding: 8px 28px 8px 24px;
+        border-top: 1px solid @color_divider;
+        border-bottom: 1px solid @color_divider;
+        span {
+            display: flex;
+            justify-content: flex-end;
+        }
     }
 
     .device-divider {

From 8cc345aa05fc6f5521a8012f910f8f1b74c46e67 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 14:22:34 +0200
Subject: [PATCH 018/103] Revert "Refactored menu rendering"

This reverts commit 909c657454be2492df390a7b26df1bee700d23d7.
---
 src/js/components/common/Header.js            |  2 +-
 .../components/wallet/aside/CoinSelection.js  | 95 ++++++++++---------
 .../components/wallet/pages/DeviceSettings.js |  5 +-
 src/js/constants/navigation.js                | 26 -----
 src/styles/history.less                       |  2 +
 5 files changed, 57 insertions(+), 73 deletions(-)
 delete mode 100644 src/js/constants/navigation.js

diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 2fe37ee7..6136aed6 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -47,7 +47,7 @@ const A = styled.a`
     }
 `;
 
-const Header = () => (
+const Header = (): React$Element<string> => (
     <Wrapper>
         <LayoutWrapper>
             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 163.7 41.9" width="100%" height="100%" preserveAspectRatio="xMinYMin meet">
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 550f65d6..10445424 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,54 +1,61 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { NavLink } from 'react-router-dom';
-import navigationConstants from '~/js/constants/navigation';
+/* @flow */
 
-class CoinSelection extends Component {
-    getBaseUrl() {
-        const { selectedDevice } = this.props.wallet;
-        let baseUrl = '';
-        if (selectedDevice && selectedDevice.features) {
-            baseUrl = `/device/${selectedDevice.features.device_id}`;
-            if (selectedDevice.instance) {
-                baseUrl += `:${selectedDevice.instance}`;
-            }
+
+import React from 'react';
+import { Link, NavLink } from 'react-router-dom';
+
+import type { Props } from './index';
+import type { TrezorDevice } from '~/flowtype';
+
+const CoinSelection = (props: Props): React$Element<string> => {
+    const { location } = props.router;
+    const { config } = props.localStorage;
+    const { selectedDevice } = props.wallet;
+
+    let baseUrl: string = '';
+    if (selectedDevice && selectedDevice.features) {
+        baseUrl = `/device/${selectedDevice.features.device_id}`;
+        if (selectedDevice.instance) {
+            baseUrl += `:${selectedDevice.instance}`;
         }
-        return baseUrl;
     }
 
-    render() {
-        const { config } = this.props.localStorage;
+    const walletCoins = config.coins.map((item) => {
+        const url = `${baseUrl}/network/${item.network}/account/0`;
+        const className = `coin ${item.network}`;
         return (
-            <section>
-                {config.coins.map(item => (
-                    <NavLink
-                        key={item.network}
-                        to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
-                    >{ item.name }
-                    </NavLink>
-                ))}
-                <div className="coin-divider">
-                    Other coins <span>(You will be redirected)</span>
-                </div>
-                {navigationConstants.map(item => (
-                    <a
-                        key={item.coinName}
-                        rel="noopener noreferrer"
-                        target="_blank"
-                        href={item.url}
-                    >{item.coinName}
-                    </a>
-                ))}
-            </section>
+            <NavLink key={item.network} to={url} className={className}>
+                { item.name }
+            </NavLink>
         );
-    }
-}
+    });
 
-CoinSelection.propTypes = {
-    config: PropTypes.object,
-    wallet: PropTypes.object,
-    selectedDevice: PropTypes.object,
-    localStorage: PropTypes.object,
+    return (
+        <section>
+            { walletCoins }
+            <div className="coin-divider">
+                Other coins <span>(You will be redirected)</span>
+            </div>
+            <a href="https://wallet.trezor.io/#/coin/btc" className="coin btc external">
+                Bitcoin
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/ltc" className="coin ltc external">
+                Litecoin
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/bch" className="coin bch external">
+                Bitcoin Cash
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/btg" className="coin btg external">
+                Bitcoin Gold
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/dash" className="coin dash external">
+                Dash
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/zec" className="coin zec external">
+                Zcash
+            </a>
+        </section>
+    );
 };
 
 export default CoinSelection;
\ No newline at end of file
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index f14f5484..a02a2f62 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -6,7 +6,8 @@ import colors from '~/js/config/colors';
 import ICONS from '~/js/constants/icons';
 import { connect } from 'react-redux';
 
-const Section = styled.section``;
+const Section = styled.section`
+`;
 
 const P = styled.p`
     padding: 12px 0px 24px 0px;
@@ -27,7 +28,7 @@ const Row = styled.div`
     padding-bottom: 98px;
 `;
 
-const DeviceSettings = () => (
+export const DeviceSettings = () => (
     <Section>
         <Row>
             <Icon
diff --git a/src/js/constants/navigation.js b/src/js/constants/navigation.js
deleted file mode 100644
index 4dd85eb1..00000000
--- a/src/js/constants/navigation.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export default [
-    {
-        coinName: 'Bitcoin',
-        url: 'https://wallet.trezor.io/#/coin/btc',
-    },
-    {
-        coinName: 'Litecoin',
-        url: 'https://wallet.trezor.io/#/coin/ltc',
-    },
-    {
-        coinName: 'Bitcoin Cash',
-        url: 'https://wallet.trezor.io/#/coin/bch',
-    },
-    {
-        coinName: 'Bitcoin Gold',
-        url: 'https://wallet.trezor.io/#/coin/btg',
-    },
-    {
-        coinName: 'Dash',
-        url: 'https://wallet.trezor.io/#/coin/dash',
-    },
-    {
-        coinName: 'Zcash',
-        url: 'https://wallet.trezor.io/#/coin/zec',
-    },
-];
\ No newline at end of file
diff --git a/src/styles/history.less b/src/styles/history.less
index bdd03ceb..c340272e 100644
--- a/src/styles/history.less
+++ b/src/styles/history.less
@@ -8,6 +8,8 @@
 
     .history-transaction {
 
+        
+
         .amount, .time, .address {
             margin-left: 10px;
         }

From 8375a4c48b18c015800afcb5ded08609a00ed87a Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 14:29:34 +0200
Subject: [PATCH 019/103] Fixed paddings

---
 .../components/wallet/account/summary/Summary.js  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
index 655d98ec..3a573ebd 100644
--- a/src/js/components/wallet/account/summary/Summary.js
+++ b/src/js/components/wallet/account/summary/Summary.js
@@ -1,6 +1,5 @@
 /* @flow */
-
-
+import styled from 'styled-components';
 import React, { Component } from 'react';
 import { H2 } from '~/js/components/common/Heading';
 import BigNumber from 'bignumber.js';
@@ -17,6 +16,10 @@ import * as stateUtils from '~/js/reducers/utils';
 import type { Props } from './index';
 import type { NetworkToken } from '~/js/reducers/LocalStorageReducer';
 
+const StyledH2 = styled(H2)`
+   padding: 20px 48px;
+`;
+
 const Summary = (props: Props) => {
     const device = props.wallet.selectedDevice;
     const {
@@ -41,10 +44,10 @@ const Summary = (props: Props) => {
 
     return (
         <div>
-            <h2 className={`summary-header ${account.network}`}>
+            <StyledH2 className={`summary-header ${account.network}`}>
                 Account #{ parseInt(account.index) + 1 }
                 <a href={explorerLink} className="gray" target="_blank" rel="noreferrer noopener">See full transaction history</a>
-            </h2>
+            </StyledH2>
 
             <SummaryDetails
                 coin={network}
@@ -56,7 +59,7 @@ const Summary = (props: Props) => {
                 onToggle={props.onDetailsToggle}
             />
 
-            <H2>
+            <StyledH2>
                 Tokens
                 <Tooltip
                     arrowContent={<div className="rc-tooltip-arrow-inner" />}
@@ -65,7 +68,7 @@ const Summary = (props: Props) => {
                 >
                     <span className="what-is-it" />
                 </Tooltip>
-            </H2>
+            </StyledH2>
             {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 Lahod */}
             {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 T01 */}
             <div className="filter">

From ace0f3707452f947690470706ab3fd25bbf42c7a Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 14:33:44 +0200
Subject: [PATCH 020/103] Merge content

---
 src/js/components/wallet/index.js | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js
index 14371992..f5dc4572 100644
--- a/src/js/components/wallet/index.js
+++ b/src/js/components/wallet/index.js
@@ -2,7 +2,6 @@
 
 
 import * as React from 'react';
-import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { Route, withRouter } from 'react-router-dom';
 
@@ -27,29 +26,22 @@ type ContentProps = {
     children?: React.Node
 }
 
-
-const Content = (props: ContentProps) => (
-    <article>
-        <nav>
-            <Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
-            <Route path="/device/:device/device-settings" component={DeviceSettingsTabs} />
-        </nav>
-        <Notifications />
-        <Log />
-        { props.children }
-        <Footer />
-    </article>
-);
-
 const Wallet = (props: WalletContainerProps) => (
     <div className="app">
         <Header />
         {/* <div>{ props.wallet.online ? "ONLINE" : "OFFLINE" }</div> */}
         <main>
             <AsideContainer />
-            <Content>
+            <article>
+                <nav>
+                    <Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
+                    <Route path="/device/:device/device-settings" component={DeviceSettingsTabs} />
+                </nav>
+                <Notifications />
+                <Log />
                 { props.children }
-            </Content>
+                <Footer />
+            </article>
         </main>
         <ModalContainer />
     </div>

From a314c2faedc19b8727950f4ce7c5dfa5e1093600 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 14:52:43 +0200
Subject: [PATCH 021/103] ErrorBoundary added

---
 .../wallet/account/receive/Receive.js         |  5 +++-
 .../wallet/account/send/SendForm.js           |  7 +++--
 src/js/index.js                               |  5 +---
 src/js/router/index.js                        | 30 +++++++++++--------
 src/js/support/ErrorBoundary.js               | 25 ++++++++++++++++
 src/js/utils/ethUtils.js                      |  1 -
 6 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 src/js/support/ErrorBoundary.js

diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js
index 2dc4e007..bd92bc10 100644
--- a/src/js/components/wallet/account/receive/Receive.js
+++ b/src/js/components/wallet/account/receive/Receive.js
@@ -12,6 +12,9 @@ import { Notification } from '~/js/components/common/Notification';
 import type { Props } from './index';
 
 const Wrapper = styled.div``;
+const StyledH2 = styled(H2)`
+    padding: 20px 48px;
+`;
 
 const Receive = (props: Props) => {
     const device = props.wallet.selectedDevice;
@@ -78,7 +81,7 @@ const Receive = (props: Props) => {
 
     return (
         <Wrapper>
-            <H2>Receive Ethereum or tokens</H2>
+            <StyledH2>Receive Ethereum or tokens</StyledH2>
             <div className={className}>
                 { ver }
                 <div className="value">
diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
index b78b49a5..7af77fa7 100644
--- a/src/js/components/wallet/account/send/SendForm.js
+++ b/src/js/components/wallet/account/send/SendForm.js
@@ -1,6 +1,7 @@
 /* @flow */
 
 import React, { Component } from 'react';
+import styled from 'styled-components';
 import Select from 'react-select';
 import { H2 } from '~/js/components/common/Heading';
 import AdvancedForm from './AdvancedForm';
@@ -15,7 +16,6 @@ import { findToken } from '~/js/reducers/TokensReducer';
 import type { Props } from './index';
 import type { Token } from '~/flowtype';
 
-
 export default class SendContainer extends Component<Props> {
     componentWillReceiveProps(newProps: Props) {
         calculate(this.props, newProps);
@@ -33,6 +33,9 @@ export default class SendContainer extends Component<Props> {
     }
 }
 
+const StyledH2 = styled(H2)`
+    padding: 20px 48px;
+`;
 
 const Send = (props: Props) => {
     const device = props.wallet.selectedDevice;
@@ -117,7 +120,7 @@ const Send = (props: Props) => {
 
     return (
         <section className="send-form">
-            <H2>Send Ethereum or tokens</H2>
+            <StyledH2>Send Ethereum or tokens</StyledH2>
             <div className="row address-input">
                 <label>Address</label>
                 <input
diff --git a/src/js/index.js b/src/js/index.js
index 4979d9bc..3779d71a 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -10,10 +10,7 @@ import styles from '~/styles/index.less';
 const root: ?HTMLElement = document.getElementById('root');
 if (root) {
     baseStyles();
-    render(
-        <App />,
-        root,
-    );
+    render(<App />, root);
 }
 
 window.onbeforeunload = () => {
diff --git a/src/js/router/index.js b/src/js/router/index.js
index 68ad389c..3d684345 100644
--- a/src/js/router/index.js
+++ b/src/js/router/index.js
@@ -5,6 +5,8 @@ import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
 import store, { history } from '../store';
 
+import ErrorBoundary from '~/js/support/ErrorBoundary';
+
 import LandingPageContainer from '../components/landing';
 import WalletContainer from '../components/wallet';
 import BootloaderContainer from '../components/wallet/pages/Bootloader';
@@ -29,19 +31,21 @@ const App = () => (
                 <Route exact path="/import" component={LandingPageContainer} />
                 <Route>
                     <WalletContainer>
-                        <Route exact path="/settings" component={WalletSettingsContainer} />
-                        <Route exact path="/device/:device/" component={DashboardContainer} />
-                        <Route exact path="/device/:device/network/:network" component={DashboardContainer} />
-                        <Route exact path="/device/:device/acquire" component={AcquireContainer} />
-                        <Route exact path="/device/:device/unreadable" component={UnreadableDeviceContainer} />
-                        <Route exact path="/device/:device/bootloader" component={BootloaderContainer} />
-                        <Route exact path="/device/:device/initialize" component={InitializeContainer} />
-                        <Route exact path="/device/:device/settings" component={DeviceSettingsContainer} />
-                        <Route exact path="/device/:device/network/:network/account/:account" component={SummaryContainer} />
-                        <Route path="/device/:device/network/:network/account/:account/send" component={SendFormContainer} />
-                        <Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} />
-                        <Route path="/device/:device/network/:network/account/:account/receive" component={ReceiveContainer} />
-                        <Route path="/device/:device/network/:network/account/:account/signverify" component={SignVerifyContainer} />
+                        <ErrorBoundary>
+                            <Route exact path="/settings" component={WalletSettingsContainer} />
+                            <Route exact path="/device/:device/" component={DashboardContainer} />
+                            <Route exact path="/device/:device/network/:network" component={DashboardContainer} />
+                            <Route exact path="/device/:device/acquire" component={AcquireContainer} />
+                            <Route exact path="/device/:device/unreadable" component={UnreadableDeviceContainer} />
+                            <Route exact path="/device/:device/bootloader" component={BootloaderContainer} />
+                            <Route exact path="/device/:device/initialize" component={InitializeContainer} />
+                            <Route exact path="/device/:device/settings" component={DeviceSettingsContainer} />
+                            <Route exact path="/device/:device/network/:network/account/:account" component={SummaryContainer} />
+                            <Route path="/device/:device/network/:network/account/:account/send" component={SendFormContainer} />
+                            <Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} />
+                            <Route path="/device/:device/network/:network/account/:account/receive" component={ReceiveContainer} />
+                            <Route path="/device/:device/network/:network/account/:account/signverify" component={SignVerifyContainer} />
+                        </ErrorBoundary>
                     </WalletContainer>
                 </Route>
             </Switch>
diff --git a/src/js/support/ErrorBoundary.js b/src/js/support/ErrorBoundary.js
new file mode 100644
index 00000000..f47d2581
--- /dev/null
+++ b/src/js/support/ErrorBoundary.js
@@ -0,0 +1,25 @@
+import React, { Component } from 'react';
+
+class ErrorBoundary extends Component {
+    constructor(props) {
+        super(props);
+        this.state = { hasError: false };
+    }
+
+    componentDidCatch(error, info) {
+        // Display fallback UI
+        this.setState({ hasError: true });
+        // You can also log the error to an error reporting service
+        // logErrorToMyService(error, info);
+    }
+
+    render() {
+        if (this.state.hasError) {
+        // You can render any custom fallback UI
+            return <div>Something went wrong.</div>;
+        }
+        return this.props.children;
+    }
+}
+
+export default ErrorBoundary;
\ No newline at end of file
diff --git a/src/js/utils/ethUtils.js b/src/js/utils/ethUtils.js
index 53f248e8..be1c889a 100644
--- a/src/js/utils/ethUtils.js
+++ b/src/js/utils/ethUtils.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-
 import BigNumber from 'bignumber.js';
 
 export const decimalToHex = (dec: number): string => new BigNumber(dec).toString(16);

From 6e55e8951d5c6e920ddc234c877e2a3199d1062c Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 15:28:39 +0200
Subject: [PATCH 022/103] Added duplicatrd packages webpack plugin

---
 .eslintrc                         |  1 -
 package.json                      |  1 +
 webpack/config.dev.babel.js       |  4 ++--
 webpack/config.dev.local.babel.js |  2 ++
 yarn.lock                         | 13 +++++++++++++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 3e9c178c..d228abec 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,6 @@
         "eslint-config-airbnb",
         "plugin:flowtype/recommended",
         "plugin:jest/recommended"
-        
     ],
     "env": {
         "browser": true,
diff --git a/package.json b/package.json
index 3f474cc3..1f91c6fa 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
         "babel-preset-jest": "^23.2.0",
         "babel-preset-react": "^6.24.1",
         "css-loader": "0.28.11",
+        "duplicate-package-checker-webpack-plugin": "^3.0.0",
         "eslint": "^4",
         "eslint-config-airbnb": "^17.0.0",
         "eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
diff --git a/webpack/config.dev.babel.js b/webpack/config.dev.babel.js
index d7bfe2af..fa186a2a 100644
--- a/webpack/config.dev.babel.js
+++ b/webpack/config.dev.babel.js
@@ -1,4 +1,4 @@
-
+import DuplicatePackageCheckerPlugin from 'duplicate-package-checker-webpack-plugin';
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
@@ -87,7 +87,7 @@ module.exports = {
             filename: 'index.html',
             inject: true,
         }),
-
+        new DuplicatePackageCheckerPlugin(),
         new webpack.optimize.OccurrenceOrderPlugin(),
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.HotModuleReplacementPlugin(),
diff --git a/webpack/config.dev.local.babel.js b/webpack/config.dev.local.babel.js
index e3506e9c..38569b4a 100644
--- a/webpack/config.dev.local.babel.js
+++ b/webpack/config.dev.local.babel.js
@@ -1,4 +1,5 @@
 import webpack from 'webpack';
+import DuplicatePackageCheckerPlugin from 'duplicate-package-checker-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
@@ -146,6 +147,7 @@ module.exports = {
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.HotModuleReplacementPlugin(),
         new webpack.NamedModulesPlugin(),
+        new DuplicatePackageCheckerPlugin(),
 
         new webpack.DefinePlugin({
             LOCAL: JSON.stringify(`http://localhost:${PORT}/`),
diff --git a/yarn.lock b/yarn.lock
index f1aa3e7c..3d8cccdb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3122,6 +3122,15 @@ duplexify@^3.4.2, duplexify@^3.5.3:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+duplicate-package-checker-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/duplicate-package-checker-webpack-plugin/-/duplicate-package-checker-webpack-plugin-3.0.0.tgz#78bb89e625fa7cf8c2a59c53f62b495fda9ba287"
+  dependencies:
+    chalk "^2.3.0"
+    find-root "^1.0.0"
+    lodash "^4.17.4"
+    semver "^5.4.1"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -3903,6 +3912,10 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-root@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"

From 49ad6726cbea39019f447b7bbad1f67cd5e38276 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 16:35:49 +0200
Subject: [PATCH 023/103] header less remove

---
 .eslintrc                          |  4 +++-
 src/js/components/common/Header.js |  8 +++----
 src/js/components/common/Log.js    | 12 ----------
 src/styles/header.less             | 37 ------------------------------
 src/styles/index.less              |  1 -
 5 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 src/styles/header.less

diff --git a/.eslintrc b/.eslintrc
index d228abec..06239c88 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -32,7 +32,9 @@
     ],
     "settings": {
         "import/parser": "babel-eslint",
-        "import/resolver": "babel-plugin-root-import",
+        "import/resolver": {
+            "babel-plugin-root-import": {}
+        },
         "import/ignore": [
             "\\.(scss|less|css)$"
         ]
diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 6136aed6..27b949c4 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -9,10 +9,10 @@ const Wrapper = styled.header`
     background: ${colors.HEADER};
 
     svg {
-         fill: ${colors.WHITE};
-         height: 28px;         
-         width: 100px;
-         flex: 1;
+        fill: ${colors.WHITE};
+        height: 28px;         
+        width: 100px;
+        flex: 1;
     }
 `;
 
diff --git a/src/js/components/common/Log.js b/src/js/components/common/Log.js
index d104ee32..8e516de4 100644
--- a/src/js/components/common/Log.js
+++ b/src/js/components/common/Log.js
@@ -9,20 +9,8 @@ import { H2 } from '~/js/components/common/Heading';
 import * as LogActions from '~/js/actions/LogActions';
 import type { State, Dispatch } from '~/flowtype';
 
-type Props = {
-    log: $ElementType<State, 'log'>,
-    toggle: typeof LogActions.toggle
-}
-
 const Log = (props: Props): ?React$Element<string> => {
     if (!props.log.opened) return null;
-
-    // const entries = props.log.entries.map(entry => {
-    //     return (
-
-    //     )
-    // })
-
     return (
         <div className="log">
             <button className="log-close transparent" onClick={props.toggle} />
diff --git a/src/styles/header.less b/src/styles/header.less
deleted file mode 100644
index b3a680e9..00000000
--- a/src/styles/header.less
+++ /dev/null
@@ -1,37 +0,0 @@
-header {
-    width: 100%;
-    height: 52px;
-    background: @color_header;
-
-    svg {
-        fill: @color_white;
-        height: 28px;
-        width: 100px;
-        flex: 1;
-    }
-
-    .layout-wrapper {
-        width: 100%;
-        height: 100%;
-        max-width: 1170px;
-        margin: 0 auto;
-        padding: 0 32px;
-        display: flex;
-        align-items: center;
-    }
-
-    a, a:visited {
-        color: @color_white;
-        margin-left: 24px;
-        .hover();
-        
-        &:first-child {
-            margin: 0px;
-        }
-
-        &:hover,
-        &:active {
-            color: @color_text_secondary;
-        }
-    }
-}
diff --git a/src/styles/index.less b/src/styles/index.less
index d50a8bab..8d462f9b 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -2,7 +2,6 @@
 @import './colors.less';
 @import './mixins.less';
 @import './base.less';
-@import './header.less';
 @import './aside.less';
 @import './content.less';
 @import './modal.less';

From e9581af8e88ca8e74039989331d8e4e581fa08ed Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 13 Aug 2018 17:19:04 +0200
Subject: [PATCH 024/103] Added button components

---
 src/js/components/common/Button.js            | 63 +++++++++++++++++++
 src/js/components/common/Link.js              | 14 -----
 .../components/wallet/pages/DeviceSettings.js |  5 +-
 3 files changed, 67 insertions(+), 15 deletions(-)
 create mode 100644 src/js/components/common/Button.js
 delete mode 100644 src/js/components/common/Link.js

diff --git a/src/js/components/common/Button.js b/src/js/components/common/Button.js
new file mode 100644
index 00000000..735f20b3
--- /dev/null
+++ b/src/js/components/common/Button.js
@@ -0,0 +1,63 @@
+import styled, { css } from 'styled-components';
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import colors from '~/js/config/colors';
+
+const Wrapper = styled.button`
+    padding: 12px 24px;
+    border-radius: 3px;
+    font-size: 14px;
+    font-weight: 300;
+    cursor: pointer;
+    background: ${colors.GREEN_PRIMARY};
+    color: ${colors.WHITE};
+    border: 0;
+
+    &:hover {
+        background: ${colors.GREEN_SECONDARY};
+    }
+
+    &:active {
+        background: ${colors.GREEN_TERTIARY};
+    }
+
+    ${props => props.disabled && css`
+        pointer-events: none;
+        color: ${colors.TEXT_SECONDARY};
+        background: ${colors.GRAY_LIGHT};
+    `}
+
+    ${props => props.blue && css``}
+
+    ${props => props.white && css``}
+`;
+
+const Button = ({
+    text, onClick, disabled, blue, white,
+}) => (
+    <Wrapper
+        onClick={onClick}
+        disabled={disabled}
+        blue={blue}
+        white={white}
+    >{text}
+    </Wrapper>
+);
+
+Button.propTypes = {
+    onClick: PropTypes.func,
+    disabled: PropTypes.bool,
+    blue: PropTypes.bool,
+    white: PropTypes.bool,
+    text: PropTypes.string.isRequired,
+};
+
+Button.defaultProps = {
+    onClick: () => {},
+    disabled: false,
+    blue: false,
+    white: false,
+};
+
+export default Button;
diff --git a/src/js/components/common/Link.js b/src/js/components/common/Link.js
deleted file mode 100644
index e5bb7a9c..00000000
--- a/src/js/components/common/Link.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-import colors from '~/js/config/colors';
-
-const StyledLink = styled.a`
-    color: red;
-    text-decoration
-`;
-
-const Link = ({ href, name }) => (
-    <Link href={href} />
-);
-
-export default StyledLink;
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index a02a2f62..fb2cc68f 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -3,6 +3,7 @@ import styled from 'styled-components';
 import { H2 } from '~/js/components/common/Heading';
 import Icon from '~/js/components/common/Icon';
 import colors from '~/js/config/colors';
+import Button from '~/js/components/common/Button';
 import ICONS from '~/js/constants/icons';
 import { connect } from 'react-redux';
 
@@ -37,7 +38,9 @@ export const DeviceSettings = () => (
             />
             <StyledH2>Device settings is under construction</StyledH2>
             <P>Please use Bitcoin wallet interface to change your device settings</P>
-            <a className="button" href="https://wallet.trezor.io/">Take me to the Bitcoin wallet</a>
+            <a href="https://wallet.trezor.io/">
+                <Button text="Take me to the Bitcoin wallet" />
+            </a>
         </Row>
     </Section>
 );

From eed40c53abc3e91a113352bccb24e70fb3bb4304 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 13:43:45 +0200
Subject: [PATCH 025/103] Added linter for styled-components

---
 .stylelintrc                        |   6 +-
 package.json                        |  11 +-
 src/js/components/common/Button.js  |   4 -
 src/js/components/common/Footer.js  |   2 +-
 src/js/components/common/Header.js  |   2 +-
 src/js/components/common/Heading.js |  14 +-
 yarn.lock                           | 539 ++++++++++++++++++++++++++--
 7 files changed, 524 insertions(+), 54 deletions(-)

diff --git a/.stylelintrc b/.stylelintrc
index aadcf1e1..0d7a2707 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -3,8 +3,10 @@
         "stylelint-processor-styled-components"
     ],
     "extends": [
-        "stylelint-config-standard",
+        "stylelint-config-recommended",
         "stylelint-config-styled-components"
     ],
-    "syntax": "scss"
+    "rules": {
+        "indentation": 4
+    }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 1f91c6fa..0d187df2 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,11 @@
         "dev:local": "webpack-dev-server --config ./webpack/config.dev.local.babel.js --mode development",
         "build": "rm -rf build && webpack --config ./webpack/config.prod.babel.js --progress",
         "flow": "flow check src/js",
-        "lint": "npx eslint ./src ./webpack",
-        "test-unit": "jest",
+        "lint": "run-p lint:*",
+        "lint:js": "eslint ./src/js ./webpack",
+        "lint:css": "stylelint './src/js/**/*.js'",
+        "test:*": "run-p test:*",
+        "test:unit": "jest",
         "test-unit:watch": "jest -o --watch"
     },
     "dependencies": {
@@ -35,6 +38,7 @@
         "hdkey": "^0.8.0",
         "html-webpack-plugin": "^3.2.0",
         "mini-css-extract-plugin": "^0.4.1",
+        "npm-run-all": "^4.1.3",
         "prop-types": "^15.6.2",
         "raf": "^3.4.0",
         "raven-js": "^3.22.3",
@@ -66,7 +70,7 @@
         "babel-cli": "^6.24.1",
         "babel-eslint": "^8.2.6",
         "babel-loader": "^7.1.5",
-        "babel-plugin-root-import": "^6.1.0",
+        "babel-plugin-root-import": "5",
         "babel-plugin-styled-components": "^1.5.1",
         "babel-plugin-transform-class-properties": "^6.24.1",
         "babel-plugin-transform-flow-strip-types": "^6.22.0",
@@ -90,6 +94,7 @@
         "jest": "^23.4.2",
         "less": "^3.0.1",
         "less-loader": "4.1.0",
+        "styled-components-stylefmt": "^0.1.5",
         "stylelint": "^9.4.0",
         "stylelint-config-standard": "^18.2.0",
         "stylelint-config-styled-components": "^0.1.1",
diff --git a/src/js/components/common/Button.js b/src/js/components/common/Button.js
index 735f20b3..b2e9cd43 100644
--- a/src/js/components/common/Button.js
+++ b/src/js/components/common/Button.js
@@ -27,10 +27,6 @@ const Wrapper = styled.button`
         color: ${colors.TEXT_SECONDARY};
         background: ${colors.GRAY_LIGHT};
     `}
-
-    ${props => props.blue && css``}
-
-    ${props => props.white && css``}
 `;
 
 const Button = ({
diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js
index 28e09aae..431c7475 100644
--- a/src/js/components/common/Footer.js
+++ b/src/js/components/common/Footer.js
@@ -18,7 +18,7 @@ const Wrapper = styled.div`
 `;
 
 const A = styled.a`
-    margin: 0px 6px;
+    margin: 0 6px;
     margin-right: 20px;
 `;
 
diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 27b949c4..bd10b00f 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -10,7 +10,7 @@ const Wrapper = styled.header`
 
     svg {
         fill: ${colors.WHITE};
-        height: 28px;         
+        height: 28px;
         width: 100px;
         flex: 1;
     }
diff --git a/src/js/components/common/Heading.js b/src/js/components/common/Heading.js
index 610e17bd..5906902f 100644
--- a/src/js/components/common/Heading.js
+++ b/src/js/components/common/Heading.js
@@ -9,28 +9,28 @@ const baseStyles = css`
 `;
 
 const H1 = styled.h1`
-    ${baseStyles}
+    ${baseStyles};
     font-size: 18px;
 `;
 
 const H2 = styled.h2`
     ${baseStyles};
     font-size: 16px;
-
+ 
     ${props => props.claim && css`
         font-size: 36px;
-        padding-bottom: 24px;
+        padding-bottom: 24px
     `}
 `;
 
 const H3 = styled.h3`
-  ${baseStyles};
-  font-size: 14px;
+    ${baseStyles};
+    font-size: 14px;
 `;
 
 const H4 = styled.h4`
-  ${baseStyles};
-  font-size: 12px;
+    ${baseStyles};
+    font-size: 12px;
 `;
 
 export {
diff --git a/yarn.lock b/yarn.lock
index 3d8cccdb..949f4427 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -347,6 +347,13 @@
     text-table "^0.2.0"
     webpack-log "^1.1.2"
 
+JSONStream@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
 abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -719,7 +726,7 @@ atob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
 
-autoprefixer@^6.3.1:
+autoprefixer@^6.0.0, autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
@@ -1043,9 +1050,9 @@ babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
 
-babel-plugin-root-import@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-root-import/-/babel-plugin-root-import-6.1.0.tgz#ea27407df1e920750fc247b2702e322a19f8a14f"
+babel-plugin-root-import@5:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-root-import/-/babel-plugin-root-import-5.1.0.tgz#80ea1cd5945b463a5e3f7e204a69478c573e328c"
   dependencies:
     slash "^1.0.0"
 
@@ -1544,7 +1551,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   dependencies:
@@ -1582,7 +1589,7 @@ babylon@7.0.0-beta.44:
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
-babylon@^6.17.3, babylon@^6.18.0:
+babylon@^6.12.0, babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1594,7 +1601,7 @@ bail@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3"
 
-balanced-match@^0.4.2:
+balanced-match@^0.4.0, balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
@@ -1652,6 +1659,10 @@ bindings@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
+bindings@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+
 bip66@^1.1.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
@@ -1664,7 +1675,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.1:
+bluebird@^3.0.5, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1816,7 +1827,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
@@ -1975,7 +1986,7 @@ camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
-camelcase@^2.0.0:
+camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
@@ -1992,6 +2003,10 @@ caniuse-api@^1.5.2:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
+caniuse-db@^1.0.30000187:
+  version "1.0.30000877"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000877.tgz#29ea435fdbe8a671cc5b027a75e28a816c17c340"
+
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000770"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000770.tgz#cf68ae1cb8a82f6d3c35df41c62dc6973e470244"
@@ -2234,6 +2249,14 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^3.0.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
 cliui@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
@@ -2325,6 +2348,10 @@ color-convert@^1.3.0, color-convert@^1.9.0:
   dependencies:
     color-name "^1.1.1"
 
+color-diff@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
+
 color-hash@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/color-hash/-/color-hash-1.0.3.tgz#c0e7952f06d022e548e65da239512bd67d3809ee"
@@ -2347,6 +2374,21 @@ color@^0.11.0:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
+colorguard@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.1.tgz#249647c9702481d9143384fc9813662311afde98"
+  dependencies:
+    chalk "^1.1.1"
+    color-diff "^0.1.3"
+    log-symbols "^1.0.2"
+    object-assign "^4.0.1"
+    pipetteur "^2.0.0"
+    plur "^2.0.0"
+    postcss "^5.0.4"
+    postcss-reporter "^1.2.1"
+    text-table "^0.2.0"
+    yargs "^1.2.6"
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -2387,6 +2429,10 @@ commander@^2.11.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a"
 
+commander@^2.9.0:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -2538,6 +2584,18 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cosmiconfig@^2.1.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
 cosmiconfig@^5.0.0:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
@@ -2599,7 +2657,7 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.4, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
@@ -2646,6 +2704,20 @@ css-color-keywords@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
 
+css-color-list@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/css-color-list/-/css-color-list-0.0.1.tgz#8718e8695ae7a2cc8787be8715f1c008a7f28b15"
+  dependencies:
+    css-color-names "0.0.1"
+
+css-color-names@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.1.tgz#5d0548fa256456ede4a9a0c2ac7ab19d3eb1ad81"
+
+css-color-names@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
+
 css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -2669,6 +2741,15 @@ css-loader@0.28.11:
     postcss-value-parser "^3.3.0"
     source-list-map "^2.0.0"
 
+css-rule-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
+  dependencies:
+    css-tokenize "^1.0.1"
+    duplexer2 "0.0.2"
+    ldjson-stream "^1.2.1"
+    through2 "^0.6.3"
+
 css-select@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
@@ -2694,6 +2775,13 @@ css-to-react-native@^2.0.3:
     fbjs "^0.8.5"
     postcss-value-parser "^3.3.0"
 
+css-tokenize@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^1.0.33"
+
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -2806,7 +2894,14 @@ dateformat@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+deasync@^0.1.11:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.13.tgz#815c2b69bbd1117cae570152cd895661c09f20ea"
+  dependencies:
+    bindings "~1.2.1"
+    nan "^2.0.7"
+
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -2967,7 +3062,7 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
-diff@^3.2.0, diff@^3.3.1, diff@^3.5.0:
+diff@^3.1.0, diff@^3.2.0, diff@^3.3.1, diff@^3.4.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -3016,6 +3111,23 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
+doiuse@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
+  dependencies:
+    browserslist "^1.1.1"
+    caniuse-db "^1.0.30000187"
+    css-rule-stream "^1.1.0"
+    duplexer2 "0.0.2"
+    jsonfilter "^1.1.2"
+    ldjson-stream "^1.2.1"
+    lodash "^4.0.0"
+    multimatch "^2.0.0"
+    postcss "^5.0.8"
+    source-map "^0.4.2"
+    through2 "^0.6.3"
+    yargs "^3.5.4"
+
 dom-align@1.x:
   version "1.6.7"
   resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.6.7.tgz#6858138efb6b77405ce99146d0be5e4f7282813f"
@@ -3105,6 +3217,12 @@ drbg.js@^1.0.1:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
 
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  dependencies:
+    readable-stream "~1.1.9"
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -3141,6 +3259,16 @@ editions@^1.3.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
 
+editorconfig@^0.13.2:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
+  dependencies:
+    bluebird "^3.0.5"
+    commander "^2.9.0"
+    lru-cache "^3.2.0"
+    semver "^5.1.0"
+    sigmund "^1.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -4090,6 +4218,10 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
+gather-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4111,6 +4243,10 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
+get-stdin@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
 get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
@@ -4228,7 +4364,7 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^6.1.0:
+globby@^6.0.0, globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
@@ -4692,7 +4828,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.3:
+ignore@^3.2.0, ignore@^3.3.3:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
 
@@ -4729,7 +4865,7 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
-indent-string@^3.0.0:
+indent-string@^3.0.0, indent-string@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
 
@@ -4838,6 +4974,10 @@ ipaddr.js@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
 
+irregular-plurals@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -5565,7 +5705,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -5708,10 +5848,23 @@ json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
+jsonfilter@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
+  dependencies:
+    JSONStream "^0.8.4"
+    minimist "^1.1.0"
+    stream-combiner "^0.2.1"
+    through2 "^0.6.3"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonparse@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5770,6 +5923,10 @@ kleur@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.1.tgz#7cc64b0d188d0dcbc98bdcdfdda2cc10619ddce8"
 
+known-css-properties@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.2.0.tgz#899c94be368e55b42d7db8d5be7d73a4a4a41454"
+
 known-css-properties@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.6.1.tgz#31b5123ad03d8d1a3f36bd4155459c981173478b"
@@ -5784,6 +5941,13 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+ldjson-stream@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
+  dependencies:
+    split2 "^0.2.1"
+    through2 "^0.6.1"
+
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -5964,11 +6128,15 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
+lodash.unescape@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -6047,6 +6215,12 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
+lru-cache@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
+  dependencies:
+    pseudomap "^1.0.1"
+
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -6114,7 +6288,7 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
-mathml-tag-names@^2.0.1:
+mathml-tag-names@^2.0.0, mathml-tag-names@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
 
@@ -6173,6 +6347,10 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+
 meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -6354,7 +6532,7 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -6442,14 +6620,14 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
+nan@^2.0.7, nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
 nan@^2.2.1, nan@^2.3.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
-nan@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -6659,6 +6837,20 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-run-all@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
+  dependencies:
+    ansi-styles "^3.2.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.4"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    ps-tree "^1.1.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6776,6 +6968,10 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+onecolor@^3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.5.tgz#36eff32201379efdf1180fb445e51a8e2425f9f6"
+
 onetime@^1.0.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
@@ -6829,10 +7025,16 @@ os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
-os-homedir@^1.0.0:
+os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -7109,6 +7311,13 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pipetteur@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
+  dependencies:
+    onecolor "^3.0.4"
+    synesthesia "^1.0.1"
+
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -7121,6 +7330,12 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+plur@^2.0.0, plur@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
+  dependencies:
+    irregular-plurals "^1.0.0"
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -7208,6 +7423,12 @@ postcss-html@^0.31.0:
   dependencies:
     htmlparser2 "^3.9.2"
 
+postcss-less@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
+  dependencies:
+    postcss "^5.0.21"
+
 postcss-less@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-2.0.0.tgz#5d190b8e057ca446d60fe2e2587ad791c9029fb8"
@@ -7221,7 +7442,7 @@ postcss-markdown@^0.31.0:
     remark "^9.0.0"
     unist-util-find-all-after "^1.0.2"
 
-postcss-media-query-parser@^0.2.3:
+postcss-media-query-parser@^0.2.0, postcss-media-query-parser@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
 
@@ -7356,6 +7577,24 @@ postcss-reduce-transforms@^1.0.3:
     postcss "^5.0.8"
     postcss-value-parser "^3.0.1"
 
+postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-reporter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
 postcss-reporter@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3"
@@ -7382,13 +7621,19 @@ postcss-sass@^0.3.0:
     gonzales-pe "4.2.3"
     postcss "6.0.22"
 
+postcss-scss@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
+  dependencies:
+    postcss "^5.2.13"
+
 postcss-scss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
   dependencies:
     postcss "^7.0.0"
 
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
   dependencies:
@@ -7404,6 +7649,13 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-sorting@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-2.1.0.tgz#32b1e9afa913bb225a6ad076d503d8f983bb4a82"
+  dependencies:
+    lodash "^4.17.4"
+    postcss "^5.2.17"
+
 postcss-styled@^0.31.0:
   version "0.31.0"
   resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.31.0.tgz#ab532a2b3c469dfcca306a7623c4d4a98bb077d5"
@@ -7449,7 +7701,7 @@ postcss@6.0.22:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.4, postcss@^5.2.5:
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
   dependencies:
@@ -7599,13 +7851,13 @@ prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
 
-ps-tree@^1.0.1:
+ps-tree@^1.0.1, ps-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
   dependencies:
     event-stream "~3.3.0"
 
-pseudomap@^1.0.2:
+pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -7943,6 +8195,12 @@ read-chunk@^2.1.0:
     pify "^3.0.0"
     safe-buffer "^5.1.1"
 
+read-file-stdin@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
+  dependencies:
+    gather-stream "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8000,7 +8258,7 @@ read-pkg@^3.0.0:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
+readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -8009,6 +8267,15 @@ readable-stream@1.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readable-stream@^1.0.33, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^2.0.1, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -8350,6 +8617,10 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -8579,7 +8850,11 @@ selfsigned@^1.9.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@^5.4.1, semver@^5.5.0:
+semver@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+semver@^5.1.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -8716,6 +8991,10 @@ shortid@^2.2.8:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -8840,7 +9119,7 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, sourc
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.4.4:
+source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -8887,6 +9166,10 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
+specificity@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42"
+
 specificity@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.0.tgz#301b1ab5455987c37d6d94f8c956ef9d9fb48c1d"
@@ -8897,6 +9180,12 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+split2@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
+  dependencies:
+    through2 "~0.6.1"
+
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -8946,6 +9235,10 @@ static-extend@^0.1.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
 
+stdin@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/stdin/-/stdin-0.0.1.tgz#d3041981aaec3dfdbc77a1b38d6372e38f5fb71e"
+
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -8957,6 +9250,13 @@ stream-browserify@^2.0.1:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
+stream-combiner@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  dependencies:
+    duplexer "~0.1.1"
+    through "~2.3.4"
+
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -9118,6 +9418,24 @@ style-search@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
 
+styled-components-stylefmt@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/styled-components-stylefmt/-/styled-components-stylefmt-0.1.5.tgz#90f54a8c0a8b0eb640977759bff592482f6f751a"
+  dependencies:
+    babel-traverse "^6.26.0"
+    babylon "^6.18.0"
+    chalk "^2.3.0"
+    deasync "^0.1.11"
+    detect-newline "^2.1.0"
+    diff "^3.4.0"
+    escape-string-regexp "^1.0.5"
+    globby "^7.1.1"
+    indent-string "^3.2.0"
+    minimist "^1.2.0"
+    postcss "^5.2.17"
+    stylefmt "^5.3.2"
+    stylelint-processor-styled-components "^0.1.2"
+
 styled-components@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686"
@@ -9137,6 +9455,40 @@ styled-normalize@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/styled-normalize/-/styled-normalize-8.0.0.tgz#54881c9389540bf9fb2a3d34dca2e2d4d68601f2"
 
+stylefmt@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/stylefmt/-/stylefmt-5.3.2.tgz#32013437aa54d8c5253cbc107ac914dfb5ee9eea"
+  dependencies:
+    chalk "^1.1.3"
+    css-color-list "0.0.1"
+    diff "^3.1.0"
+    editorconfig "^0.13.2"
+    globby "^6.1.0"
+    minimist "^1.2.0"
+    postcss "^5.2.5"
+    postcss-scss "^0.4.0"
+    postcss-sorting "^2.0.1"
+    postcss-value-parser "^3.3.0"
+    stdin "0.0.1"
+    stylelint "^7.5.0"
+    stylelint-order "0.4.x"
+
+stylehacks@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
+  dependencies:
+    browserslist "^1.1.3"
+    chalk "^1.1.1"
+    log-symbols "^1.0.2"
+    minimist "^1.2.0"
+    plur "^2.1.2"
+    postcss "^5.0.18"
+    postcss-reporter "^1.3.3"
+    postcss-selector-parser "^2.0.0"
+    read-file-stdin "^0.2.1"
+    text-table "^0.2.0"
+    write-file-stdout "0.0.2"
+
 stylelint-config-recommended@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858"
@@ -9151,6 +9503,23 @@ stylelint-config-styled-components@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz#b408388d7c687833ab4be4c4e6522d97d2827ede"
 
+stylelint-order@0.4.x:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.4.4.tgz#db7dfca0541b5062010c7e2e21e745791fc088ac"
+  dependencies:
+    lodash "^4.17.4"
+    postcss "^5.2.16"
+    stylelint "^7.9.0"
+
+stylelint-processor-styled-components@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-0.1.2.tgz#b760efb49fe56fe625ca99b4b9b2b2fab4dc507c"
+  dependencies:
+    babel-traverse "^6.16.0"
+    babylon "^6.12.0"
+    typescript "~2.3.2"
+    typescript-eslint-parser "^3.0.0"
+
 stylelint-processor-styled-components@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.3.2.tgz#092cf8fb064b31c6d0d3bedf0c4844349e1e8f0f"
@@ -9159,6 +9528,50 @@ stylelint-processor-styled-components@^1.3.2:
     babylon "^7.0.0-beta.40"
     postcss "^6.0.14"
 
+stylelint@^7.5.0, stylelint@^7.9.0:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.13.0.tgz#111f97b6da72e775c80800d6bb6f5f869997785d"
+  dependencies:
+    autoprefixer "^6.0.0"
+    balanced-match "^0.4.0"
+    chalk "^2.0.1"
+    colorguard "^1.2.0"
+    cosmiconfig "^2.1.1"
+    debug "^2.6.0"
+    doiuse "^2.4.1"
+    execall "^1.0.0"
+    file-entry-cache "^2.0.0"
+    get-stdin "^5.0.0"
+    globby "^6.0.0"
+    globjoin "^0.1.4"
+    html-tags "^2.0.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    known-css-properties "^0.2.0"
+    lodash "^4.17.4"
+    log-symbols "^1.0.2"
+    mathml-tag-names "^2.0.0"
+    meow "^3.3.0"
+    micromatch "^2.3.11"
+    normalize-selector "^0.2.0"
+    pify "^2.3.0"
+    postcss "^5.0.20"
+    postcss-less "^0.14.0"
+    postcss-media-query-parser "^0.2.0"
+    postcss-reporter "^3.0.0"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-scss "^0.4.0"
+    postcss-selector-parser "^2.1.1"
+    postcss-value-parser "^3.1.1"
+    resolve-from "^3.0.0"
+    specificity "^0.3.0"
+    string-width "^2.0.0"
+    style-search "^0.1.0"
+    stylehacks "^2.3.2"
+    sugarss "^0.2.0"
+    svg-tags "^1.0.0"
+    table "^4.0.1"
+
 stylelint@^9.4.0:
   version "9.4.0"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.4.0.tgz#2f2b82ae9db53a06735ae0724f41b134fdb84a10"
@@ -9216,6 +9629,12 @@ stylis@^3.0.0, stylis@^3.5.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546"
 
+sugarss@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+  dependencies:
+    postcss "^5.2.4"
+
 sugarss@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
@@ -9282,6 +9701,12 @@ symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
+synesthesia@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
+  dependencies:
+    css-color-names "0.0.3"
+
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -9370,6 +9795,13 @@ throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
 
+through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  dependencies:
+    readable-stream ">=1.0.33-1 <1.1.0-0"
+    xtend ">=4.0.0 <4.1.0-0"
+
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -9377,7 +9809,7 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, through@^2.3.6, through@~2.3, through@~2.3.1:
+through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -9543,6 +9975,17 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
+typescript-eslint-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-3.0.0.tgz#dd0435b303abc841464c02d00184d7b39bd488b5"
+  dependencies:
+    lodash.unescape "4.0.1"
+    semver "5.3.0"
+
+typescript@~2.3.2:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"
+
 ua-parser-js@^0.7.18:
   version "0.7.18"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
@@ -10154,6 +10597,10 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
+window-size@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -10199,6 +10646,10 @@ write-file-atomic@^2.1.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-file-stdout@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -10227,11 +10678,11 @@ xmlhttprequest@*:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
-y18n@^3.2.1:
+y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
@@ -10276,6 +10727,10 @@ yargs@11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^1.2.6:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
+
 yargs@^11.0.0, yargs@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
@@ -10293,6 +10748,18 @@ yargs@^11.0.0, yargs@^11.1.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^3.5.4:
+  version "3.32.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  dependencies:
+    camelcase "^2.0.1"
+    cliui "^3.0.3"
+    decamelize "^1.1.1"
+    os-locale "^1.4.0"
+    string-width "^1.0.1"
+    window-size "^0.1.4"
+    y18n "^3.2.0"
+
 yargs@~1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"

From 3ad791a7528f5d75ccba9d689a1e85438d0753c3 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 13:55:25 +0200
Subject: [PATCH 026/103] Added linter for styled-components 2

---
 .stylelintrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.stylelintrc b/.stylelintrc
index 0d7a2707..045010a1 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -7,6 +7,7 @@
         "stylelint-config-styled-components"
     ],
     "rules": {
-        "indentation": 4
+        "indentation": 4,
+        "block-no-empty": null
     }
 }
\ No newline at end of file

From b3bfff997a16b3def4052d5bfb5e738f0834d0b9 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 13:55:56 +0200
Subject: [PATCH 027/103] Watch all tests at start

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d187df2..83629876 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
         "lint:css": "stylelint './src/js/**/*.js'",
         "test:*": "run-p test:*",
         "test:unit": "jest",
-        "test-unit:watch": "jest -o --watch"
+        "test-unit:watch": "jest -o --watchAll"
     },
     "dependencies": {
         "babel": "^6.23.0",

From 52fcaa3d8c3cea2c7998d3d51e557b6a90318b35 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 14:56:47 +0200
Subject: [PATCH 028/103] Make better imports

---
 .babelrc                                      |  15 +-
 .eslintrc                                     |   7 +-
 jsonconfig.json                               |  16 +
 package.json                                  |   9 +-
 src/flowtype/index.js                         |  48 +-
 src/js/actions/AccountsActions.js             |   2 +-
 src/js/actions/DiscoveryActions.js            |   2 +-
 src/js/actions/LocalStorageActions.js         |   6 +-
 src/js/actions/LogActions.js                  |   2 +-
 src/js/actions/ModalActions.js                |   2 +-
 src/js/actions/NotificationActions.js         |   2 +-
 src/js/actions/ReceiveActions.js              |   2 +-
 src/js/actions/SelectedAccountActions.js      |   2 +-
 src/js/actions/SendFormActions.js             |   2 +-
 src/js/actions/SessionStorageActions.js       |   2 +-
 src/js/actions/SummaryActions.js              |   2 +-
 src/js/actions/TokenActions.js                |   2 +-
 src/js/actions/TrezorConnectActions.js        |   2 +-
 src/js/actions/WalletActions.js               |   2 +-
 src/js/actions/Web3Actions.js                 |   2 +-
 src/js/components/common/Button.js            |   2 +-
 src/js/components/common/Footer.js            |   4 +-
 src/js/components/common/Header.js            |   2 +-
 src/js/components/common/Heading.js           |   2 +-
 src/js/components/common/Log.js               |   6 +-
 src/js/components/common/Notification.js      |   8 +-
 src/js/components/landing/ConnectDevice.js    |   4 +-
 src/js/components/landing/InstallBridge.js    |   2 +-
 src/js/components/landing/LandingPage.js      |   2 +-
 src/js/components/landing/index.js            |   2 +-
 src/js/components/modal/ConfirmAddress.js     |   2 +-
 src/js/components/modal/DuplicateDevice.js    |   2 +-
 src/js/components/modal/index.js              |  12 +-
 .../wallet/account/SelectedAccount.js         |   8 +-
 .../wallet/account/receive/Receive.js         |   4 +-
 .../wallet/account/receive/index.js           |   6 +-
 .../account/send/PendingTransactions.js       |   8 +-
 .../wallet/account/send/SendForm.js           |  10 +-
 .../components/wallet/account/send/index.js   |   6 +-
 .../wallet/account/sign/SignVerify.js         |   4 +-
 .../wallet/account/summary/Summary.js         |  10 +-
 .../wallet/account/summary/SummaryDetails.js  |   2 +-
 .../wallet/account/summary/SummaryTokens.js   |   2 +-
 .../wallet/account/summary/index.js           |   6 +-
 .../wallet/aside/AccountSelection.js          |   8 +-
 src/js/components/wallet/aside/Aside.js       |   2 +-
 .../components/wallet/aside/CoinSelection.js  |   2 +-
 .../wallet/aside/DeviceSelection.js           |   2 +-
 .../wallet/aside/StickyContainer.js           |   2 +-
 src/js/components/wallet/aside/index.js       |   6 +-
 src/js/components/wallet/index.js             |   2 +-
 src/js/components/wallet/pages/Acquire.js     |   6 +-
 src/js/components/wallet/pages/Bootloader.js  |   2 +-
 src/js/components/wallet/pages/Dashboard.js   |   4 +-
 .../components/wallet/pages/DeviceSettings.js |  10 +-
 src/js/components/wallet/pages/Initialize.js  |   2 +-
 .../wallet/pages/UnreadableDevice.js          |   6 +-
 src/js/index.js                               |   4 +-
 src/js/reducers/AccountsReducer.js            |   2 +-
 src/js/reducers/DevicesReducer.js             |   2 +-
 src/js/reducers/DiscoveryReducer.js           |   2 +-
 src/js/reducers/FiatRateReducer.js            |   2 +-
 src/js/reducers/LocalStorageReducer.js        |   2 +-
 src/js/reducers/LogReducer.js                 |   2 +-
 src/js/reducers/ModalReducer.js               |   2 +-
 src/js/reducers/NotificationReducer.js        |   2 +-
 src/js/reducers/PendingTxReducer.js           |   2 +-
 src/js/reducers/ReceiveReducer.js             |   2 +-
 src/js/reducers/SelectedAccountReducer.js     |   2 +-
 src/js/reducers/SendFormReducer.js            |   2 +-
 src/js/reducers/SummaryReducer.js             |   2 +-
 src/js/reducers/TokensReducer.js              |   2 +-
 src/js/reducers/TrezorConnectReducer.js       |   2 +-
 src/js/reducers/WalletReducer.js              |   2 +-
 src/js/reducers/Web3Reducer.js                |   2 +-
 src/js/reducers/utils/index.js                |   8 +-
 src/js/router/index.js                        |   2 +-
 src/js/services/CoinmarketcapService.js       |   2 +-
 src/js/services/LocalStorageService.js        |   4 +-
 src/js/services/LogService.js                 |   2 +-
 src/js/services/RouterService.js              |   2 +-
 src/js/services/TrezorConnectService.js       |   2 +-
 src/js/services/WalletService.js              |   2 +-
 src/js/store/index.js                         |   2 +-
 yarn.lock                                     | 742 ++++--------------
 85 files changed, 328 insertions(+), 777 deletions(-)
 create mode 100644 jsonconfig.json

diff --git a/.babelrc b/.babelrc
index 8194dcfa..f559b444 100644
--- a/.babelrc
+++ b/.babelrc
@@ -15,9 +15,18 @@
             "polyfill": false,
             "regenerator": true
         }],
-        ["babel-plugin-root-import", {
-            "rootPathSuffix": "./src",
-            "rootPathPrefix": "~"
+        ["module-resolver", {
+            "root": ["."],
+            "alias": {
+                "config": "./src/js/config",
+                "constants": "./src/js/constants",
+                "components": "./src/js/components",
+                "actions": "./src/js/actions",
+                "reducers": "./src/js/reducers",
+                "support": "./src/js/support",
+                "utils": "./src/js/utils",
+                "services": "./src/js/services"
+            }
         }],
         "babel-plugin-styled-components"
     ],
diff --git a/.eslintrc b/.eslintrc
index 06239c88..121738b5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -25,16 +25,15 @@
         "spaced-comment": 0
     },
     "plugins": [
-        "react",
         "import",
+        "react",
         "jest",
         "flowtype"
     ],
     "settings": {
-        "import/parser": "babel-eslint",
         "import/resolver": {
-            "babel-plugin-root-import": {}
-        },
+            "babel-module": {}
+          },
         "import/ignore": [
             "\\.(scss|less|css)$"
         ]
diff --git a/jsonconfig.json b/jsonconfig.json
new file mode 100644
index 00000000..040f71ee
--- /dev/null
+++ b/jsonconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": [
+                "src/*"
+            ],
+            "components/*": [
+                "./js/config/*"
+            ],
+            "config/*": [
+                "./js/config/*"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 83629876..440f3656 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
         "babel-cli": "^6.24.1",
         "babel-eslint": "^8.2.6",
         "babel-loader": "^7.1.5",
-        "babel-plugin-root-import": "5",
+        "babel-plugin-module-resolver": "^3.1.1",
         "babel-plugin-styled-components": "^1.5.1",
         "babel-plugin-transform-class-properties": "^6.24.1",
         "babel-plugin-transform-flow-strip-types": "^6.22.0",
@@ -81,11 +81,11 @@
         "babel-preset-react": "^6.24.1",
         "css-loader": "0.28.11",
         "duplicate-package-checker-webpack-plugin": "^3.0.0",
-        "eslint": "^4",
+        "eslint": "^5.3.0",
         "eslint-config-airbnb": "^17.0.0",
-        "eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
+        "eslint-import-resolver-babel-module": "^4.0.0",
         "eslint-plugin-flowtype": "^2.50.0",
-        "eslint-plugin-import": "^2.13.0",
+        "eslint-plugin-import": "^2.14.0",
         "eslint-plugin-jest": "^21.18.0",
         "eslint-plugin-jsx-a11y": "^6.1.1",
         "eslint-plugin-react": "^7.10.0",
@@ -94,7 +94,6 @@
         "jest": "^23.4.2",
         "less": "^3.0.1",
         "less-loader": "4.1.0",
-        "styled-components-stylefmt": "^0.1.5",
         "stylelint": "^9.4.0",
         "stylelint-config-standard": "^18.2.0",
         "stylelint-config-styled-components": "^0.1.1",
diff --git a/src/flowtype/index.js b/src/flowtype/index.js
index 74d33214..635c1557 100644
--- a/src/flowtype/index.js
+++ b/src/flowtype/index.js
@@ -11,25 +11,25 @@ import type {
     PlainDispatch as ReduxPlainDispatch,
 } from 'redux';
 
-import type { Reducers, ReducersState } from '~/js/reducers';
+import type { Reducers, ReducersState } from 'reducers';
 
 // Actions
-import type { SelectedAccountAction } from '~/js/actions/SelectedAccountActions';
-import type { AccountAction } from '~/js/actions/AccountsActions';
-import type { DiscoveryAction } from '~/js/actions/DiscoveryActions';
-import type { StorageAction } from '~/js/actions/LocalStorageActions';
-import type { LogAction } from '~/js/actions/LogActions';
-import type { ModalAction } from '~/js/actions/ModalActions';
-import type { NotificationAction } from '~/js/actions/NotificationActions';
-import type { PendingTxAction } from '~/js/actions/PendingTxActions';
-import type { ReceiveAction } from '~/js/actions/ReceiveActions';
-import type { SendFormAction } from '~/js/actions/SendFormActions';
-import type { SummaryAction } from '~/js/actions/SummaryActions';
-import type { TokenAction } from '~/js/actions/TokenActions';
-import type { TrezorConnectAction } from '~/js/actions/TrezorConnectActions';
-import type { WalletAction } from '~/js/actions/WalletActions';
-import type { Web3Action } from '~/js/actions/Web3Actions';
-import type { FiatRateAction } from '~/js/services/CoinmarketcapService'; // this service has no action file, all is written inside one file
+import type { SelectedAccountAction } from 'actions/SelectedAccountActions';
+import type { AccountAction } from 'actions/AccountsActions';
+import type { DiscoveryAction } from 'actions/DiscoveryActions';
+import type { StorageAction } from 'actions/LocalStorageActions';
+import type { LogAction } from 'actions/LogActions';
+import type { ModalAction } from 'actions/ModalActions';
+import type { NotificationAction } from 'actions/NotificationActions';
+import type { PendingTxAction } from 'actions/PendingTxActions';
+import type { ReceiveAction } from 'actions/ReceiveActions';
+import type { SendFormAction } from 'actions/SendFormActions';
+import type { SummaryAction } from 'actions/SummaryActions';
+import type { TokenAction } from 'actions/TokenActions';
+import type { TrezorConnectAction } from 'actions/TrezorConnectActions';
+import type { WalletAction } from 'actions/WalletActions';
+import type { Web3Action } from 'actions/Web3Actions';
+import type { FiatRateAction } from 'services/CoinmarketcapService'; // this service has no action file, all is written inside one file
 
 import type {
     Device,
@@ -68,7 +68,7 @@ export type UnknownDevice = $Exact<{
     +label: string,
     +features: null,
     state: ?string,
-    
+
     remember: boolean; // device should be remembered
     connected: boolean; // device is connected
     available: boolean; // device cannot be used because of features.passphrase_protection is different then expected
@@ -135,12 +135,12 @@ export type Action =
 export type State = ReducersState;
 
 // reexport reduces types
-export type { Coin } from '~/js/reducers/LocalStorageReducer';
-export type { Account } from '~/js/reducers/AccountsReducer';
-export type { Discovery } from '~/js/reducers/DiscoveryReducer';
-export type { Token } from '~/js/reducers/TokensReducer';
-export type { Web3Instance } from '~/js/reducers/Web3Reducer';
-export type { PendingTx } from '~/js/reducers/PendingTxReducer';
+export type { Coin } from 'reducers/LocalStorageReducer';
+export type { Account } from 'reducers/AccountsReducer';
+export type { Discovery } from 'reducers/DiscoveryReducer';
+export type { Token } from 'reducers/TokensReducer';
+export type { Web3Instance } from 'reducers/Web3Reducer';
+export type { PendingTx } from 'reducers/PendingTxReducer';
 
 export type Accounts = $ElementType<State, 'accounts'>;
 export type LocalStorage = $ElementType<State, 'localStorage'>;
diff --git a/src/js/actions/AccountsActions.js b/src/js/actions/AccountsActions.js
index 19ab2af7..13dd4853 100644
--- a/src/js/actions/AccountsActions.js
+++ b/src/js/actions/AccountsActions.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import * as ACCOUNT from './constants/account';
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 import type { State } from '../reducers/AccountsReducer';
 
 export type AccountAction =
diff --git a/src/js/actions/DiscoveryActions.js b/src/js/actions/DiscoveryActions.js
index e7e76445..02562f51 100644
--- a/src/js/actions/DiscoveryActions.js
+++ b/src/js/actions/DiscoveryActions.js
@@ -14,7 +14,7 @@ import { setBalance as setTokenBalance } from './TokenActions';
 
 import type {
     ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice,
-} from '~/flowtype';
+} from 'flowtype';
 
 import type { Discovery, State } from '../reducers/DiscoveryReducer';
 
diff --git a/src/js/actions/LocalStorageActions.js b/src/js/actions/LocalStorageActions.js
index b66a1b33..443593be 100644
--- a/src/js/actions/LocalStorageActions.js
+++ b/src/js/actions/LocalStorageActions.js
@@ -11,11 +11,11 @@ import { JSONRequest, httpRequest } from '../utils/networkUtils';
 
 import type {
     ThunkAction, AsyncAction, GetState, Dispatch, TrezorDevice,
-} from '~/flowtype';
+} from 'flowtype';
 import type { Config, Coin, TokensCollection } from '../reducers/LocalStorageReducer';
 
-import AppConfigJSON from '~/data/appConfig.json';
-import Erc20AbiJSON from '~/data/ERC20Abi.json';
+import AppConfigJSON from 'data/appConfig.json';
+import Erc20AbiJSON from 'data/ERC20Abi.json';
 
 export type StorageAction = {
     type: typeof STORAGE.READY,
diff --git a/src/js/actions/LogActions.js b/src/js/actions/LogActions.js
index be9b3b13..871c8fe6 100644
--- a/src/js/actions/LogActions.js
+++ b/src/js/actions/LogActions.js
@@ -5,7 +5,7 @@ import * as LOG from './constants/log';
 
 import type {
     Action, ThunkAction, GetState, Dispatch,
-} from '~/flowtype';
+} from 'flowtype';
 import type { LogEntry } from '../reducers/LogReducer';
 
 export type LogAction = {
diff --git a/src/js/actions/ModalActions.js b/src/js/actions/ModalActions.js
index ba73a0dd..53eee676 100644
--- a/src/js/actions/ModalActions.js
+++ b/src/js/actions/ModalActions.js
@@ -8,7 +8,7 @@ import * as CONNECT from './constants/TrezorConnect';
 
 import type {
     ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice,
-} from '~/flowtype';
+} from 'flowtype';
 import type { State } from '../reducers/ModalReducer';
 
 export type ModalAction = {
diff --git a/src/js/actions/NotificationActions.js b/src/js/actions/NotificationActions.js
index ae6c9557..c2fd37c6 100644
--- a/src/js/actions/NotificationActions.js
+++ b/src/js/actions/NotificationActions.js
@@ -5,7 +5,7 @@ import * as NOTIFICATION from './constants/notification';
 
 import type {
     Action, AsyncAction, GetState, Dispatch, RouterLocationState,
-} from '~/flowtype';
+} from 'flowtype';
 import type { CallbackAction } from '../reducers/NotificationReducer';
 
 export type NotificationAction = {
diff --git a/src/js/actions/ReceiveActions.js b/src/js/actions/ReceiveActions.js
index 60a8a087..239331b6 100644
--- a/src/js/actions/ReceiveActions.js
+++ b/src/js/actions/ReceiveActions.js
@@ -10,7 +10,7 @@ import type { State } from '../reducers/ReceiveReducer';
 
 import type {
     TrezorDevice, ThunkAction, AsyncAction, Action, GetState, Dispatch,
-} from '~/flowtype';
+} from 'flowtype';
 
 export type ReceiveAction = {
     type: typeof RECEIVE.INIT,
diff --git a/src/js/actions/SelectedAccountActions.js b/src/js/actions/SelectedAccountActions.js
index 9d18709a..5887f901 100644
--- a/src/js/actions/SelectedAccountActions.js
+++ b/src/js/actions/SelectedAccountActions.js
@@ -22,7 +22,7 @@ import type {
     GetState,
     Dispatch,
     State,
-} from '~/flowtype';
+} from 'flowtype';
 
 
 export type SelectedAccountAction = {
diff --git a/src/js/actions/SendFormActions.js b/src/js/actions/SendFormActions.js
index b1711e6e..3438312b 100644
--- a/src/js/actions/SendFormActions.js
+++ b/src/js/actions/SendFormActions.js
@@ -28,7 +28,7 @@ import type {
     AsyncAction,
     RouterLocationState,
     TrezorDevice,
-} from '~/flowtype';
+} from 'flowtype';
 import type { State as AccountState } from '../reducers/SelectedAccountReducer';
 import type { Web3Instance } from '../reducers/Web3Reducer';
 import type { Config, Coin } from '../reducers/LocalStorageReducer';
diff --git a/src/js/actions/SessionStorageActions.js b/src/js/actions/SessionStorageActions.js
index 5aeed2b6..51fcb475 100644
--- a/src/js/actions/SessionStorageActions.js
+++ b/src/js/actions/SessionStorageActions.js
@@ -6,7 +6,7 @@ import type {
     ThunkAction,
     GetState,
     Dispatch,
-} from '~/flowtype';
+} from 'flowtype';
 
 const PREFIX: string = 'trezor:draft-tx:';
 
diff --git a/src/js/actions/SummaryActions.js b/src/js/actions/SummaryActions.js
index 9d3d3c91..203affff 100644
--- a/src/js/actions/SummaryActions.js
+++ b/src/js/actions/SummaryActions.js
@@ -9,7 +9,7 @@ import { initialState } from '../reducers/SummaryReducer';
 
 import type {
     ThunkAction, AsyncAction, Action, GetState, Dispatch,
-} from '~/flowtype';
+} from 'flowtype';
 import type { State } from '../reducers/SummaryReducer';
 import type { Token } from '../reducers/TokensReducer';
 
diff --git a/src/js/actions/TokenActions.js b/src/js/actions/TokenActions.js
index 3918fdfa..296159ae 100644
--- a/src/js/actions/TokenActions.js
+++ b/src/js/actions/TokenActions.js
@@ -6,7 +6,7 @@ import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions';
 
 import type {
     GetState, AsyncAction, Action, Dispatch,
-} from '~/flowtype';
+} from 'flowtype';
 import type { State, Token } from '../reducers/TokensReducer';
 import type { Account } from '../reducers/AccountsReducer';
 import type { NetworkToken } from '../reducers/LocalStorageReducer';
diff --git a/src/js/actions/TrezorConnectActions.js b/src/js/actions/TrezorConnectActions.js
index 63318b0f..afd6867d 100644
--- a/src/js/actions/TrezorConnectActions.js
+++ b/src/js/actions/TrezorConnectActions.js
@@ -32,7 +32,7 @@ import type {
     AsyncAction,
     TrezorDevice,
     RouterLocationState,
-} from '~/flowtype';
+} from 'flowtype';
 
 
 export type TrezorConnectAction = {
diff --git a/src/js/actions/WalletActions.js b/src/js/actions/WalletActions.js
index 65b4a7d3..e192e68e 100644
--- a/src/js/actions/WalletActions.js
+++ b/src/js/actions/WalletActions.js
@@ -22,7 +22,7 @@ import type
     Dispatch,
     GetState,
     State,
-} from '~/flowtype';
+} from 'flowtype';
 
 export type WalletAction = {
     type: typeof WALLET.SET_INITIAL_URL,
diff --git a/src/js/actions/Web3Actions.js b/src/js/actions/Web3Actions.js
index 056f9ab4..99d50735 100644
--- a/src/js/actions/Web3Actions.js
+++ b/src/js/actions/Web3Actions.js
@@ -21,7 +21,7 @@ import type {
     GetState,
     Action,
     AsyncAction,
-} from '~/flowtype';
+} from 'flowtype';
 
 import type { Account } from '../reducers/AccountsReducer';
 import type { PendingTx } from '../reducers/PendingTxReducer';
diff --git a/src/js/components/common/Button.js b/src/js/components/common/Button.js
index b2e9cd43..6c96c199 100644
--- a/src/js/components/common/Button.js
+++ b/src/js/components/common/Button.js
@@ -2,7 +2,7 @@ import styled, { css } from 'styled-components';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import colors from '~/js/config/colors';
+import colors from 'config/colors';
 
 const Wrapper = styled.button`
     padding: 12px 24px;
diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js
index 431c7475..baac3557 100644
--- a/src/js/components/common/Footer.js
+++ b/src/js/components/common/Footer.js
@@ -5,8 +5,8 @@ import { getYear } from 'date-fns';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import colors from '~/js/config/colors';
-import * as LogActions from '~/js/actions/LogActions';
+import colors from 'config/colors';
+import * as LogActions from 'actions/LogActions';
 
 const Wrapper = styled.div`
     width: 100%;
diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index bd10b00f..7e6479d6 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -1,7 +1,7 @@
 /* @flow */
 import React from 'react';
 import styled from 'styled-components';
-import colors from '~/js/config/colors';
+import colors from 'config/colors';
 
 const Wrapper = styled.header`
     width: 100%;
diff --git a/src/js/components/common/Heading.js b/src/js/components/common/Heading.js
index 5906902f..899bcac8 100644
--- a/src/js/components/common/Heading.js
+++ b/src/js/components/common/Heading.js
@@ -1,5 +1,5 @@
 import styled, { css } from 'styled-components';
-import colors from '~/js/config/colors';
+import colors from 'config/colors';
 
 const baseStyles = css`
     -webkit-font-smoothing: antialiased;
diff --git a/src/js/components/common/Log.js b/src/js/components/common/Log.js
index 8e516de4..910730d4 100644
--- a/src/js/components/common/Log.js
+++ b/src/js/components/common/Log.js
@@ -4,10 +4,10 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 
-import * as LogActions from '~/js/actions/LogActions';
-import type { State, Dispatch } from '~/flowtype';
+import * as LogActions from 'actions/LogActions';
+import type { State, Dispatch } from 'flowtype';
 
 const Log = (props: Props): ?React$Element<string> => {
     if (!props.log.opened) return null;
diff --git a/src/js/components/common/Notification.js b/src/js/components/common/Notification.js
index 9722dd66..622d4e7d 100644
--- a/src/js/components/common/Notification.js
+++ b/src/js/components/common/Notification.js
@@ -2,13 +2,13 @@
 
 
 import React from 'react';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import * as NOTIFICATION from '~/js/actions/constants/notification';
-import * as NotificationActions from '~/js/actions/NotificationActions';
-import type { Action, State, Dispatch } from '~/flowtype';
+import * as NOTIFICATION from 'actions/constants/notification';
+import * as NotificationActions from 'actions/NotificationActions';
+import type { Action, State, Dispatch } from 'flowtype';
 import Loader from './LoaderCircle';
 
 type Props = {
diff --git a/src/js/components/landing/ConnectDevice.js b/src/js/components/landing/ConnectDevice.js
index 8d9afefb..71d22c2e 100644
--- a/src/js/components/landing/ConnectDevice.js
+++ b/src/js/components/landing/ConnectDevice.js
@@ -2,9 +2,9 @@
 
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 
-import type { State, TrezorDevice } from '~/flowtype';
+import type { State, TrezorDevice } from 'flowtype';
 
 type Props = {
     transport: $PropertyType<$ElementType<State, 'connect'>, 'transport'>;
diff --git a/src/js/components/landing/InstallBridge.js b/src/js/components/landing/InstallBridge.js
index 0ab6a9c3..57171754 100644
--- a/src/js/components/landing/InstallBridge.js
+++ b/src/js/components/landing/InstallBridge.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import installers from '~/js/constants/bridge';
+import installers from 'constants/bridge';
 import React, { Component } from 'react';
 import Select from 'react-select';
 import Preloader from './Preloader';
diff --git a/src/js/components/landing/LandingPage.js b/src/js/components/landing/LandingPage.js
index 3ae8c115..76552a1a 100644
--- a/src/js/components/landing/LandingPage.js
+++ b/src/js/components/landing/LandingPage.js
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import Preloader from './Preloader';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import ConnectDevice from './ConnectDevice';
 import InstallBridge from './InstallBridge';
 import LocalStorageError from './LocalStorageError';
diff --git a/src/js/components/landing/index.js b/src/js/components/landing/index.js
index 39c84f4e..e7fae9ef 100644
--- a/src/js/components/landing/index.js
+++ b/src/js/components/landing/index.js
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 import LandingPage from './LandingPage';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 
 export type StateProps = {
     localStorage: $ElementType<State, 'localStorage'>,
diff --git a/src/js/components/modal/ConfirmAddress.js b/src/js/components/modal/ConfirmAddress.js
index f3bb1a85..a87a6af0 100644
--- a/src/js/components/modal/ConfirmAddress.js
+++ b/src/js/components/modal/ConfirmAddress.js
@@ -2,7 +2,7 @@
 
 
 import React, { Component } from 'react';
-import { findAccount } from '~/js/reducers/AccountsReducer';
+import { findAccount } from 'reducers/AccountsReducer';
 
 import type { Props } from './index';
 
diff --git a/src/js/components/modal/DuplicateDevice.js b/src/js/components/modal/DuplicateDevice.js
index c047b9fe..5d5de6e0 100644
--- a/src/js/components/modal/DuplicateDevice.js
+++ b/src/js/components/modal/DuplicateDevice.js
@@ -2,7 +2,7 @@
 
 
 import React, { Component } from 'react';
-import { getNewInstance } from '~/js/reducers/DevicesReducer';
+import { getNewInstance } from 'reducers/DevicesReducer';
 import type { Props } from './index';
 
 type State = {
diff --git a/src/js/components/modal/index.js b/src/js/components/modal/index.js
index 1386d11c..0f5837dd 100644
--- a/src/js/components/modal/index.js
+++ b/src/js/components/modal/index.js
@@ -10,8 +10,8 @@ import { CSSTransition, Transition } from 'react-transition-group';
 
 import { UI } from 'trezor-connect';
 
-import { default as ModalActions } from '~/js/actions/ModalActions';
-import { default as ReceiveActions } from '~/js/actions/ReceiveActions';
+import { default as ModalActions } from 'actions/ModalActions';
+import { default as ReceiveActions } from 'actions/ReceiveActions';
 
 import Pin from './Pin';
 import InvalidPin from './InvalidPin';
@@ -22,12 +22,12 @@ import ConfirmAddress, { ConfirmUnverifiedAddress } from './ConfirmAddress';
 import RememberDevice, { ForgetDevice } from './RememberDevice';
 import DuplicateDevice from './DuplicateDevice';
 
-import * as RECEIVE from '~/js/actions/constants/receive';
-import * as MODAL from '~/js/actions/constants/modal';
-import * as CONNECT from '~/js/actions/constants/TrezorConnect';
+import * as RECEIVE from 'actions/constants/receive';
+import * as MODAL from 'actions/constants/modal';
+import * as CONNECT from 'actions/constants/TrezorConnect';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 
 type OwnProps = { }
 
diff --git a/src/js/components/wallet/account/SelectedAccount.js b/src/js/components/wallet/account/SelectedAccount.js
index 6f5f9e4e..1fdd6c92 100644
--- a/src/js/components/wallet/account/SelectedAccount.js
+++ b/src/js/components/wallet/account/SelectedAccount.js
@@ -2,13 +2,13 @@
 
 
 import * as React from 'react';
-import { Notification } from '~/js/components/common/Notification';
+import { Notification } from 'components/common/Notification';
 
 import type {
     State, TrezorDevice, Action, ThunkAction,
-} from '~/flowtype';
-import type { Account } from '~/js/reducers/AccountsReducer';
-import type { Discovery } from '~/js/reducers/DiscoveryReducer';
+} from 'flowtype';
+import type { Account } from 'reducers/AccountsReducer';
+import type { Discovery } from 'reducers/DiscoveryReducer';
 
 export type StateProps = {
     className: string;
diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js
index bd92bc10..cd3217f5 100644
--- a/src/js/components/wallet/account/receive/Receive.js
+++ b/src/js/components/wallet/account/receive/Receive.js
@@ -1,13 +1,13 @@
 /* @flow */
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 
 import Tooltip from 'rc-tooltip';
 import { QRCode } from 'react-qr-svg';
 
 import SelectedAccount from '../SelectedAccount';
-import { Notification } from '~/js/components/common/Notification';
+import { Notification } from 'components/common/Notification';
 
 import type { Props } from './index';
 
diff --git a/src/js/components/wallet/account/receive/index.js b/src/js/components/wallet/account/receive/index.js
index 535bb667..12579224 100644
--- a/src/js/components/wallet/account/receive/index.js
+++ b/src/js/components/wallet/account/receive/index.js
@@ -5,12 +5,12 @@ import React, { Component, PropTypes } from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import { default as ReceiveActions } from '~/js/actions/ReceiveActions';
-import * as TokenActions from '~/js/actions/TokenActions';
+import { default as ReceiveActions } from 'actions/ReceiveActions';
+import * as TokenActions from 'actions/TokenActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import Receive from './Receive';
 
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 import type {
     StateProps as BaseStateProps,
     DispatchProps as BaseDispatchProps,
diff --git a/src/js/components/wallet/account/send/PendingTransactions.js b/src/js/components/wallet/account/send/PendingTransactions.js
index c04ea709..e7783bdd 100644
--- a/src/js/components/wallet/account/send/PendingTransactions.js
+++ b/src/js/components/wallet/account/send/PendingTransactions.js
@@ -3,13 +3,13 @@
 
 import React from 'react';
 import ColorHash from 'color-hash';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import ScaleText from 'react-scale-text';
 
-import { findAccountTokens } from '~/js/reducers/TokensReducer';
+import { findAccountTokens } from 'reducers/TokensReducer';
 
-import type { Coin } from '~/js/reducers/LocalStorageReducer';
-import type { Token } from '~/js/reducers/TokensReducer';
+import type { Coin } from 'reducers/LocalStorageReducer';
+import type { Token } from 'reducers/TokensReducer';
 import type { Props as BaseProps } from './index';
 
 type Props = {
diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
index 7af77fa7..aadf9e9b 100644
--- a/src/js/components/wallet/account/send/SendForm.js
+++ b/src/js/components/wallet/account/send/SendForm.js
@@ -3,18 +3,18 @@
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import Select from 'react-select';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import AdvancedForm from './AdvancedForm';
 import PendingTransactions from './PendingTransactions';
 import { FeeSelectValue, FeeSelectOption } from './FeeSelect';
 import SelectedAccount from '../SelectedAccount';
-import { findAccountTokens } from '~/js/reducers/TokensReducer';
-import { calculate, validation } from '~/js/actions/SendFormActions';
+import { findAccountTokens } from 'reducers/TokensReducer';
+import { calculate, validation } from 'actions/SendFormActions';
 
-import { findToken } from '~/js/reducers/TokensReducer';
+import { findToken } from 'reducers/TokensReducer';
 
 import type { Props } from './index';
-import type { Token } from '~/flowtype';
+import type { Token } from 'flowtype';
 
 export default class SendContainer extends Component<Props> {
     componentWillReceiveProps(newProps: Props) {
diff --git a/src/js/components/wallet/account/send/index.js b/src/js/components/wallet/account/send/index.js
index 57360d19..629b4dea 100644
--- a/src/js/components/wallet/account/send/index.js
+++ b/src/js/components/wallet/account/send/index.js
@@ -5,12 +5,12 @@ import * as React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import { default as SendFormActions } from '~/js/actions/SendFormActions';
-import * as SessionStorageActions from '~/js/actions/SessionStorageActions';
+import { default as SendFormActions } from 'actions/SendFormActions';
+import * as SessionStorageActions from 'actions/SessionStorageActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import SendForm from './SendForm';
 
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
 
 type OwnProps = { }
diff --git a/src/js/components/wallet/account/sign/SignVerify.js b/src/js/components/wallet/account/sign/SignVerify.js
index 20a9b4b5..566cfa69 100644
--- a/src/js/components/wallet/account/sign/SignVerify.js
+++ b/src/js/components/wallet/account/sign/SignVerify.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { H2 } from '~/js/components/common/Heading';
-import colors from '~/js/config/colors';
+import { H2 } from 'components/common/Heading';
+import colors from 'config/colors';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
index 3a573ebd..52d1877a 100644
--- a/src/js/components/wallet/account/summary/Summary.js
+++ b/src/js/components/wallet/account/summary/Summary.js
@@ -1,20 +1,20 @@
 /* @flow */
 import styled from 'styled-components';
 import React, { Component } from 'react';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import BigNumber from 'bignumber.js';
 import { Async as AsyncSelect } from 'react-select';
 import Tooltip from 'rc-tooltip';
 
-import { resolveAfter } from '~/js/utils/promiseUtils';
+import { resolveAfter } from 'utils/promiseUtils';
 import SelectedAccount from '../SelectedAccount';
-import { Notification } from '~/js/components/common/Notification';
+import { Notification } from 'components/common/Notification';
 import SummaryDetails from './SummaryDetails.js';
 import SummaryTokens from './SummaryTokens.js';
-import * as stateUtils from '~/js/reducers/utils';
+import * as stateUtils from 'reducers/utils';
 
 import type { Props } from './index';
-import type { NetworkToken } from '~/js/reducers/LocalStorageReducer';
+import type { NetworkToken } from 'reducers/LocalStorageReducer';
 
 const StyledH2 = styled(H2)`
    padding: 20px 48px;
diff --git a/src/js/components/wallet/account/summary/SummaryDetails.js b/src/js/components/wallet/account/summary/SummaryDetails.js
index 1f3e219a..edae60c3 100644
--- a/src/js/components/wallet/account/summary/SummaryDetails.js
+++ b/src/js/components/wallet/account/summary/SummaryDetails.js
@@ -5,7 +5,7 @@ import React from 'react';
 import BigNumber from 'bignumber.js';
 
 import type { Props as BaseProps } from './index';
-import type { Coin } from '~/js/reducers/LocalStorageReducer';
+import type { Coin } from 'reducers/LocalStorageReducer';
 
 type Props = {
     // coin: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'coin'>,
diff --git a/src/js/components/wallet/account/summary/SummaryTokens.js b/src/js/components/wallet/account/summary/SummaryTokens.js
index 25d9b97e..c6dc05c6 100644
--- a/src/js/components/wallet/account/summary/SummaryTokens.js
+++ b/src/js/components/wallet/account/summary/SummaryTokens.js
@@ -4,7 +4,7 @@
 import React from 'react';
 import ColorHash from 'color-hash';
 import ScaleText from 'react-scale-text';
-import * as stateUtils from '~/js/reducers/utils';
+import * as stateUtils from 'reducers/utils';
 import BigNumber from 'bignumber.js';
 
 import type { Props as BaseProps } from './index';
diff --git a/src/js/components/wallet/account/summary/index.js b/src/js/components/wallet/account/summary/index.js
index 1f36377c..b4fefd9a 100644
--- a/src/js/components/wallet/account/summary/index.js
+++ b/src/js/components/wallet/account/summary/index.js
@@ -7,10 +7,10 @@ import { connect } from 'react-redux';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import Summary from './Summary';
-import * as SummaryActions from '~/js/actions/SummaryActions';
-import * as TokenActions from '~/js/actions/TokenActions';
+import * as SummaryActions from 'actions/SummaryActions';
+import * as TokenActions from 'actions/TokenActions';
 
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
 
 type OwnProps = { }
diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js
index 091f48a4..f2dd03af 100644
--- a/src/js/components/wallet/aside/AccountSelection.js
+++ b/src/js/components/wallet/aside/AccountSelection.js
@@ -5,13 +5,13 @@ import React, { PureComponent } from 'react';
 import { Link, NavLink } from 'react-router-dom';
 import BigNumber from 'bignumber.js';
 
-import { findDeviceAccounts } from '~/js/reducers/AccountsReducer';
-import * as stateUtils from '~/js/reducers/utils';
-import Loader from '~/js/components/common/LoaderCircle';
+import { findDeviceAccounts } from 'reducers/AccountsReducer';
+import * as stateUtils from 'reducers/utils';
+import Loader from 'components/common/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
 import type { Props } from './index';
-import type { TrezorDevice, Accounts } from '~/flowtype';
+import type { TrezorDevice, Accounts } from 'flowtype';
 
 const AccountSelection = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
diff --git a/src/js/components/wallet/aside/Aside.js b/src/js/components/wallet/aside/Aside.js
index 49d5646c..07325589 100644
--- a/src/js/components/wallet/aside/Aside.js
+++ b/src/js/components/wallet/aside/Aside.js
@@ -12,7 +12,7 @@ import CoinSelection from './CoinSelection';
 import StickyContainer from './StickyContainer';
 
 import type { Props } from './index';
-import type { TrezorDevice } from '~/flowtype';
+import type { TrezorDevice } from 'flowtype';
 
 
 type TransitionMenuProps = {
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 10445424..3723d668 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -5,7 +5,7 @@ import React from 'react';
 import { Link, NavLink } from 'react-router-dom';
 
 import type { Props } from './index';
-import type { TrezorDevice } from '~/flowtype';
+import type { TrezorDevice } from 'flowtype';
 
 const CoinSelection = (props: Props): React$Element<string> => {
     const { location } = props.router;
diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js
index 5059305d..c44b38e1 100644
--- a/src/js/components/wallet/aside/DeviceSelection.js
+++ b/src/js/components/wallet/aside/DeviceSelection.js
@@ -6,7 +6,7 @@ import Select from 'react-select';
 import TrezorConnect from 'trezor-connect';
 
 import type { Props } from './index';
-import type { TrezorDevice } from '~/flowtype';
+import type { TrezorDevice } from 'flowtype';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
diff --git a/src/js/components/wallet/aside/StickyContainer.js b/src/js/components/wallet/aside/StickyContainer.js
index 221493b3..b3714a4f 100644
--- a/src/js/components/wallet/aside/StickyContainer.js
+++ b/src/js/components/wallet/aside/StickyContainer.js
@@ -5,7 +5,7 @@
 
 import * as React from 'react';
 import raf from 'raf';
-import { getViewportHeight, getScrollY } from '~/js/utils/windowUtils';
+import { getViewportHeight, getScrollY } from 'utils/windowUtils';
 
 type Props = {
     location: string,
diff --git a/src/js/components/wallet/aside/index.js b/src/js/components/wallet/aside/index.js
index 5245681a..950cc897 100644
--- a/src/js/components/wallet/aside/index.js
+++ b/src/js/components/wallet/aside/index.js
@@ -6,13 +6,13 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 
-import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions';
-import { toggleDeviceDropdown } from '~/js/actions/WalletActions';
+import * as TrezorConnectActions from 'actions/TrezorConnectActions';
+import { toggleDeviceDropdown } from 'actions/WalletActions';
 
 import Aside from './Aside';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 
 type OwnProps = {
 
diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js
index f5dc4572..b1c46eda 100644
--- a/src/js/components/wallet/index.js
+++ b/src/js/components/wallet/index.js
@@ -15,7 +15,7 @@ import Notifications from '../common/Notification';
 import Log from '../common/Log';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 
 type WalletContainerProps = {
     wallet: $ElementType<State, 'wallet'>,
diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js
index 1a3b768a..cd3f6f06 100644
--- a/src/js/components/wallet/pages/Acquire.js
+++ b/src/js/components/wallet/pages/Acquire.js
@@ -4,10 +4,10 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from '~/js/components/common/Notification';
-import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions';
+import { Notification } from 'components/common/Notification';
+import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 
 type Props = {
     acquiring: boolean;
diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/components/wallet/pages/Bootloader.js
index ab62488e..77457187 100644
--- a/src/js/components/wallet/pages/Bootloader.js
+++ b/src/js/components/wallet/pages/Bootloader.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/components/wallet/pages/Dashboard.js
index 7335a712..d526dbaf 100644
--- a/src/js/components/wallet/pages/Dashboard.js
+++ b/src/js/components/wallet/pages/Dashboard.js
@@ -2,8 +2,8 @@ import React from 'react';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
 
-import { H2 } from '~/js/components/common/Heading';
-import DashboardImg from '~/images/dashboard.png';
+import { H2 } from 'components/common/Heading';
+import DashboardImg from 'images/dashboard.png';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index fb2cc68f..2a27021e 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import styled from 'styled-components';
-import { H2 } from '~/js/components/common/Heading';
-import Icon from '~/js/components/common/Icon';
-import colors from '~/js/config/colors';
-import Button from '~/js/components/common/Button';
-import ICONS from '~/js/constants/icons';
+import { H2 } from 'components/common/Heading';
+import Icon from 'components/common/Icon';
+import colors from 'config/colors';
+import Button from 'components/common/Button';
+import ICONS from 'constants/icons';
 import { connect } from 'react-redux';
 
 const Section = styled.section`
diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/components/wallet/pages/Initialize.js
index d3ba5502..3bca865c 100644
--- a/src/js/components/wallet/pages/Initialize.js
+++ b/src/js/components/wallet/pages/Initialize.js
@@ -1,5 +1,5 @@
 /* @flow */
-import { H2 } from '~/js/components/common/Heading';
+import { H2 } from 'components/common/Heading';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/components/wallet/pages/UnreadableDevice.js
index 8a93135e..beef9c18 100644
--- a/src/js/components/wallet/pages/UnreadableDevice.js
+++ b/src/js/components/wallet/pages/UnreadableDevice.js
@@ -4,10 +4,10 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from '~/js/components/common/Notification';
-import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions';
+import { Notification } from 'components/common/Notification';
+import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
-import type { State, Dispatch } from '~/flowtype';
+import type { State, Dispatch } from 'flowtype';
 
 type Props = {
     acquiring: boolean;
diff --git a/src/js/index.js b/src/js/index.js
index 3779d71a..8fabf37f 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1,11 +1,11 @@
 /* @flow */
 import React from 'react';
 import { render } from 'react-dom';
-import baseStyles from '~/js/support/BaseStyles';
+import baseStyles from 'support/BaseStyles';
 import store from './store';
 import App from './router';
 import { onBeforeUnload } from './actions/WalletActions';
-import styles from '~/styles/index.less';
+import styles from 'styles/index.less';
 
 const root: ?HTMLElement = document.getElementById('root');
 if (root) {
diff --git a/src/js/reducers/AccountsReducer.js b/src/js/reducers/AccountsReducer.js
index 9a029d03..e17893bf 100644
--- a/src/js/reducers/AccountsReducer.js
+++ b/src/js/reducers/AccountsReducer.js
@@ -5,7 +5,7 @@ import * as CONNECT from '../actions/constants/TrezorConnect';
 import * as WALLET from '../actions/constants/wallet';
 import * as ACCOUNT from '../actions/constants/account';
 
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 import type {
     AccountCreateAction,
     AccountSetBalanceAction,
diff --git a/src/js/reducers/DevicesReducer.js b/src/js/reducers/DevicesReducer.js
index b62e9c86..97816341 100644
--- a/src/js/reducers/DevicesReducer.js
+++ b/src/js/reducers/DevicesReducer.js
@@ -6,7 +6,7 @@ import type { Device } from 'trezor-connect';
 import * as CONNECT from '../actions/constants/TrezorConnect';
 import * as WALLET from '../actions/constants/wallet';
 
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 
 export type State = Array<TrezorDevice>;
 
diff --git a/src/js/reducers/DiscoveryReducer.js b/src/js/reducers/DiscoveryReducer.js
index 020bf03a..991cffca 100644
--- a/src/js/reducers/DiscoveryReducer.js
+++ b/src/js/reducers/DiscoveryReducer.js
@@ -8,7 +8,7 @@ import * as ACCOUNT from '../actions/constants/account';
 import * as CONNECT from '../actions/constants/TrezorConnect';
 import * as WALLET from '../actions/constants/wallet';
 
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 import type {
     DiscoveryStartAction,
     DiscoveryWaitingAction,
diff --git a/src/js/reducers/FiatRateReducer.js b/src/js/reducers/FiatRateReducer.js
index 97302be4..160de571 100644
--- a/src/js/reducers/FiatRateReducer.js
+++ b/src/js/reducers/FiatRateReducer.js
@@ -3,7 +3,7 @@
 
 import { RATE_UPDATE } from '../services/CoinmarketcapService';
 
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 import type { FiatRateAction } from '../services/CoinmarketcapService';
 
 export type Fiat = {
diff --git a/src/js/reducers/LocalStorageReducer.js b/src/js/reducers/LocalStorageReducer.js
index 5498bb7e..3b57dba7 100644
--- a/src/js/reducers/LocalStorageReducer.js
+++ b/src/js/reducers/LocalStorageReducer.js
@@ -3,7 +3,7 @@
 
 import * as STORAGE from '../actions/constants/localStorage';
 
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 
 export type Coin = {
     name: string;
diff --git a/src/js/reducers/LogReducer.js b/src/js/reducers/LogReducer.js
index bd3038fa..5516e3ad 100644
--- a/src/js/reducers/LogReducer.js
+++ b/src/js/reducers/LogReducer.js
@@ -2,7 +2,7 @@
 
 
 import * as LOG from '../actions/constants/log';
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 
 export type LogEntry = {
     time: number;
diff --git a/src/js/reducers/ModalReducer.js b/src/js/reducers/ModalReducer.js
index ae68258b..47338d44 100644
--- a/src/js/reducers/ModalReducer.js
+++ b/src/js/reducers/ModalReducer.js
@@ -6,7 +6,7 @@ import * as RECEIVE from '../actions/constants/receive';
 import * as MODAL from '../actions/constants/modal';
 import * as CONNECT from '../actions/constants/TrezorConnect';
 
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 
 export type State = {
     opened: false;
diff --git a/src/js/reducers/NotificationReducer.js b/src/js/reducers/NotificationReducer.js
index 2c3a569e..d2171f3d 100644
--- a/src/js/reducers/NotificationReducer.js
+++ b/src/js/reducers/NotificationReducer.js
@@ -5,7 +5,7 @@ import { LOCATION_CHANGE } from 'react-router-redux';
 import * as NOTIFICATION from '../actions/constants/notification';
 import { DEVICE } from 'trezor-connect';
 
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 
 export type CallbackAction = {
     label: string;
diff --git a/src/js/reducers/PendingTxReducer.js b/src/js/reducers/PendingTxReducer.js
index db1fb989..8e093cd1 100644
--- a/src/js/reducers/PendingTxReducer.js
+++ b/src/js/reducers/PendingTxReducer.js
@@ -5,7 +5,7 @@ import * as PENDING from '../actions/constants/pendingTx';
 import * as SEND from '../actions/constants/send';
 import * as WEB3 from '../actions/constants/web3';
 
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 import type { SendTxAction } from '../actions/SendFormActions';
 
 export type PendingTx = {
diff --git a/src/js/reducers/ReceiveReducer.js b/src/js/reducers/ReceiveReducer.js
index a95d545e..f57beca6 100644
--- a/src/js/reducers/ReceiveReducer.js
+++ b/src/js/reducers/ReceiveReducer.js
@@ -4,7 +4,7 @@
 import { UI } from 'trezor-connect';
 import * as RECEIVE from '../actions/constants/receive';
 import * as ACCOUNT from '../actions/constants/account';
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 
 
 export type State = {
diff --git a/src/js/reducers/SelectedAccountReducer.js b/src/js/reducers/SelectedAccountReducer.js
index 705fb3a8..c6a65efd 100644
--- a/src/js/reducers/SelectedAccountReducer.js
+++ b/src/js/reducers/SelectedAccountReducer.js
@@ -11,7 +11,7 @@ import type {
     PendingTx,
     Discovery,
     Web3Instance,
-} from '~/flowtype';
+} from 'flowtype';
 
 export type State = {
     location?: string;
diff --git a/src/js/reducers/SendFormReducer.js b/src/js/reducers/SendFormReducer.js
index 7d2b41ef..84453927 100644
--- a/src/js/reducers/SendFormReducer.js
+++ b/src/js/reducers/SendFormReducer.js
@@ -10,7 +10,7 @@ import * as WALLET from '../actions/constants/wallet';
 
 import { getFeeLevels } from '../actions/SendFormActions';
 
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 import type {
     Web3UpdateGasPriceAction,
 } from '../actions/Web3Actions';
diff --git a/src/js/reducers/SummaryReducer.js b/src/js/reducers/SummaryReducer.js
index 88b7394f..fe35f06d 100644
--- a/src/js/reducers/SummaryReducer.js
+++ b/src/js/reducers/SummaryReducer.js
@@ -3,7 +3,7 @@
 
 import * as ACCOUNT from '../actions/constants/account';
 import * as SUMMARY from '../actions/constants/summary';
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 import type { NetworkToken } from './LocalStorageReducer';
 
 export type State = {
diff --git a/src/js/reducers/TokensReducer.js b/src/js/reducers/TokensReducer.js
index 729db026..d0a04b3a 100644
--- a/src/js/reducers/TokensReducer.js
+++ b/src/js/reducers/TokensReducer.js
@@ -5,7 +5,7 @@ import * as CONNECT from '../actions/constants/TrezorConnect';
 import * as WALLET from '../actions/constants/wallet';
 import * as TOKEN from '../actions/constants/token';
 
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 import type { Account } from './AccountsReducer';
 
 export type Token = {
diff --git a/src/js/reducers/TrezorConnectReducer.js b/src/js/reducers/TrezorConnectReducer.js
index 285b7730..b971d648 100644
--- a/src/js/reducers/TrezorConnectReducer.js
+++ b/src/js/reducers/TrezorConnectReducer.js
@@ -6,7 +6,7 @@ import type { Device } from 'trezor-connect';
 import * as CONNECT from '../actions/constants/TrezorConnect';
 import * as WALLET from '../actions/constants/wallet';
 
-import type { Action, TrezorDevice } from '~/flowtype';
+import type { Action, TrezorDevice } from 'flowtype';
 
 export type SelectedDevice = {
     id: string; // could be device path if unacquired or features.device_id
diff --git a/src/js/reducers/WalletReducer.js b/src/js/reducers/WalletReducer.js
index 0187c14a..2317a770 100644
--- a/src/js/reducers/WalletReducer.js
+++ b/src/js/reducers/WalletReducer.js
@@ -9,7 +9,7 @@ import * as WALLET from '../actions/constants/wallet';
 import * as CONNECT from '../actions/constants/TrezorConnect';
 
 
-import type { Action, RouterLocationState, TrezorDevice } from '~/flowtype';
+import type { Action, RouterLocationState, TrezorDevice } from 'flowtype';
 
 type State = {
     ready: boolean;
diff --git a/src/js/reducers/Web3Reducer.js b/src/js/reducers/Web3Reducer.js
index fc6ffd20..ab95c61e 100644
--- a/src/js/reducers/Web3Reducer.js
+++ b/src/js/reducers/Web3Reducer.js
@@ -7,7 +7,7 @@ import type { ContractFactory } from 'web3';
 import * as STORAGE from '../actions/constants/localStorage';
 import * as WEB3 from '../actions/constants/web3';
 
-import type { Action } from '~/flowtype';
+import type { Action } from 'flowtype';
 import type {
     Web3UpdateBlockAction,
     Web3UpdateGasPriceAction,
diff --git a/src/js/reducers/utils/index.js b/src/js/reducers/utils/index.js
index 17068816..e088d5fa 100644
--- a/src/js/reducers/utils/index.js
+++ b/src/js/reducers/utils/index.js
@@ -1,9 +1,9 @@
 /* @flow */
 
 
-import * as LogActions from '~/js/actions/LogActions';
-import * as STORAGE from '~/js/actions/constants/localStorage';
-import * as WALLET from '~/js/actions/constants/wallet';
+import * as LogActions from 'actions/LogActions';
+import * as STORAGE from 'actions/constants/localStorage';
+import * as WALLET from 'actions/constants/wallet';
 import BigNumber from 'bignumber.js';
 
 import type {
@@ -22,7 +22,7 @@ import type {
     Token,
     PendingTx,
     Web3Instance,
-} from '~/flowtype';
+} from 'flowtype';
 
 export const getSelectedDevice = (state: State): ?TrezorDevice => {
     const locationState = state.router.location.state;
diff --git a/src/js/router/index.js b/src/js/router/index.js
index 3d684345..54ddca20 100644
--- a/src/js/router/index.js
+++ b/src/js/router/index.js
@@ -5,7 +5,7 @@ import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
 import store, { history } from '../store';
 
-import ErrorBoundary from '~/js/support/ErrorBoundary';
+import ErrorBoundary from 'support/ErrorBoundary';
 
 import LandingPageContainer from '../components/landing';
 import WalletContainer from '../components/wallet';
diff --git a/src/js/services/CoinmarketcapService.js b/src/js/services/CoinmarketcapService.js
index 93400b3e..8911d6d3 100644
--- a/src/js/services/CoinmarketcapService.js
+++ b/src/js/services/CoinmarketcapService.js
@@ -14,7 +14,7 @@ import type {
     Action,
     AsyncAction,
     GetState,
-} from '~/flowtype';
+} from 'flowtype';
 import type { Config, FiatValueTicker } from '../reducers/LocalStorageReducer';
 
 export const RATE_UPDATE: 'rate__update' = 'rate__update';
diff --git a/src/js/services/LocalStorageService.js b/src/js/services/LocalStorageService.js
index 1ec620e2..3265a732 100644
--- a/src/js/services/LocalStorageService.js
+++ b/src/js/services/LocalStorageService.js
@@ -25,9 +25,9 @@ import type {
     Action,
     AsyncAction,
     GetState,
-} from '~/flowtype';
+} from 'flowtype';
 
-import type { TrezorDevice } from '~/flowtype';
+import type { TrezorDevice } from 'flowtype';
 import type { Account } from '../reducers/AccountsReducer';
 import type { Token } from '../reducers/TokensReducer';
 import type { PendingTx } from '../reducers/PendingTxReducer';
diff --git a/src/js/services/LogService.js b/src/js/services/LogService.js
index 0b81408d..3f308992 100644
--- a/src/js/services/LogService.js
+++ b/src/js/services/LogService.js
@@ -16,7 +16,7 @@ import type {
     Action,
     AsyncAction,
     GetState,
-} from '~/flowtype';
+} from 'flowtype';
 
 const exclude: Array<string> = [
     ADD, OPEN, CLOSE,
diff --git a/src/js/services/RouterService.js b/src/js/services/RouterService.js
index a92d4e14..00b31cf4 100644
--- a/src/js/services/RouterService.js
+++ b/src/js/services/RouterService.js
@@ -19,7 +19,7 @@ import type {
     GetState,
     RouterLocationState,
     TrezorDevice,
-} from '~/flowtype';
+} from 'flowtype';
 
 /**
  * Middleware used for init application and managing router path.
diff --git a/src/js/services/TrezorConnectService.js b/src/js/services/TrezorConnectService.js
index 24520efe..a6d8fbd3 100644
--- a/src/js/services/TrezorConnectService.js
+++ b/src/js/services/TrezorConnectService.js
@@ -26,7 +26,7 @@ import type {
     AsyncAction,
     GetState,
     RouterLocationState,
-} from '~/flowtype';
+} from 'flowtype';
 
 const TrezorConnectService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispatch) => (action: Action): Action => {
     const prevState: $ElementType<State, 'connect'> = api.getState().connect;
diff --git a/src/js/services/WalletService.js b/src/js/services/WalletService.js
index 7c08c0a7..1eb653ba 100644
--- a/src/js/services/WalletService.js
+++ b/src/js/services/WalletService.js
@@ -15,7 +15,7 @@ import type {
     MiddlewareAPI,
     MiddlewareDispatch,
     Action,
-} from '~/flowtype';
+} from 'flowtype';
 
 /**
  * Middleware
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 8a20502c..1c5a9ec6 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -14,7 +14,7 @@ import services from '../services';
 import Raven from 'raven-js';
 import RavenMiddleware from 'redux-raven-middleware';
 
-import type { Action, GetState, Store } from '~/flowtype';
+import type { Action, GetState, Store } from 'flowtype';
 
 export const history: History = createHistory({ queryKey: false });
 
diff --git a/yarn.lock b/yarn.lock
index 949f4427..5ee37c96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -347,13 +347,6 @@
     text-table "^0.2.0"
     webpack-log "^1.1.2"
 
-JSONStream@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
-  dependencies:
-    jsonparse "0.0.5"
-    through ">=2.2.7 <3"
-
 abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -392,17 +385,13 @@ acorn-globals@^4.1.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+acorn-jsx@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
   dependencies:
-    acorn "^3.0.4"
+    acorn "^5.0.3"
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
+acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0, acorn@^5.6.2:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
 
@@ -412,10 +401,6 @@ add-dom-event-listener@1.x:
   dependencies:
     object-assign "4.x"
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
 ajv-keywords@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
@@ -431,7 +416,7 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.1.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -440,7 +425,7 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.0.1:
+ajv@^6.0.1, ajv@^6.5.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
   dependencies:
@@ -726,7 +711,7 @@ atob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
 
-autoprefixer@^6.0.0, autoprefixer@^6.3.1:
+autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
@@ -791,7 +776,7 @@ babel-cli@^6.24.1:
   optionalDependencies:
     chokidar "^1.6.1"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -1050,11 +1035,15 @@ babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
 
-babel-plugin-root-import@5:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-root-import/-/babel-plugin-root-import-5.1.0.tgz#80ea1cd5945b463a5e3f7e204a69478c573e328c"
+babel-plugin-module-resolver@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.1.1.tgz#881cf67e3d4b8400d5eaaefc1be44d2dc1fe404f"
   dependencies:
-    slash "^1.0.0"
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
 
 babel-plugin-styled-components@^1.5.1:
   version "1.5.1"
@@ -1551,7 +1540,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.0.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   dependencies:
@@ -1589,7 +1578,7 @@ babylon@7.0.0-beta.44:
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
-babylon@^6.12.0, babylon@^6.17.3, babylon@^6.18.0:
+babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1601,7 +1590,7 @@ bail@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3"
 
-balanced-match@^0.4.0, balanced-match@^0.4.2:
+balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
@@ -1659,10 +1648,6 @@ bindings@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
-bindings@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
-
 bip66@^1.1.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
@@ -1675,7 +1660,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.0.5, bluebird@^3.5.1:
+bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1827,7 +1812,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
@@ -1986,7 +1971,7 @@ camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
-camelcase@^2.0.0, camelcase@^2.0.1:
+camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
@@ -2003,10 +1988,6 @@ caniuse-api@^1.5.2:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000187:
-  version "1.0.30000877"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000877.tgz#29ea435fdbe8a671cc5b027a75e28a816c17c340"
-
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000770"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000770.tgz#cf68ae1cb8a82f6d3c35df41c62dc6973e470244"
@@ -2249,14 +2230,6 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
-cliui@^3.0.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
 cliui@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
@@ -2348,10 +2321,6 @@ color-convert@^1.3.0, color-convert@^1.9.0:
   dependencies:
     color-name "^1.1.1"
 
-color-diff@^0.1.3:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
-
 color-hash@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/color-hash/-/color-hash-1.0.3.tgz#c0e7952f06d022e548e65da239512bd67d3809ee"
@@ -2374,21 +2343,6 @@ color@^0.11.0:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
-colorguard@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.1.tgz#249647c9702481d9143384fc9813662311afde98"
-  dependencies:
-    chalk "^1.1.1"
-    color-diff "^0.1.3"
-    log-symbols "^1.0.2"
-    object-assign "^4.0.1"
-    pipetteur "^2.0.0"
-    plur "^2.0.0"
-    postcss "^5.0.4"
-    postcss-reporter "^1.2.1"
-    text-table "^0.2.0"
-    yargs "^1.2.6"
-
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -2429,10 +2383,6 @@ commander@^2.11.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a"
 
-commander@^2.9.0:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -2489,15 +2439,6 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@^1.6.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
@@ -2584,18 +2525,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cosmiconfig@^2.1.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.4.3"
-    minimist "^1.2.0"
-    object-assign "^4.1.0"
-    os-homedir "^1.0.1"
-    parse-json "^2.2.0"
-    require-from-string "^1.1.0"
-
 cosmiconfig@^5.0.0:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
@@ -2649,7 +2578,7 @@ cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -2704,20 +2633,6 @@ css-color-keywords@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
 
-css-color-list@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/css-color-list/-/css-color-list-0.0.1.tgz#8718e8695ae7a2cc8787be8715f1c008a7f28b15"
-  dependencies:
-    css-color-names "0.0.1"
-
-css-color-names@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.1.tgz#5d0548fa256456ede4a9a0c2ac7ab19d3eb1ad81"
-
-css-color-names@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
-
 css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -2741,15 +2656,6 @@ css-loader@0.28.11:
     postcss-value-parser "^3.3.0"
     source-list-map "^2.0.0"
 
-css-rule-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
-  dependencies:
-    css-tokenize "^1.0.1"
-    duplexer2 "0.0.2"
-    ldjson-stream "^1.2.1"
-    through2 "^0.6.3"
-
 css-select@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
@@ -2775,13 +2681,6 @@ css-to-react-native@^2.0.3:
     fbjs "^0.8.5"
     postcss-value-parser "^3.3.0"
 
-css-tokenize@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^1.0.33"
-
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -2894,14 +2793,7 @@ dateformat@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-deasync@^0.1.11:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.13.tgz#815c2b69bbd1117cae570152cd895661c09f20ea"
-  dependencies:
-    bindings "~1.2.1"
-    nan "^2.0.7"
-
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -3062,7 +2954,7 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
-diff@^3.1.0, diff@^3.2.0, diff@^3.3.1, diff@^3.4.0, diff@^3.5.0:
+diff@^3.2.0, diff@^3.3.1, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -3111,23 +3003,6 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-doiuse@^2.4.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
-  dependencies:
-    browserslist "^1.1.1"
-    caniuse-db "^1.0.30000187"
-    css-rule-stream "^1.1.0"
-    duplexer2 "0.0.2"
-    jsonfilter "^1.1.2"
-    ldjson-stream "^1.2.1"
-    lodash "^4.0.0"
-    multimatch "^2.0.0"
-    postcss "^5.0.8"
-    source-map "^0.4.2"
-    through2 "^0.6.3"
-    yargs "^3.5.4"
-
 dom-align@1.x:
   version "1.6.7"
   resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.6.7.tgz#6858138efb6b77405ce99146d0be5e4f7282813f"
@@ -3217,12 +3092,6 @@ drbg.js@^1.0.1:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
-
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -3259,16 +3128,6 @@ editions@^1.3.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
 
-editorconfig@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
-  dependencies:
-    bluebird "^3.0.5"
-    commander "^2.9.0"
-    lru-cache "^3.2.0"
-    semver "^5.1.0"
-    sigmund "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3374,7 +3233,7 @@ error@^7.0.2:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1:
+es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
   dependencies:
@@ -3460,20 +3319,12 @@ eslint-config-airbnb@^17.0.0:
     object.assign "^4.1.0"
     object.entries "^1.0.4"
 
-eslint-import-resolver-babel-plugin-root-import@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-plugin-root-import/-/eslint-import-resolver-babel-plugin-root-import-1.1.1.tgz#b060f1177557918389f7ed476e5b36a43854a381"
+eslint-import-resolver-babel-module@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-4.0.0.tgz#1c596f7fb9815050292c8750d523b27a5444b4bf"
   dependencies:
-    eslint-import-resolver-node "^0.2.1"
-    json5 "^0.5.0"
-
-eslint-import-resolver-node@^0.2.1:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
-  dependencies:
-    debug "^2.2.0"
-    object-assign "^4.0.1"
-    resolve "^1.1.6"
+    pkg-up "^2.0.0"
+    resolve "^1.4.0"
 
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
@@ -3495,9 +3346,9 @@ eslint-plugin-flowtype@^2.50.0:
   dependencies:
     lodash "^4.17.10"
 
-eslint-plugin-import@^2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.13.0.tgz#df24f241175e312d91662dc91ca84064caec14ed"
+eslint-plugin-import@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
   dependencies:
     contains-path "^0.1.0"
     debug "^2.6.8"
@@ -3540,7 +3391,7 @@ eslint-restricted-globals@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
 
-eslint-scope@3.7.1, eslint-scope@^3.7.1:
+eslint-scope@3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
@@ -3554,59 +3405,64 @@ eslint-scope@^4.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-utils@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^4:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+eslint@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8"
   dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
+    ajv "^6.5.0"
+    babel-code-frame "^6.26.0"
     chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
+    cross-spawn "^6.0.5"
     debug "^3.1.0"
     doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
+    eslint-scope "^4.0.0"
+    eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
+    espree "^4.0.0"
+    esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
+    globals "^11.7.0"
+    ignore "^4.0.2"
     imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
+    inquirer "^5.2.0"
+    is-resolvable "^1.1.0"
+    js-yaml "^3.11.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
+    lodash "^4.17.5"
+    minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^1.0.1"
+    regexpp "^2.0.0"
     require-uncached "^1.0.3"
-    semver "^5.3.0"
+    semver "^5.5.0"
+    string.prototype.matchall "^2.0.0"
     strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
+    strip-json-comments "^2.0.1"
+    table "^4.0.3"
+    text-table "^0.2.0"
 
-espree@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+espree@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
   dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
+    acorn "^5.6.0"
+    acorn-jsx "^4.1.1"
 
 esprima@^2.6.0:
   version "2.7.3"
@@ -3624,7 +3480,7 @@ esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
-esquery@^1.0.0:
+esquery@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
@@ -3859,7 +3715,7 @@ extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.4, external-editor@^2.1.0:
+external-editor@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
@@ -4032,6 +3888,13 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
+find-babel-config@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -4218,10 +4081,6 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
-gather-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
-
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4243,10 +4102,6 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
-get-stdin@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
-
 get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
@@ -4345,7 +4200,7 @@ global@^4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.0.1, globals@^11.1.0:
+globals@^11.1.0, globals@^11.7.0:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
 
@@ -4364,7 +4219,7 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^6.0.0, globby@^6.1.0:
+globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
@@ -4828,10 +4683,6 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.2.0, ignore@^3.3.3:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-
 ignore@^3.3.5:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -4840,6 +4691,10 @@ ignore@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.5.tgz#333535a20325ba4852c4ddb135d47392aa035e6d"
 
+ignore@^4.0.2:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -4865,7 +4720,7 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
-indent-string@^3.0.0, indent-string@^3.2.0:
+indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
 
@@ -4896,25 +4751,6 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^5.1.0, inquirer@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
@@ -4974,10 +4810,6 @@ ipaddr.js@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
 
-irregular-plurals@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
-
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -5237,7 +5069,7 @@ is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
 
-is-resolvable@^1.0.0:
+is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
@@ -5705,7 +5537,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.11.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -5848,23 +5680,10 @@ json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
-jsonfilter@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
-  dependencies:
-    JSONStream "^0.8.4"
-    minimist "^1.1.0"
-    stream-combiner "^0.2.1"
-    through2 "^0.6.3"
-
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
-jsonparse@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5923,10 +5742,6 @@ kleur@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.1.tgz#7cc64b0d188d0dcbc98bdcdfdda2cc10619ddce8"
 
-known-css-properties@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.2.0.tgz#899c94be368e55b42d7db8d5be7d73a4a4a41454"
-
 known-css-properties@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.6.1.tgz#31b5123ad03d8d1a3f36bd4155459c981173478b"
@@ -5941,13 +5756,6 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-ldjson-stream@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
-  dependencies:
-    split2 "^0.2.1"
-    through2 "^0.6.1"
-
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -6128,15 +5936,11 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.unescape@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
-
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -6215,12 +6019,6 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
-lru-cache@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
-  dependencies:
-    pseudomap "^1.0.1"
-
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -6288,7 +6086,7 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
-mathml-tag-names@^2.0.0, mathml-tag-names@^2.0.1:
+mathml-tag-names@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
 
@@ -6532,7 +6330,7 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -6620,14 +6418,14 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.0.7, nan@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-
 nan@^2.2.1, nan@^2.3.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -6968,10 +6766,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onecolor@^3.0.4:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.5.tgz#36eff32201379efdf1180fb445e51a8e2425f9f6"
-
 onetime@^1.0.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
@@ -7025,16 +6819,10 @@ os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -7311,13 +7099,6 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pipetteur@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
-  dependencies:
-    onecolor "^3.0.4"
-    synesthesia "^1.0.1"
-
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -7330,11 +7111,11 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-plur@^2.0.0, plur@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
   dependencies:
-    irregular-plurals "^1.0.0"
+    find-up "^2.1.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
@@ -7423,12 +7204,6 @@ postcss-html@^0.31.0:
   dependencies:
     htmlparser2 "^3.9.2"
 
-postcss-less@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
-  dependencies:
-    postcss "^5.0.21"
-
 postcss-less@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-2.0.0.tgz#5d190b8e057ca446d60fe2e2587ad791c9029fb8"
@@ -7442,7 +7217,7 @@ postcss-markdown@^0.31.0:
     remark "^9.0.0"
     unist-util-find-all-after "^1.0.2"
 
-postcss-media-query-parser@^0.2.0, postcss-media-query-parser@^0.2.3:
+postcss-media-query-parser@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
 
@@ -7577,24 +7352,6 @@ postcss-reduce-transforms@^1.0.3:
     postcss "^5.0.8"
     postcss-value-parser "^3.0.1"
 
-postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
-  dependencies:
-    chalk "^1.0.0"
-    lodash "^4.1.0"
-    log-symbols "^1.0.2"
-    postcss "^5.0.0"
-
-postcss-reporter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
-  dependencies:
-    chalk "^1.0.0"
-    lodash "^4.1.0"
-    log-symbols "^1.0.2"
-    postcss "^5.0.0"
-
 postcss-reporter@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3"
@@ -7621,19 +7378,13 @@ postcss-sass@^0.3.0:
     gonzales-pe "4.2.3"
     postcss "6.0.22"
 
-postcss-scss@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
-  dependencies:
-    postcss "^5.2.13"
-
 postcss-scss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
   dependencies:
     postcss "^7.0.0"
 
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2:
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
   dependencies:
@@ -7649,13 +7400,6 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-sorting@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-2.1.0.tgz#32b1e9afa913bb225a6ad076d503d8f983bb4a82"
-  dependencies:
-    lodash "^4.17.4"
-    postcss "^5.2.17"
-
 postcss-styled@^0.31.0:
   version "0.31.0"
   resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.31.0.tgz#ab532a2b3c469dfcca306a7623c4d4a98bb077d5"
@@ -7701,7 +7445,7 @@ postcss@6.0.22:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.4, postcss@^5.2.5:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
   dependencies:
@@ -7857,7 +7601,7 @@ ps-tree@^1.0.1, ps-tree@^1.1.0:
   dependencies:
     event-stream "~3.3.0"
 
-pseudomap@^1.0.1, pseudomap@^1.0.2:
+pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -8195,12 +7939,6 @@ read-chunk@^2.1.0:
     pify "^3.0.0"
     safe-buffer "^5.1.1"
 
-read-file-stdin@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
-  dependencies:
-    gather-stream "^1.0.0"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8258,7 +7996,7 @@ read-pkg@^3.0.0:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
+readable-stream@1.0:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -8267,15 +8005,6 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^1.0.33, readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^2.0.1, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -8430,9 +8159,15 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+regexp.prototype.flags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
+  dependencies:
+    define-properties "^1.1.2"
+
+regexpp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -8617,10 +8352,6 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
-
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -8636,6 +8367,10 @@ requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -8679,7 +8414,7 @@ resolve@^1.1.6:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.5.0, resolve@^1.6.0:
+resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -8759,16 +8494,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-
 rxjs@^5.4.2, rxjs@^5.5.2:
   version "5.5.10"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
@@ -8850,11 +8575,7 @@ selfsigned@^1.9.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-semver@^5.1.0, semver@^5.4.1, semver@^5.5.0:
+semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -8991,10 +8712,6 @@ shortid@^2.2.8:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131"
 
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -9119,7 +8836,7 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, sourc
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.4.2, source-map@^0.4.4:
+source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -9166,10 +8883,6 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
-specificity@^0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42"
-
 specificity@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.0.tgz#301b1ab5455987c37d6d94f8c956ef9d9fb48c1d"
@@ -9180,12 +8893,6 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-split2@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
-  dependencies:
-    through2 "~0.6.1"
-
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -9235,10 +8942,6 @@ static-extend@^0.1.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
 
-stdin@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/stdin/-/stdin-0.0.1.tgz#d3041981aaec3dfdbc77a1b38d6372e38f5fb71e"
-
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -9250,13 +8953,6 @@ stream-browserify@^2.0.1:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-combiner@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  dependencies:
-    duplexer "~0.1.1"
-    through "~2.3.4"
-
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -9320,6 +9016,16 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string.prototype.matchall@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.10.0"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    regexp.prototype.flags "^1.2.0"
+
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -9410,7 +9116,7 @@ strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
 
-strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -9418,24 +9124,6 @@ style-search@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
 
-styled-components-stylefmt@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/styled-components-stylefmt/-/styled-components-stylefmt-0.1.5.tgz#90f54a8c0a8b0eb640977759bff592482f6f751a"
-  dependencies:
-    babel-traverse "^6.26.0"
-    babylon "^6.18.0"
-    chalk "^2.3.0"
-    deasync "^0.1.11"
-    detect-newline "^2.1.0"
-    diff "^3.4.0"
-    escape-string-regexp "^1.0.5"
-    globby "^7.1.1"
-    indent-string "^3.2.0"
-    minimist "^1.2.0"
-    postcss "^5.2.17"
-    stylefmt "^5.3.2"
-    stylelint-processor-styled-components "^0.1.2"
-
 styled-components@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686"
@@ -9455,40 +9143,6 @@ styled-normalize@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/styled-normalize/-/styled-normalize-8.0.0.tgz#54881c9389540bf9fb2a3d34dca2e2d4d68601f2"
 
-stylefmt@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/stylefmt/-/stylefmt-5.3.2.tgz#32013437aa54d8c5253cbc107ac914dfb5ee9eea"
-  dependencies:
-    chalk "^1.1.3"
-    css-color-list "0.0.1"
-    diff "^3.1.0"
-    editorconfig "^0.13.2"
-    globby "^6.1.0"
-    minimist "^1.2.0"
-    postcss "^5.2.5"
-    postcss-scss "^0.4.0"
-    postcss-sorting "^2.0.1"
-    postcss-value-parser "^3.3.0"
-    stdin "0.0.1"
-    stylelint "^7.5.0"
-    stylelint-order "0.4.x"
-
-stylehacks@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
-  dependencies:
-    browserslist "^1.1.3"
-    chalk "^1.1.1"
-    log-symbols "^1.0.2"
-    minimist "^1.2.0"
-    plur "^2.1.2"
-    postcss "^5.0.18"
-    postcss-reporter "^1.3.3"
-    postcss-selector-parser "^2.0.0"
-    read-file-stdin "^0.2.1"
-    text-table "^0.2.0"
-    write-file-stdout "0.0.2"
-
 stylelint-config-recommended@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858"
@@ -9503,23 +9157,6 @@ stylelint-config-styled-components@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz#b408388d7c687833ab4be4c4e6522d97d2827ede"
 
-stylelint-order@0.4.x:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.4.4.tgz#db7dfca0541b5062010c7e2e21e745791fc088ac"
-  dependencies:
-    lodash "^4.17.4"
-    postcss "^5.2.16"
-    stylelint "^7.9.0"
-
-stylelint-processor-styled-components@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-0.1.2.tgz#b760efb49fe56fe625ca99b4b9b2b2fab4dc507c"
-  dependencies:
-    babel-traverse "^6.16.0"
-    babylon "^6.12.0"
-    typescript "~2.3.2"
-    typescript-eslint-parser "^3.0.0"
-
 stylelint-processor-styled-components@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.3.2.tgz#092cf8fb064b31c6d0d3bedf0c4844349e1e8f0f"
@@ -9528,50 +9165,6 @@ stylelint-processor-styled-components@^1.3.2:
     babylon "^7.0.0-beta.40"
     postcss "^6.0.14"
 
-stylelint@^7.5.0, stylelint@^7.9.0:
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.13.0.tgz#111f97b6da72e775c80800d6bb6f5f869997785d"
-  dependencies:
-    autoprefixer "^6.0.0"
-    balanced-match "^0.4.0"
-    chalk "^2.0.1"
-    colorguard "^1.2.0"
-    cosmiconfig "^2.1.1"
-    debug "^2.6.0"
-    doiuse "^2.4.1"
-    execall "^1.0.0"
-    file-entry-cache "^2.0.0"
-    get-stdin "^5.0.0"
-    globby "^6.0.0"
-    globjoin "^0.1.4"
-    html-tags "^2.0.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    known-css-properties "^0.2.0"
-    lodash "^4.17.4"
-    log-symbols "^1.0.2"
-    mathml-tag-names "^2.0.0"
-    meow "^3.3.0"
-    micromatch "^2.3.11"
-    normalize-selector "^0.2.0"
-    pify "^2.3.0"
-    postcss "^5.0.20"
-    postcss-less "^0.14.0"
-    postcss-media-query-parser "^0.2.0"
-    postcss-reporter "^3.0.0"
-    postcss-resolve-nested-selector "^0.1.1"
-    postcss-scss "^0.4.0"
-    postcss-selector-parser "^2.1.1"
-    postcss-value-parser "^3.1.1"
-    resolve-from "^3.0.0"
-    specificity "^0.3.0"
-    string-width "^2.0.0"
-    style-search "^0.1.0"
-    stylehacks "^2.3.2"
-    sugarss "^0.2.0"
-    svg-tags "^1.0.0"
-    table "^4.0.1"
-
 stylelint@^9.4.0:
   version "9.4.0"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.4.0.tgz#2f2b82ae9db53a06735ae0724f41b134fdb84a10"
@@ -9629,12 +9222,6 @@ stylis@^3.0.0, stylis@^3.5.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546"
 
-sugarss@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
-  dependencies:
-    postcss "^5.2.4"
-
 sugarss@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
@@ -9701,24 +9288,7 @@ symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-synesthesia@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
-  dependencies:
-    css-color-names "0.0.3"
-
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-
-table@^4.0.1:
+table@^4.0.1, table@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
   dependencies:
@@ -9783,7 +9353,7 @@ test-exclude@^4.2.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -9795,13 +9365,6 @@ throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
 
-through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -9809,7 +9372,7 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
+through@2, through@^2.3.6, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -9975,17 +9538,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript-eslint-parser@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-3.0.0.tgz#dd0435b303abc841464c02d00184d7b39bd488b5"
-  dependencies:
-    lodash.unescape "4.0.1"
-    semver "5.3.0"
-
-typescript@~2.3.2:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"
-
 ua-parser-js@^0.7.18:
   version "0.7.18"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
@@ -10597,10 +10149,6 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-window-size@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
-
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -10646,10 +10194,6 @@ write-file-atomic@^2.1.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-stdout@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
-
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -10678,11 +10222,11 @@ xmlhttprequest@*:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
-y18n@^3.2.0, y18n@^3.2.1:
+y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
@@ -10727,10 +10271,6 @@ yargs@11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^1.2.6:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
-
 yargs@^11.0.0, yargs@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
@@ -10748,18 +10288,6 @@ yargs@^11.0.0, yargs@^11.1.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^3.5.4:
-  version "3.32.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
-  dependencies:
-    camelcase "^2.0.1"
-    cliui "^3.0.3"
-    decamelize "^1.1.1"
-    os-locale "^1.4.0"
-    string-width "^1.0.1"
-    window-size "^0.1.4"
-    y18n "^3.2.0"
-
 yargs@~1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"

From b011184f3fc8fbf447475912a36b37157ffdedbf Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 15:06:48 +0200
Subject: [PATCH 029/103] Make better import - clickthrough vscode

---
 jsconfig.json   | 16 ++++++++++++++++
 jsonconfig.json | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 jsconfig.json
 delete mode 100644 jsonconfig.json

diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 00000000..045103d3
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": ["src/*"],
+            "components/*": ["./src/js/components/*"],
+            "config/*": ["./src/js/config/*"],
+            "constants/*": ["./src/js/constants/*"],
+            "support/*": ["./src/js/support/*"],
+            "actions/*": ["./src/js/actions/*"],
+            "reducers/*": ["./src/js/reducers/*"],
+            "utils/*": ["./src/js/utils/*"],
+            "services/*": ["./src/js/services/*"],
+        }
+    }
+}
\ No newline at end of file
diff --git a/jsonconfig.json b/jsonconfig.json
deleted file mode 100644
index 040f71ee..00000000
--- a/jsonconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "compilerOptions": {
-        "baseUrl": ".",
-        "paths": {
-            "*": [
-                "src/*"
-            ],
-            "components/*": [
-                "./js/config/*"
-            ],
-            "config/*": [
-                "./js/config/*"
-            ]
-        }
-    }
-}
\ No newline at end of file

From 246d95e097c2fc50168e13989f6bc11d03494748 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 15:10:08 +0200
Subject: [PATCH 030/103] Removed webpack plugin

---
 package.json                      |   3 +-
 webpack/config.dev.babel.js       |   2 -
 webpack/config.dev.local.babel.js |   2 -
 yarn.lock                         | 202 +++++++++++++++++-------------
 4 files changed, 117 insertions(+), 92 deletions(-)

diff --git a/package.json b/package.json
index 440f3656..bb1e775e 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,7 @@
         "babel-preset-jest": "^23.2.0",
         "babel-preset-react": "^6.24.1",
         "css-loader": "0.28.11",
-        "duplicate-package-checker-webpack-plugin": "^3.0.0",
-        "eslint": "^5.3.0",
+        "eslint": "^4",
         "eslint-config-airbnb": "^17.0.0",
         "eslint-import-resolver-babel-module": "^4.0.0",
         "eslint-plugin-flowtype": "^2.50.0",
diff --git a/webpack/config.dev.babel.js b/webpack/config.dev.babel.js
index fa186a2a..c96f7bc2 100644
--- a/webpack/config.dev.babel.js
+++ b/webpack/config.dev.babel.js
@@ -1,4 +1,3 @@
-import DuplicatePackageCheckerPlugin from 'duplicate-package-checker-webpack-plugin';
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
@@ -87,7 +86,6 @@ module.exports = {
             filename: 'index.html',
             inject: true,
         }),
-        new DuplicatePackageCheckerPlugin(),
         new webpack.optimize.OccurrenceOrderPlugin(),
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.HotModuleReplacementPlugin(),
diff --git a/webpack/config.dev.local.babel.js b/webpack/config.dev.local.babel.js
index 38569b4a..e3506e9c 100644
--- a/webpack/config.dev.local.babel.js
+++ b/webpack/config.dev.local.babel.js
@@ -1,5 +1,4 @@
 import webpack from 'webpack';
-import DuplicatePackageCheckerPlugin from 'duplicate-package-checker-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
@@ -147,7 +146,6 @@ module.exports = {
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.HotModuleReplacementPlugin(),
         new webpack.NamedModulesPlugin(),
-        new DuplicatePackageCheckerPlugin(),
 
         new webpack.DefinePlugin({
             LOCAL: JSON.stringify(`http://localhost:${PORT}/`),
diff --git a/yarn.lock b/yarn.lock
index 5ee37c96..980756a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -385,13 +385,17 @@ acorn-globals@^4.1.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-jsx@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
   dependencies:
-    acorn "^5.0.3"
+    acorn "^3.0.4"
 
-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0, acorn@^5.6.2:
+acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
 
@@ -401,6 +405,10 @@ add-dom-event-listener@1.x:
   dependencies:
     object-assign "4.x"
 
+ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+
 ajv-keywords@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
@@ -416,7 +424,7 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
+ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -425,7 +433,7 @@ ajv@^5.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.0.1, ajv@^6.5.0:
+ajv@^6.0.1:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
   dependencies:
@@ -776,7 +784,7 @@ babel-cli@^6.24.1:
   optionalDependencies:
     chokidar "^1.6.1"
 
-babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -2439,6 +2447,15 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
@@ -2578,7 +2595,7 @@ cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1:
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -3109,15 +3126,6 @@ duplexify@^3.4.2, duplexify@^3.5.3:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-duplicate-package-checker-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/duplicate-package-checker-webpack-plugin/-/duplicate-package-checker-webpack-plugin-3.0.0.tgz#78bb89e625fa7cf8c2a59c53f62b495fda9ba287"
-  dependencies:
-    chalk "^2.3.0"
-    find-root "^1.0.0"
-    lodash "^4.17.4"
-    semver "^5.4.1"
-
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -3233,7 +3241,7 @@ error@^7.0.2:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1:
+es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
   dependencies:
@@ -3398,6 +3406,13 @@ eslint-scope@3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-scope@^3.7.1:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -3405,64 +3420,59 @@ eslint-scope@^4.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
-
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8"
+eslint@^4:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
   dependencies:
-    ajv "^6.5.0"
-    babel-code-frame "^6.26.0"
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
     chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
     debug "^3.1.0"
     doctrine "^2.1.0"
-    eslint-scope "^4.0.0"
-    eslint-utils "^1.3.1"
+    eslint-scope "^3.7.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^4.0.0"
-    esquery "^1.0.1"
+    espree "^3.5.4"
+    esquery "^1.0.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
-    globals "^11.7.0"
-    ignore "^4.0.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
     imurmurhash "^0.1.4"
-    inquirer "^5.2.0"
-    is-resolvable "^1.1.0"
-    js-yaml "^3.11.0"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.5"
-    minimatch "^3.0.4"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^2.0.0"
+    regexpp "^1.0.1"
     require-uncached "^1.0.3"
-    semver "^5.5.0"
-    string.prototype.matchall "^2.0.0"
+    semver "^5.3.0"
     strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
-    table "^4.0.3"
-    text-table "^0.2.0"
+    strip-json-comments "~2.0.1"
+    table "4.0.2"
+    text-table "~0.2.0"
 
-espree@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
+espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.6.0"
-    acorn-jsx "^4.1.1"
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
 
 esprima@^2.6.0:
   version "2.7.3"
@@ -3480,7 +3490,7 @@ esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
-esquery@^1.0.1:
+esquery@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
@@ -3715,7 +3725,7 @@ extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.1.0:
+external-editor@^2.0.4, external-editor@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
@@ -3903,10 +3913,6 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
-find-root@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4200,7 +4206,7 @@ global@^4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.0.1, globals@^11.1.0:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
 
@@ -4683,6 +4689,10 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
+ignore@^3.3.3:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+
 ignore@^3.3.5:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -4691,10 +4701,6 @@ ignore@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.5.tgz#333535a20325ba4852c4ddb135d47392aa035e6d"
 
-ignore@^4.0.2:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -4751,6 +4757,25 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
+inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
 inquirer@^5.1.0, inquirer@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
@@ -5069,7 +5094,7 @@ is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
 
-is-resolvable@^1.1.0:
+is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
@@ -5537,7 +5562,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.11.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -8159,15 +8184,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
-  dependencies:
-    define-properties "^1.1.2"
-
-regexpp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -8494,6 +8513,16 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+
 rxjs@^5.4.2, rxjs@^5.5.2:
   version "5.5.10"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
@@ -9016,16 +9045,6 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.matchall@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.10.0"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    regexp.prototype.flags "^1.2.0"
-
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -9116,7 +9135,7 @@ strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
 
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -9288,7 +9307,18 @@ symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-table@^4.0.1, table@^4.0.3:
+table@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+  dependencies:
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
+table@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
   dependencies:
@@ -9353,7 +9383,7 @@ test-exclude@^4.2.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-text-table@^0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 

From cb14cfdfe7560857e9e03c93dc8d8e82e4f759c9 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 15:11:52 +0200
Subject: [PATCH 031/103] Removed relative paths

---
 src/js/index.js                           |  2 +-
 src/js/reducers/AccountsReducer.js        |  8 ++++----
 src/js/reducers/DevicesReducer.js         |  4 ++--
 src/js/reducers/DiscoveryReducer.js       | 12 ++++++------
 src/js/reducers/LocalStorageReducer.js    |  2 +-
 src/js/reducers/LogReducer.js             |  2 +-
 src/js/reducers/ModalReducer.js           |  6 +++---
 src/js/reducers/NotificationReducer.js    |  2 +-
 src/js/reducers/PendingTxReducer.js       |  8 ++++----
 src/js/reducers/ReceiveReducer.js         |  4 ++--
 src/js/reducers/SelectedAccountReducer.js |  2 +-
 src/js/reducers/SendFormReducer.js        | 12 ++++++------
 src/js/reducers/SummaryReducer.js         |  4 ++--
 src/js/reducers/TokensReducer.js          |  6 +++---
 src/js/reducers/TrezorConnectReducer.js   |  4 ++--
 src/js/reducers/WalletReducer.js          |  8 ++++----
 src/js/reducers/Web3Reducer.js            |  6 +++---
 src/js/services/CoinmarketcapService.js   |  2 +-
 src/js/services/LocalStorageService.js    | 20 ++++++++++----------
 src/js/services/LogService.js             |  8 ++++----
 src/js/services/RouterService.js          |  6 +++---
 src/js/services/TrezorConnectService.js   | 18 +++++++++---------
 src/js/services/WalletService.js          | 10 +++++-----
 23 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/js/index.js b/src/js/index.js
index 8fabf37f..0f241bdb 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -4,7 +4,7 @@ import { render } from 'react-dom';
 import baseStyles from 'support/BaseStyles';
 import store from './store';
 import App from './router';
-import { onBeforeUnload } from './actions/WalletActions';
+import { onBeforeUnload } from 'actions/WalletActions';
 import styles from 'styles/index.less';
 
 const root: ?HTMLElement = document.getElementById('root');
diff --git a/src/js/reducers/AccountsReducer.js b/src/js/reducers/AccountsReducer.js
index e17893bf..c601424f 100644
--- a/src/js/reducers/AccountsReducer.js
+++ b/src/js/reducers/AccountsReducer.js
@@ -1,16 +1,16 @@
 /* @flow */
 
 
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as WALLET from '../actions/constants/wallet';
-import * as ACCOUNT from '../actions/constants/account';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as WALLET from 'actions/constants/wallet';
+import * as ACCOUNT from 'actions/constants/account';
 
 import type { Action, TrezorDevice } from 'flowtype';
 import type {
     AccountCreateAction,
     AccountSetBalanceAction,
     AccountSetNonceAction,
-} from '../actions/AccountsActions';
+} from 'actions/AccountsActions';
 
 export type Account = {
     loaded: boolean;
diff --git a/src/js/reducers/DevicesReducer.js b/src/js/reducers/DevicesReducer.js
index 97816341..b360499f 100644
--- a/src/js/reducers/DevicesReducer.js
+++ b/src/js/reducers/DevicesReducer.js
@@ -3,8 +3,8 @@
 
 import { TRANSPORT, DEVICE } from 'trezor-connect';
 import type { Device } from 'trezor-connect';
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as WALLET from '../actions/constants/wallet';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as WALLET from 'actions/constants/wallet';
 
 import type { Action, TrezorDevice } from 'flowtype';
 
diff --git a/src/js/reducers/DiscoveryReducer.js b/src/js/reducers/DiscoveryReducer.js
index 991cffca..81e8ffb7 100644
--- a/src/js/reducers/DiscoveryReducer.js
+++ b/src/js/reducers/DiscoveryReducer.js
@@ -3,10 +3,10 @@
 
 import HDKey from 'hdkey';
 
-import * as DISCOVERY from '../actions/constants/discovery';
-import * as ACCOUNT from '../actions/constants/account';
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as WALLET from '../actions/constants/wallet';
+import * as DISCOVERY from 'actions/constants/discovery';
+import * as ACCOUNT from 'actions/constants/account';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as WALLET from 'actions/constants/wallet';
 
 import type { Action, TrezorDevice } from 'flowtype';
 import type {
@@ -14,11 +14,11 @@ import type {
     DiscoveryWaitingAction,
     DiscoveryStopAction,
     DiscoveryCompleteAction,
-} from '../actions/DiscoveryActions';
+} from 'actions/DiscoveryActions';
 
 import type {
     AccountCreateAction,
-} from '../actions/AccountsActions';
+} from 'actions/AccountsActions';
 
 export type Discovery = {
     network: string;
diff --git a/src/js/reducers/LocalStorageReducer.js b/src/js/reducers/LocalStorageReducer.js
index 3b57dba7..bfbc3491 100644
--- a/src/js/reducers/LocalStorageReducer.js
+++ b/src/js/reducers/LocalStorageReducer.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 
-import * as STORAGE from '../actions/constants/localStorage';
+import * as STORAGE from 'actions/constants/localStorage';
 
 import type { Action } from 'flowtype';
 
diff --git a/src/js/reducers/LogReducer.js b/src/js/reducers/LogReducer.js
index 5516e3ad..a020bcf7 100644
--- a/src/js/reducers/LogReducer.js
+++ b/src/js/reducers/LogReducer.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 
-import * as LOG from '../actions/constants/log';
+import * as LOG from 'actions/constants/log';
 import type { Action } from 'flowtype';
 
 export type LogEntry = {
diff --git a/src/js/reducers/ModalReducer.js b/src/js/reducers/ModalReducer.js
index 47338d44..f6e09a51 100644
--- a/src/js/reducers/ModalReducer.js
+++ b/src/js/reducers/ModalReducer.js
@@ -2,9 +2,9 @@
 
 
 import { UI, DEVICE } from 'trezor-connect';
-import * as RECEIVE from '../actions/constants/receive';
-import * as MODAL from '../actions/constants/modal';
-import * as CONNECT from '../actions/constants/TrezorConnect';
+import * as RECEIVE from 'actions/constants/receive';
+import * as MODAL from 'actions/constants/modal';
+import * as CONNECT from 'actions/constants/TrezorConnect';
 
 import type { Action, TrezorDevice } from 'flowtype';
 
diff --git a/src/js/reducers/NotificationReducer.js b/src/js/reducers/NotificationReducer.js
index d2171f3d..0ffec17d 100644
--- a/src/js/reducers/NotificationReducer.js
+++ b/src/js/reducers/NotificationReducer.js
@@ -2,7 +2,7 @@
 
 
 import { LOCATION_CHANGE } from 'react-router-redux';
-import * as NOTIFICATION from '../actions/constants/notification';
+import * as NOTIFICATION from 'actions/constants/notification';
 import { DEVICE } from 'trezor-connect';
 
 import type { Action } from 'flowtype';
diff --git a/src/js/reducers/PendingTxReducer.js b/src/js/reducers/PendingTxReducer.js
index 8e093cd1..88874502 100644
--- a/src/js/reducers/PendingTxReducer.js
+++ b/src/js/reducers/PendingTxReducer.js
@@ -1,12 +1,12 @@
 /* @flow */
 
 
-import * as PENDING from '../actions/constants/pendingTx';
-import * as SEND from '../actions/constants/send';
-import * as WEB3 from '../actions/constants/web3';
+import * as PENDING from 'actions/constants/pendingTx';
+import * as SEND from 'actions/constants/send';
+import * as WEB3 from 'actions/constants/web3';
 
 import type { Action } from 'flowtype';
-import type { SendTxAction } from '../actions/SendFormActions';
+import type { SendTxAction } from 'actions/SendFormActions';
 
 export type PendingTx = {
     +id: string;
diff --git a/src/js/reducers/ReceiveReducer.js b/src/js/reducers/ReceiveReducer.js
index f57beca6..45ba0ff6 100644
--- a/src/js/reducers/ReceiveReducer.js
+++ b/src/js/reducers/ReceiveReducer.js
@@ -2,8 +2,8 @@
 
 
 import { UI } from 'trezor-connect';
-import * as RECEIVE from '../actions/constants/receive';
-import * as ACCOUNT from '../actions/constants/account';
+import * as RECEIVE from 'actions/constants/receive';
+import * as ACCOUNT from 'actions/constants/account';
 import type { Action } from 'flowtype';
 
 
diff --git a/src/js/reducers/SelectedAccountReducer.js b/src/js/reducers/SelectedAccountReducer.js
index c6a65efd..d2a0cbea 100644
--- a/src/js/reducers/SelectedAccountReducer.js
+++ b/src/js/reducers/SelectedAccountReducer.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 
-import * as ACCOUNT from '../actions/constants/account';
+import * as ACCOUNT from 'actions/constants/account';
 
 import type {
     Action,
diff --git a/src/js/reducers/SendFormReducer.js b/src/js/reducers/SendFormReducer.js
index 84453927..65ce1447 100644
--- a/src/js/reducers/SendFormReducer.js
+++ b/src/js/reducers/SendFormReducer.js
@@ -3,17 +3,17 @@
 
 import EthereumjsUnits from 'ethereumjs-units';
 import BigNumber from 'bignumber.js';
-import * as SEND from '../actions/constants/send';
-import * as WEB3 from '../actions/constants/web3';
-import * as ACCOUNT from '../actions/constants/account';
-import * as WALLET from '../actions/constants/wallet';
+import * as SEND from 'actions/constants/send';
+import * as WEB3 from 'actions/constants/web3';
+import * as ACCOUNT from 'actions/constants/account';
+import * as WALLET from 'actions/constants/wallet';
 
-import { getFeeLevels } from '../actions/SendFormActions';
+import { getFeeLevels } from 'actions/SendFormActions';
 
 import type { Action } from 'flowtype';
 import type {
     Web3UpdateGasPriceAction,
-} from '../actions/Web3Actions';
+} from 'actions/Web3Actions';
 
 export type State = {
     +networkName: string;
diff --git a/src/js/reducers/SummaryReducer.js b/src/js/reducers/SummaryReducer.js
index fe35f06d..3b0e6f62 100644
--- a/src/js/reducers/SummaryReducer.js
+++ b/src/js/reducers/SummaryReducer.js
@@ -1,8 +1,8 @@
 /* @flow */
 
 
-import * as ACCOUNT from '../actions/constants/account';
-import * as SUMMARY from '../actions/constants/summary';
+import * as ACCOUNT from 'actions/constants/account';
+import * as SUMMARY from 'actions/constants/summary';
 import type { Action } from 'flowtype';
 import type { NetworkToken } from './LocalStorageReducer';
 
diff --git a/src/js/reducers/TokensReducer.js b/src/js/reducers/TokensReducer.js
index d0a04b3a..6c6455c7 100644
--- a/src/js/reducers/TokensReducer.js
+++ b/src/js/reducers/TokensReducer.js
@@ -1,9 +1,9 @@
 /* @flow */
 
 
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as WALLET from '../actions/constants/wallet';
-import * as TOKEN from '../actions/constants/token';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as WALLET from 'actions/constants/wallet';
+import * as TOKEN from 'actions/constants/token';
 
 import type { Action, TrezorDevice } from 'flowtype';
 import type { Account } from './AccountsReducer';
diff --git a/src/js/reducers/TrezorConnectReducer.js b/src/js/reducers/TrezorConnectReducer.js
index b971d648..bf8c66bd 100644
--- a/src/js/reducers/TrezorConnectReducer.js
+++ b/src/js/reducers/TrezorConnectReducer.js
@@ -3,8 +3,8 @@
 
 import { TRANSPORT, DEVICE, UI } from 'trezor-connect';
 import type { Device } from 'trezor-connect';
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as WALLET from '../actions/constants/wallet';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as WALLET from 'actions/constants/wallet';
 
 import type { Action, TrezorDevice } from 'flowtype';
 
diff --git a/src/js/reducers/WalletReducer.js b/src/js/reducers/WalletReducer.js
index 2317a770..aa4f6d26 100644
--- a/src/js/reducers/WalletReducer.js
+++ b/src/js/reducers/WalletReducer.js
@@ -3,10 +3,10 @@
 
 import { LOCATION_CHANGE } from 'react-router-redux';
 import { DEVICE } from 'trezor-connect';
-import * as MODAL from '../actions/constants/modal';
-import * as WEB3 from '../actions/constants/web3';
-import * as WALLET from '../actions/constants/wallet';
-import * as CONNECT from '../actions/constants/TrezorConnect';
+import * as MODAL from 'actions/constants/modal';
+import * as WEB3 from 'actions/constants/web3';
+import * as WALLET from 'actions/constants/wallet';
+import * as CONNECT from 'actions/constants/TrezorConnect';
 
 
 import type { Action, RouterLocationState, TrezorDevice } from 'flowtype';
diff --git a/src/js/reducers/Web3Reducer.js b/src/js/reducers/Web3Reducer.js
index ab95c61e..8de6714c 100644
--- a/src/js/reducers/Web3Reducer.js
+++ b/src/js/reducers/Web3Reducer.js
@@ -4,14 +4,14 @@
 import Web3 from 'web3';
 
 import type { ContractFactory } from 'web3';
-import * as STORAGE from '../actions/constants/localStorage';
-import * as WEB3 from '../actions/constants/web3';
+import * as STORAGE from 'actions/constants/localStorage';
+import * as WEB3 from 'actions/constants/web3';
 
 import type { Action } from 'flowtype';
 import type {
     Web3UpdateBlockAction,
     Web3UpdateGasPriceAction,
-} from '../actions/Web3Actions';
+} from 'actions/Web3Actions';
 
 export type Web3Instance = {
     network: string;
diff --git a/src/js/services/CoinmarketcapService.js b/src/js/services/CoinmarketcapService.js
index 8911d6d3..f4c5466b 100644
--- a/src/js/services/CoinmarketcapService.js
+++ b/src/js/services/CoinmarketcapService.js
@@ -3,7 +3,7 @@
 
 import { JSONRequest, httpRequest } from '../utils/networkUtils';
 import { resolveAfter } from '../utils/promiseUtils';
-import { READY } from '../actions/constants/localStorage';
+import { READY } from 'actions/constants/localStorage';
 
 import type {
     Middleware,
diff --git a/src/js/services/LocalStorageService.js b/src/js/services/LocalStorageService.js
index 3265a732..831b473f 100644
--- a/src/js/services/LocalStorageService.js
+++ b/src/js/services/LocalStorageService.js
@@ -3,17 +3,17 @@
 
 import { DEVICE } from 'trezor-connect';
 import { LOCATION_CHANGE } from 'react-router-redux';
-import * as LocalStorageActions from '../actions/LocalStorageActions';
-import * as WalletActions from '../actions/WalletActions';
+import * as LocalStorageActions from 'actions/LocalStorageActions';
+import * as WalletActions from 'actions/WalletActions';
 
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as MODAL from '../actions/constants/modal';
-import * as TOKEN from '../actions/constants/token';
-import * as ACCOUNT from '../actions/constants/account';
-import * as DISCOVERY from '../actions/constants/discovery';
-import * as SEND from '../actions/constants/send';
-import * as WEB3 from '../actions/constants/web3';
-import * as PENDING from '../actions/constants/pendingTx';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as MODAL from 'actions/constants/modal';
+import * as TOKEN from 'actions/constants/token';
+import * as ACCOUNT from 'actions/constants/account';
+import * as DISCOVERY from 'actions/constants/discovery';
+import * as SEND from 'actions/constants/send';
+import * as WEB3 from 'actions/constants/web3';
+import * as PENDING from 'actions/constants/pendingTx';
 import { findAccountTokens } from '../reducers/TokensReducer';
 
 import type {
diff --git a/src/js/services/LogService.js b/src/js/services/LogService.js
index 3f308992..492eee4f 100644
--- a/src/js/services/LogService.js
+++ b/src/js/services/LogService.js
@@ -1,10 +1,10 @@
 /* @flow */
 
 
-import * as LogActions from '../actions/LogActions';
-import * as STORAGE from '../actions/constants/localStorage';
-import * as SEND from '../actions/constants/send';
-import { OPEN, CLOSE, ADD } from '../actions/constants/log';
+import * as LogActions from 'actions/LogActions';
+import * as STORAGE from 'actions/constants/localStorage';
+import * as SEND from 'actions/constants/send';
+import { OPEN, CLOSE, ADD } from 'actions/constants/log';
 import { TRANSPORT, DEVICE } from 'trezor-connect';
 
 import type {
diff --git a/src/js/services/RouterService.js b/src/js/services/RouterService.js
index 00b31cf4..b40a60f2 100644
--- a/src/js/services/RouterService.js
+++ b/src/js/services/RouterService.js
@@ -3,9 +3,9 @@
 
 import { DEVICE } from 'trezor-connect';
 import { LOCATION_CHANGE, push, replace } from 'react-router-redux';
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as WALLET from '../actions/constants/wallet';
-import * as NotificationActions from '../actions/NotificationActions';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as WALLET from 'actions/constants/wallet';
+import * as NotificationActions from 'actions/NotificationActions';
 
 import type {
     Middleware,
diff --git a/src/js/services/TrezorConnectService.js b/src/js/services/TrezorConnectService.js
index a6d8fbd3..978ff2bd 100644
--- a/src/js/services/TrezorConnectService.js
+++ b/src/js/services/TrezorConnectService.js
@@ -6,15 +6,15 @@ import { push } from 'react-router-redux';
 import TrezorConnect, {
     TRANSPORT, DEVICE_EVENT, UI_EVENT, UI, DEVICE,
 } from 'trezor-connect';
-import * as TrezorConnectActions from '../actions/TrezorConnectActions';
-import * as DiscoveryActions from '../actions/DiscoveryActions';
-import * as ModalActions from '../actions/ModalActions';
-import { init as initWeb3 } from '../actions/Web3Actions';
-import * as WEB3 from '../actions/constants/web3';
-import * as STORAGE from '../actions/constants/localStorage';
-import * as CONNECT from '../actions/constants/TrezorConnect';
-import * as NOTIFICATION from '../actions/constants/notification';
-import * as MODAL from '../actions/constants/modal';
+import * as TrezorConnectActions from 'actions/TrezorConnectActions';
+import * as DiscoveryActions from 'actions/DiscoveryActions';
+import * as ModalActions from 'actions/ModalActions';
+import { init as initWeb3 } from 'actions/Web3Actions';
+import * as WEB3 from 'actions/constants/web3';
+import * as STORAGE from 'actions/constants/localStorage';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as NOTIFICATION from 'actions/constants/notification';
+import * as MODAL from 'actions/constants/modal';
 
 import type {
     Middleware,
diff --git a/src/js/services/WalletService.js b/src/js/services/WalletService.js
index 1eb653ba..8b0a69ad 100644
--- a/src/js/services/WalletService.js
+++ b/src/js/services/WalletService.js
@@ -3,12 +3,12 @@
 
 import { DEVICE } from 'trezor-connect';
 import { LOCATION_CHANGE } from 'react-router-redux';
-import * as WALLET from '../actions/constants/wallet';
+import * as WALLET from 'actions/constants/wallet';
 
-import * as WalletActions from '../actions/WalletActions';
-import * as LocalStorageActions from '../actions/LocalStorageActions';
-import * as TrezorConnectActions from '../actions/TrezorConnectActions';
-import * as SelectedAccountActions from '../actions/SelectedAccountActions';
+import * as WalletActions from 'actions/WalletActions';
+import * as LocalStorageActions from 'actions/LocalStorageActions';
+import * as TrezorConnectActions from 'actions/TrezorConnectActions';
+import * as SelectedAccountActions from 'actions/SelectedAccountActions';
 
 import type {
     Middleware,

From 9a735f7b96881b5bd601947577c634584b79bd47 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 15:18:16 +0200
Subject: [PATCH 032/103] Adjust more relative paths

---
 src/js/actions/AccountsActions.js        |  4 ++--
 src/js/actions/DiscoveryActions.js       | 10 ++++----
 src/js/actions/LocalStorageActions.js    | 16 ++++++-------
 src/js/actions/LogActions.js             |  4 ++--
 src/js/actions/ModalActions.js           |  6 ++---
 src/js/actions/NotificationActions.js    |  4 ++--
 src/js/actions/PendingTxActions.js       |  4 ++--
 src/js/actions/ReceiveActions.js         |  8 +++----
 src/js/actions/SelectedAccountActions.js | 12 +++++-----
 src/js/actions/SendFormActions.js        | 30 ++++++++++++------------
 src/js/actions/SessionStorageActions.js  |  2 +-
 src/js/actions/SummaryActions.js         | 12 +++++-----
 src/js/actions/TokenActions.js           |  8 +++----
 src/js/actions/TrezorConnectActions.js   | 10 ++++----
 src/js/actions/WalletActions.js          |  6 ++---
 src/js/actions/Web3Actions.js            | 16 ++++++-------
 src/js/index.js                          |  2 +-
 src/js/reducers/FiatRateReducer.js       |  4 ++--
 src/js/router/index.js                   | 26 ++++++++++----------
 src/js/services/CoinmarketcapService.js  |  6 ++---
 src/js/services/LocalStorageService.js   | 10 ++++----
 src/js/store/index.js                    |  4 ++--
 22 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/src/js/actions/AccountsActions.js b/src/js/actions/AccountsActions.js
index 13dd4853..ba4dd1a6 100644
--- a/src/js/actions/AccountsActions.js
+++ b/src/js/actions/AccountsActions.js
@@ -1,8 +1,8 @@
 /* @flow */
 
-import * as ACCOUNT from './constants/account';
+import * as ACCOUNT from 'actions/constants/account';
 import type { Action, TrezorDevice } from 'flowtype';
-import type { State } from '../reducers/AccountsReducer';
+import type { State } from 'reducers/AccountsReducer';
 
 export type AccountAction =
     AccountFromStorageAction
diff --git a/src/js/actions/DiscoveryActions.js b/src/js/actions/DiscoveryActions.js
index 02562f51..27264681 100644
--- a/src/js/actions/DiscoveryActions.js
+++ b/src/js/actions/DiscoveryActions.js
@@ -3,10 +3,10 @@
 import TrezorConnect from 'trezor-connect';
 import HDKey from 'hdkey';
 import EthereumjsUtil from 'ethereumjs-util';
-import * as DISCOVERY from './constants/discovery';
-import * as ACCOUNT from './constants/account';
-import * as TOKEN from './constants/token';
-import * as NOTIFICATION from './constants/notification';
+import * as DISCOVERY from 'actions/constants/discovery';
+import * as ACCOUNT from 'actions/constants/account';
+import * as TOKEN from 'actions/constants/token';
+import * as NOTIFICATION from 'actions/constants/notification';
 import * as AccountsActions from './AccountsActions';
 
 import { getNonceAsync, getBalanceAsync, getTokenBalanceAsync } from './Web3Actions';
@@ -16,7 +16,7 @@ import type {
     ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice,
 } from 'flowtype';
 
-import type { Discovery, State } from '../reducers/DiscoveryReducer';
+import type { Discovery, State } from 'reducers/DiscoveryReducer';
 
 export type DiscoveryAction = {
     type: typeof DISCOVERY.FROM_STORAGE,
diff --git a/src/js/actions/LocalStorageActions.js b/src/js/actions/LocalStorageActions.js
index 443593be..a434af9a 100644
--- a/src/js/actions/LocalStorageActions.js
+++ b/src/js/actions/LocalStorageActions.js
@@ -1,18 +1,18 @@
 /* @flow */
 
 
-import * as CONNECT from './constants/TrezorConnect';
-import * as ACCOUNT from './constants/account';
-import * as TOKEN from './constants/token';
-import * as DISCOVERY from './constants/discovery';
-import * as STORAGE from './constants/localStorage';
-import * as PENDING from './constants/pendingTx';
-import { JSONRequest, httpRequest } from '../utils/networkUtils';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as ACCOUNT from 'actions/constants/account';
+import * as TOKEN from 'actions/constants/token';
+import * as DISCOVERY from 'actions/constants/discovery';
+import * as STORAGE from 'actions/constants/localStorage';
+import * as PENDING from 'actions/constants/pendingTx';
+import { JSONRequest, httpRequest } from 'utils/networkUtils';
 
 import type {
     ThunkAction, AsyncAction, GetState, Dispatch, TrezorDevice,
 } from 'flowtype';
-import type { Config, Coin, TokensCollection } from '../reducers/LocalStorageReducer';
+import type { Config, Coin, TokensCollection } from 'reducers/LocalStorageReducer';
 
 import AppConfigJSON from 'data/appConfig.json';
 import Erc20AbiJSON from 'data/ERC20Abi.json';
diff --git a/src/js/actions/LogActions.js b/src/js/actions/LogActions.js
index 871c8fe6..c841cd1e 100644
--- a/src/js/actions/LogActions.js
+++ b/src/js/actions/LogActions.js
@@ -1,12 +1,12 @@
 /* @flow */
 
 
-import * as LOG from './constants/log';
+import * as LOG from 'actions/constants/log';
 
 import type {
     Action, ThunkAction, GetState, Dispatch,
 } from 'flowtype';
-import type { LogEntry } from '../reducers/LogReducer';
+import type { LogEntry } from 'reducers/LogReducer';
 
 export type LogAction = {
     type: typeof LOG.OPEN,
diff --git a/src/js/actions/ModalActions.js b/src/js/actions/ModalActions.js
index 53eee676..c4e75f56 100644
--- a/src/js/actions/ModalActions.js
+++ b/src/js/actions/ModalActions.js
@@ -3,13 +3,13 @@
 
 import TrezorConnect, { UI, UI_EVENT } from 'trezor-connect';
 import type { Device } from 'trezor-connect';
-import * as MODAL from './constants/modal';
-import * as CONNECT from './constants/TrezorConnect';
+import * as MODAL from 'actions/constants/modal';
+import * as CONNECT from 'actions/constants/TrezorConnect';
 
 import type {
     ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice,
 } from 'flowtype';
-import type { State } from '../reducers/ModalReducer';
+import type { State } from 'reducers/ModalReducer';
 
 export type ModalAction = {
     type: typeof MODAL.CLOSE
diff --git a/src/js/actions/NotificationActions.js b/src/js/actions/NotificationActions.js
index c2fd37c6..05f8b685 100644
--- a/src/js/actions/NotificationActions.js
+++ b/src/js/actions/NotificationActions.js
@@ -1,12 +1,12 @@
 /* @flow */
 
 
-import * as NOTIFICATION from './constants/notification';
+import * as NOTIFICATION from 'actions/constants/notification';
 
 import type {
     Action, AsyncAction, GetState, Dispatch, RouterLocationState,
 } from 'flowtype';
-import type { CallbackAction } from '../reducers/NotificationReducer';
+import type { CallbackAction } from 'reducers/NotificationReducer';
 
 export type NotificationAction = {
     type: typeof NOTIFICATION.ADD,
diff --git a/src/js/actions/PendingTxActions.js b/src/js/actions/PendingTxActions.js
index ece7c37c..f9ebb839 100644
--- a/src/js/actions/PendingTxActions.js
+++ b/src/js/actions/PendingTxActions.js
@@ -1,8 +1,8 @@
 /* @flow */
 
 
-import * as PENDING from './constants/pendingTx';
-import type { State, PendingTx } from '../reducers/PendingTxReducer';
+import * as PENDING from 'actions/constants/pendingTx';
+import type { State, PendingTx } from 'reducers/PendingTxReducer';
 
 export type PendingTxAction = {
     type: typeof PENDING.FROM_STORAGE,
diff --git a/src/js/actions/ReceiveActions.js b/src/js/actions/ReceiveActions.js
index 239331b6..62b1b021 100644
--- a/src/js/actions/ReceiveActions.js
+++ b/src/js/actions/ReceiveActions.js
@@ -2,11 +2,11 @@
 
 
 import TrezorConnect from 'trezor-connect';
-import * as RECEIVE from './constants/receive';
-import * as NOTIFICATION from './constants/notification';
+import * as RECEIVE from 'actions/constants/receive';
+import * as NOTIFICATION from 'actions/constants/notification';
 
-import { initialState } from '../reducers/ReceiveReducer';
-import type { State } from '../reducers/ReceiveReducer';
+import { initialState } from 'reducers/ReceiveReducer';
+import type { State } from 'reducers/ReceiveReducer';
 
 import type {
     TrezorDevice, ThunkAction, AsyncAction, Action, GetState, Dispatch,
diff --git a/src/js/actions/SelectedAccountActions.js b/src/js/actions/SelectedAccountActions.js
index 5887f901..dd0e3754 100644
--- a/src/js/actions/SelectedAccountActions.js
+++ b/src/js/actions/SelectedAccountActions.js
@@ -2,16 +2,16 @@
 
 
 import { LOCATION_CHANGE } from 'react-router-redux';
-import * as ACCOUNT from './constants/account';
-import * as SEND from './constants/send';
-import * as NOTIFICATION from './constants/notification';
-import * as PENDING from './constants/pendingTx';
+import * as ACCOUNT from 'actions/constants/account';
+import * as SEND from 'actions/constants/send';
+import * as NOTIFICATION from 'actions/constants/notification';
+import * as PENDING from 'actions/constants/pendingTx';
 
 import * as SendFormActions from './SendFormActions';
 import * as SessionStorageActions from './SessionStorageActions';
-import * as stateUtils from '../reducers/utils';
+import * as stateUtils from 'reducers/utils';
 
-import { initialState } from '../reducers/SelectedAccountReducer';
+import { initialState } from 'reducers/SelectedAccountReducer';
 
 import type {
     Coin,
diff --git a/src/js/actions/SendFormActions.js b/src/js/actions/SendFormActions.js
index 3438312b..5cf443fd 100644
--- a/src/js/actions/SendFormActions.js
+++ b/src/js/actions/SendFormActions.js
@@ -7,17 +7,17 @@ import EthereumjsTx from 'ethereumjs-tx';
 import TrezorConnect from 'trezor-connect';
 import { push } from 'react-router-redux';
 import BigNumber from 'bignumber.js';
-import { strip } from '../utils/ethUtils';
+import { strip } from 'utils/ethUtils';
 import { estimateGas, getGasPrice, pushTx } from './Web3Actions';
 import * as SessionStorageActions from './SessionStorageActions';
-import * as NOTIFICATION from './constants/notification';
-import * as SEND from './constants/send';
+import * as NOTIFICATION from 'actions/constants/notification';
+import * as SEND from 'actions/constants/send';
 
-import { initialState } from '../reducers/SendFormReducer';
-import { findAccount } from '../reducers/AccountsReducer';
-import { findToken } from '../reducers/TokensReducer';
-import { findDevice } from '../reducers/utils';
-import * as stateUtils from '../reducers/utils';
+import { initialState } from 'reducers/SendFormReducer';
+import { findAccount } from 'reducers/AccountsReducer';
+import { findToken } from 'reducers/TokensReducer';
+import { findDevice } from 'reducers/utils';
+import * as stateUtils from 'reducers/utils';
 
 import type {
     PendingTx,
@@ -29,13 +29,13 @@ import type {
     RouterLocationState,
     TrezorDevice,
 } from 'flowtype';
-import type { State as AccountState } from '../reducers/SelectedAccountReducer';
-import type { Web3Instance } from '../reducers/Web3Reducer';
-import type { Config, Coin } from '../reducers/LocalStorageReducer';
-import type { Token } from '../reducers/TokensReducer';
-import type { State, FeeLevel } from '../reducers/SendFormReducer';
-import type { Account } from '../reducers/AccountsReducer';
-import type { Props } from '../components/wallet/account/send';
+import type { State as AccountState } from 'reducers/SelectedAccountReducer';
+import type { Web3Instance } from 'reducers/Web3Reducer';
+import type { Config, Coin } from 'reducers/LocalStorageReducer';
+import type { Token } from 'reducers/TokensReducer';
+import type { State, FeeLevel } from 'reducers/SendFormReducer';
+import type { Account } from 'reducers/AccountsReducer';
+import type { Props } from 'components/wallet/account/send';
 
 export type SendTxAction = {
     type: typeof SEND.TX_COMPLETE,
diff --git a/src/js/actions/SessionStorageActions.js b/src/js/actions/SessionStorageActions.js
index 51fcb475..9457aa14 100644
--- a/src/js/actions/SessionStorageActions.js
+++ b/src/js/actions/SessionStorageActions.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 
-import type { State as SendFormState } from '../reducers/SendFormReducer';
+import type { State as SendFormState } from 'reducers/SendFormReducer';
 import type {
     ThunkAction,
     GetState,
diff --git a/src/js/actions/SummaryActions.js b/src/js/actions/SummaryActions.js
index 203affff..3378be06 100644
--- a/src/js/actions/SummaryActions.js
+++ b/src/js/actions/SummaryActions.js
@@ -2,16 +2,16 @@
 
 
 import EthereumjsUtil from 'ethereumjs-util';
-import * as SUMMARY from './constants/summary';
-import * as TOKEN from './constants/token';
-import { resolveAfter } from '../utils/promiseUtils';
-import { initialState } from '../reducers/SummaryReducer';
+import * as SUMMARY from 'actions/constants/summary';
+import * as TOKEN from 'actions/constants/token';
+import { resolveAfter } from 'utils/promiseUtils';
+import { initialState } from 'reducers/SummaryReducer';
 
 import type {
     ThunkAction, AsyncAction, Action, GetState, Dispatch,
 } from 'flowtype';
-import type { State } from '../reducers/SummaryReducer';
-import type { Token } from '../reducers/TokensReducer';
+import type { State } from 'reducers/SummaryReducer';
+import type { Token } from 'reducers/TokensReducer';
 
 export type SummaryAction = {
     type: typeof SUMMARY.INIT,
diff --git a/src/js/actions/TokenActions.js b/src/js/actions/TokenActions.js
index 296159ae..deceb717 100644
--- a/src/js/actions/TokenActions.js
+++ b/src/js/actions/TokenActions.js
@@ -1,15 +1,15 @@
 /* @flow */
 
 
-import * as TOKEN from './constants/token';
+import * as TOKEN from 'actions/constants/token';
 import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions';
 
 import type {
     GetState, AsyncAction, Action, Dispatch,
 } from 'flowtype';
-import type { State, Token } from '../reducers/TokensReducer';
-import type { Account } from '../reducers/AccountsReducer';
-import type { NetworkToken } from '../reducers/LocalStorageReducer';
+import type { State, Token } from 'reducers/TokensReducer';
+import type { Account } from 'reducers/AccountsReducer';
+import type { NetworkToken } from 'reducers/LocalStorageReducer';
 
 export type TokenAction = {
     type: typeof TOKEN.FROM_STORAGE,
diff --git a/src/js/actions/TrezorConnectActions.js b/src/js/actions/TrezorConnectActions.js
index afd6867d..e7d7258f 100644
--- a/src/js/actions/TrezorConnectActions.js
+++ b/src/js/actions/TrezorConnectActions.js
@@ -4,14 +4,14 @@
 import TrezorConnect, {
     UI, DEVICE, DEVICE_EVENT, UI_EVENT, TRANSPORT_EVENT,
 } from 'trezor-connect';
-import * as TOKEN from './constants/token';
-import * as CONNECT from './constants/TrezorConnect';
-import * as NOTIFICATION from './constants/notification';
-import * as WALLET from './constants/wallet';
+import * as TOKEN from 'actions/constants/token';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as NOTIFICATION from 'actions/constants/notification';
+import * as WALLET from 'actions/constants/wallet';
 
 import { push } from 'react-router-redux';
 import * as DiscoveryActions from './DiscoveryActions';
-import { resolveAfter } from '../utils/promiseUtils';
+import { resolveAfter } from 'utils/promiseUtils';
 
 
 import type {
diff --git a/src/js/actions/WalletActions.js b/src/js/actions/WalletActions.js
index e192e68e..3e7e2018 100644
--- a/src/js/actions/WalletActions.js
+++ b/src/js/actions/WalletActions.js
@@ -2,9 +2,9 @@
 
 
 import { LOCATION_CHANGE } from 'react-router-redux';
-import * as WALLET from './constants/wallet';
-import * as CONNECT from './constants/TrezorConnect';
-import * as stateUtils from '../reducers/utils';
+import * as WALLET from 'actions/constants/wallet';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import * as stateUtils from 'reducers/utils';
 
 import type { Device } from 'trezor-connect';
 import type
diff --git a/src/js/actions/Web3Actions.js b/src/js/actions/Web3Actions.js
index 99d50735..c0fa56fc 100644
--- a/src/js/actions/Web3Actions.js
+++ b/src/js/actions/Web3Actions.js
@@ -10,9 +10,9 @@ import TrezorConnect from 'trezor-connect';
 import type { ContractFactory, EstimateGasOptions } from 'web3';
 import type BigNumber from 'bignumber.js';
 import type { TransactionStatus, TransactionReceipt } from 'web3';
-import { strip } from '../utils/ethUtils';
-import * as WEB3 from './constants/web3';
-import * as PENDING from './constants/pendingTx';
+import { strip } from 'utils/ethUtils';
+import * as WEB3 from 'actions/constants/web3';
+import * as PENDING from 'actions/constants/pendingTx';
 import * as AccountsActions from './AccountsActions';
 import * as TokenActions from './TokenActions';
 
@@ -23,11 +23,11 @@ import type {
     AsyncAction,
 } from 'flowtype';
 
-import type { Account } from '../reducers/AccountsReducer';
-import type { PendingTx } from '../reducers/PendingTxReducer';
-import type { Web3Instance } from '../reducers/Web3Reducer';
-import type { Token } from '../reducers/TokensReducer';
-import type { NetworkToken } from '../reducers/LocalStorageReducer';
+import type { Account } from 'reducers/AccountsReducer';
+import type { PendingTx } from 'reducers/PendingTxReducer';
+import type { Web3Instance } from 'reducers/Web3Reducer';
+import type { Token } from 'reducers/TokensReducer';
+import type { NetworkToken } from 'reducers/LocalStorageReducer';
 
 export type Web3Action = {
     type: typeof WEB3.READY,
diff --git a/src/js/index.js b/src/js/index.js
index 0f241bdb..bfe8cfb2 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -17,4 +17,4 @@ window.onbeforeunload = () => {
     store.dispatch(onBeforeUnload());
 };
 
-// Application life cycle starts in ./services/WalletService.js
\ No newline at end of file
+// Application life cycle starts in services/WalletService.js
\ No newline at end of file
diff --git a/src/js/reducers/FiatRateReducer.js b/src/js/reducers/FiatRateReducer.js
index 160de571..aee1ff80 100644
--- a/src/js/reducers/FiatRateReducer.js
+++ b/src/js/reducers/FiatRateReducer.js
@@ -1,10 +1,10 @@
 /* @flow */
 
 
-import { RATE_UPDATE } from '../services/CoinmarketcapService';
+import { RATE_UPDATE } from 'services/CoinmarketcapService';
 
 import type { Action } from 'flowtype';
-import type { FiatRateAction } from '../services/CoinmarketcapService';
+import type { FiatRateAction } from 'services/CoinmarketcapService';
 
 export type Fiat = {
     +network: string;
diff --git a/src/js/router/index.js b/src/js/router/index.js
index 54ddca20..0c4994ae 100644
--- a/src/js/router/index.js
+++ b/src/js/router/index.js
@@ -7,20 +7,20 @@ import store, { history } from '../store';
 
 import ErrorBoundary from 'support/ErrorBoundary';
 
-import LandingPageContainer from '../components/landing';
-import WalletContainer from '../components/wallet';
-import BootloaderContainer from '../components/wallet/pages/Bootloader';
-import InitializeContainer from '../components/wallet/pages/Initialize';
-import AcquireContainer from '../components/wallet/pages/Acquire';
-import UnreadableDeviceContainer from '../components/wallet/pages/UnreadableDevice';
+import LandingPageContainer from 'components/landing';
+import WalletContainer from 'components/wallet';
+import BootloaderContainer from 'components/wallet/pages/Bootloader';
+import InitializeContainer from 'components/wallet/pages/Initialize';
+import AcquireContainer from 'components/wallet/pages/Acquire';
+import UnreadableDeviceContainer from 'components/wallet/pages/UnreadableDevice';
 
-import DashboardContainer from '../components/wallet/pages/Dashboard';
-import SummaryContainer from '../components/wallet/account/summary';
-import SendFormContainer from '../components/wallet/account/send';
-import ReceiveContainer from '../components/wallet/account/receive';
-import SignVerifyContainer from '../components/wallet/account/sign/SignVerify';
-import DeviceSettingsContainer from '../components/wallet/pages/DeviceSettings';
-import WalletSettingsContainer from '../components/wallet/pages/WalletSettings';
+import DashboardContainer from 'components/wallet/pages/Dashboard';
+import SummaryContainer from 'components/wallet/account/summary';
+import SendFormContainer from 'components/wallet/account/send';
+import ReceiveContainer from 'components/wallet/account/receive';
+import SignVerifyContainer from 'components/wallet/account/sign/SignVerify';
+import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
+import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
 
 const App = () => (
     <Provider store={store}>
diff --git a/src/js/services/CoinmarketcapService.js b/src/js/services/CoinmarketcapService.js
index f4c5466b..d2a14d0d 100644
--- a/src/js/services/CoinmarketcapService.js
+++ b/src/js/services/CoinmarketcapService.js
@@ -1,8 +1,8 @@
 /* @flow */
 
 
-import { JSONRequest, httpRequest } from '../utils/networkUtils';
-import { resolveAfter } from '../utils/promiseUtils';
+import { JSONRequest, httpRequest } from 'utils/networkUtils';
+import { resolveAfter } from 'utils/promiseUtils';
 import { READY } from 'actions/constants/localStorage';
 
 import type {
@@ -15,7 +15,7 @@ import type {
     AsyncAction,
     GetState,
 } from 'flowtype';
-import type { Config, FiatValueTicker } from '../reducers/LocalStorageReducer';
+import type { Config, FiatValueTicker } from 'reducers/LocalStorageReducer';
 
 export const RATE_UPDATE: 'rate__update' = 'rate__update';
 
diff --git a/src/js/services/LocalStorageService.js b/src/js/services/LocalStorageService.js
index 831b473f..2435f839 100644
--- a/src/js/services/LocalStorageService.js
+++ b/src/js/services/LocalStorageService.js
@@ -14,7 +14,7 @@ import * as DISCOVERY from 'actions/constants/discovery';
 import * as SEND from 'actions/constants/send';
 import * as WEB3 from 'actions/constants/web3';
 import * as PENDING from 'actions/constants/pendingTx';
-import { findAccountTokens } from '../reducers/TokensReducer';
+import { findAccountTokens } from 'reducers/TokensReducer';
 
 import type {
     Middleware,
@@ -28,10 +28,10 @@ import type {
 } from 'flowtype';
 
 import type { TrezorDevice } from 'flowtype';
-import type { Account } from '../reducers/AccountsReducer';
-import type { Token } from '../reducers/TokensReducer';
-import type { PendingTx } from '../reducers/PendingTxReducer';
-import type { Discovery } from '../reducers/DiscoveryReducer';
+import type { Account } from 'reducers/AccountsReducer';
+import type { Token } from 'reducers/TokensReducer';
+import type { PendingTx } from 'reducers/PendingTxReducer';
+import type { Discovery } from 'reducers/DiscoveryReducer';
 
 
 // https://github.com/STRML/react-localstorage/blob/master/react-localstorage.js
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 1c5a9ec6..870ceaf3 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -8,8 +8,8 @@ import thunk from 'redux-thunk';
 // import { useRouterHistory } from 'react-router';
 import createHistory from 'history/createHashHistory';
 import { createLogger } from 'redux-logger';
-import reducers from '../reducers';
-import services from '../services';
+import reducers from 'reducers';
+import services from 'services';
 
 import Raven from 'raven-js';
 import RavenMiddleware from 'redux-raven-middleware';

From 82ef098c2a1f7c520d828bec21ab4f9cafd45560 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 15:25:18 +0200
Subject: [PATCH 033/103] Fixed all stylelint errors

---
 src/js/components/common/Header.js                  |  1 +
 src/js/components/wallet/account/summary/Summary.js |  2 +-
 src/js/support/BaseStyles.js                        | 13 ++++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 7e6479d6..987c7ded 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -1,6 +1,7 @@
 /* @flow */
 import React from 'react';
 import styled from 'styled-components';
+
 import colors from 'config/colors';
 
 const Wrapper = styled.header`
diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
index 52d1877a..a6e4fe49 100644
--- a/src/js/components/wallet/account/summary/Summary.js
+++ b/src/js/components/wallet/account/summary/Summary.js
@@ -17,7 +17,7 @@ import type { Props } from './index';
 import type { NetworkToken } from 'reducers/LocalStorageReducer';
 
 const StyledH2 = styled(H2)`
-   padding: 20px 48px;
+    padding: 20px 48px;
 `;
 
 const Summary = (props: Props) => {
diff --git a/src/js/support/BaseStyles.js b/src/js/support/BaseStyles.js
index 334d375b..7c2f0523 100644
--- a/src/js/support/BaseStyles.js
+++ b/src/js/support/BaseStyles.js
@@ -23,9 +23,8 @@ const baseStyles = () => injectGlobal`
         padding: 0;
     }
 
-    *:focus, *:active, *:active:focus, *::selection, *::-moz-selection {
+    *::selection, *::-moz-selection, *:focus, *:active, *:active:focus,  {
         outline: 0 !important;
-        -webkit-appearance: none;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     }
 
@@ -42,11 +41,11 @@ const baseStyles = () => injectGlobal`
     }
 
     @font-face {
-    font-family: 'Roboto Zero';
-    src: url('../fonts/roboto/RobotoZero.eot') format('embedded-opentype'),
-         url('../fonts/roboto/RobotoZero.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/roboto/RobotoZero.woff') format('woff'),
-         url('../fonts/roboto/RobotoZero.ttf') format('truetype');
+        font-family: 'Roboto Zero';
+        src: url('../fonts/roboto/RobotoZero.eot') format('embedded-opentype'),
+            url('../fonts/roboto/RobotoZero.eot?#iefix') format('embedded-opentype'),
+            url('../fonts/roboto/RobotoZero.woff') format('woff'),
+            url('../fonts/roboto/RobotoZero.ttf') format('truetype');
     }
 
     @font-face {

From efe180d4323e17732324d4e1112d37c3c66d5b48 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 14 Aug 2018 16:06:34 +0200
Subject: [PATCH 034/103] Fixed root path and some eslint

---
 .babelrc                                      |  2 +-
 package.json                                  |  4 +-
 src/js/actions/DiscoveryActions.js            |  9 ++-
 src/js/actions/SelectedAccountActions.js      |  4 +-
 src/js/actions/SendFormActions.js             |  6 +-
 src/js/actions/TokenActions.js                |  2 +-
 src/js/actions/TrezorConnectActions.js        |  4 +-
 src/js/actions/WalletActions.js               |  3 +-
 src/js/actions/Web3Actions.js                 |  4 +-
 src/js/components/landing/LandingPage.js      |  2 +-
 src/js/components/landing/index.js            |  2 +-
 src/js/components/modal/index.js              | 11 ++--
 .../wallet/account/receive/Receive.js         |  2 +-
 .../wallet/account/receive/index.js           |  2 +-
 .../wallet/account/send/SendForm.js           |  8 +--
 .../components/wallet/account/send/index.js   |  2 +-
 .../wallet/account/summary/Summary.js         |  6 +-
 .../wallet/account/summary/SummaryDetails.js  |  2 +-
 .../wallet/account/summary/index.js           |  2 +-
 .../wallet/aside/AccountSelection.js          |  2 +-
 src/js/components/wallet/aside/Aside.js       |  2 +-
 .../components/wallet/aside/CoinSelection.js  |  2 +-
 .../wallet/aside/DeviceSelection.js           | 20 +++----
 src/js/components/wallet/aside/index.js       |  2 +-
 src/js/components/wallet/index.js             |  4 +-
 .../wallet/pages/UnreadableDevice.js          | 22 ++++---
 src/js/index.js                               |  6 +-
 src/js/reducers/DevicesReducer.js             | 58 +++++++++----------
 src/js/reducers/index.js                      | 36 ++++++------
 src/js/router/index.js                        |  2 +-
 src/js/services/CoinmarketcapService.js       |  1 -
 src/js/utils/promiseUtils.js                  |  2 +-
 32 files changed, 111 insertions(+), 125 deletions(-)

diff --git a/.babelrc b/.babelrc
index f559b444..9e072680 100644
--- a/.babelrc
+++ b/.babelrc
@@ -16,7 +16,7 @@
             "regenerator": true
         }],
         ["module-resolver", {
-            "root": ["."],
+            "root": ["./src"],
             "alias": {
                 "config": "./src/js/config",
                 "constants": "./src/js/constants",
diff --git a/package.json b/package.json
index bb1e775e..ebede7ea 100644
--- a/package.json
+++ b/package.json
@@ -19,10 +19,10 @@
         "dev:local": "webpack-dev-server --config ./webpack/config.dev.local.babel.js --mode development",
         "build": "rm -rf build && webpack --config ./webpack/config.prod.babel.js --progress",
         "flow": "flow check src/js",
-        "lint": "run-p lint:*",
+        "lint": "run-s lint:*",
         "lint:js": "eslint ./src/js ./webpack",
         "lint:css": "stylelint './src/js/**/*.js'",
-        "test:*": "run-p test:*",
+        "test:*": "run-s test:*",
         "test:unit": "jest",
         "test-unit:watch": "jest -o --watchAll"
     },
diff --git a/src/js/actions/DiscoveryActions.js b/src/js/actions/DiscoveryActions.js
index 27264681..d72bfe60 100644
--- a/src/js/actions/DiscoveryActions.js
+++ b/src/js/actions/DiscoveryActions.js
@@ -7,16 +7,15 @@ import * as DISCOVERY from 'actions/constants/discovery';
 import * as ACCOUNT from 'actions/constants/account';
 import * as TOKEN from 'actions/constants/token';
 import * as NOTIFICATION from 'actions/constants/notification';
+import type {
+    ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice,
+} from 'flowtype';
+import type { Discovery, State } from 'reducers/DiscoveryReducer';
 import * as AccountsActions from './AccountsActions';
 
 import { getNonceAsync, getBalanceAsync, getTokenBalanceAsync } from './Web3Actions';
 import { setBalance as setTokenBalance } from './TokenActions';
 
-import type {
-    ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice,
-} from 'flowtype';
-
-import type { Discovery, State } from 'reducers/DiscoveryReducer';
 
 export type DiscoveryAction = {
     type: typeof DISCOVERY.FROM_STORAGE,
diff --git a/src/js/actions/SelectedAccountActions.js b/src/js/actions/SelectedAccountActions.js
index dd0e3754..99be257f 100644
--- a/src/js/actions/SelectedAccountActions.js
+++ b/src/js/actions/SelectedAccountActions.js
@@ -7,8 +7,6 @@ import * as SEND from 'actions/constants/send';
 import * as NOTIFICATION from 'actions/constants/notification';
 import * as PENDING from 'actions/constants/pendingTx';
 
-import * as SendFormActions from './SendFormActions';
-import * as SessionStorageActions from './SessionStorageActions';
 import * as stateUtils from 'reducers/utils';
 
 import { initialState } from 'reducers/SelectedAccountReducer';
@@ -23,6 +21,8 @@ import type {
     Dispatch,
     State,
 } from 'flowtype';
+import * as SessionStorageActions from './SessionStorageActions';
+import * as SendFormActions from './SendFormActions';
 
 
 export type SelectedAccountAction = {
diff --git a/src/js/actions/SendFormActions.js b/src/js/actions/SendFormActions.js
index 5cf443fd..9034d433 100644
--- a/src/js/actions/SendFormActions.js
+++ b/src/js/actions/SendFormActions.js
@@ -8,8 +8,6 @@ import TrezorConnect from 'trezor-connect';
 import { push } from 'react-router-redux';
 import BigNumber from 'bignumber.js';
 import { strip } from 'utils/ethUtils';
-import { estimateGas, getGasPrice, pushTx } from './Web3Actions';
-import * as SessionStorageActions from './SessionStorageActions';
 import * as NOTIFICATION from 'actions/constants/notification';
 import * as SEND from 'actions/constants/send';
 
@@ -36,6 +34,8 @@ import type { Token } from 'reducers/TokensReducer';
 import type { State, FeeLevel } from 'reducers/SendFormReducer';
 import type { Account } from 'reducers/AccountsReducer';
 import type { Props } from 'components/wallet/account/send';
+import * as SessionStorageActions from './SessionStorageActions';
+import { estimateGas, getGasPrice, pushTx } from './Web3Actions';
 
 export type SendTxAction = {
     type: typeof SEND.TX_COMPLETE,
@@ -837,7 +837,7 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
         },
         useEmptyPassphrase: !selected.instance,
         path: address_n,
-        transaction: txData
+        transaction: txData,
     });
 
     if (!signedTransaction || !signedTransaction.success) {
diff --git a/src/js/actions/TokenActions.js b/src/js/actions/TokenActions.js
index deceb717..b0306ba4 100644
--- a/src/js/actions/TokenActions.js
+++ b/src/js/actions/TokenActions.js
@@ -2,7 +2,6 @@
 
 
 import * as TOKEN from 'actions/constants/token';
-import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions';
 
 import type {
     GetState, AsyncAction, Action, Dispatch,
@@ -10,6 +9,7 @@ import type {
 import type { State, Token } from 'reducers/TokensReducer';
 import type { Account } from 'reducers/AccountsReducer';
 import type { NetworkToken } from 'reducers/LocalStorageReducer';
+import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions';
 
 export type TokenAction = {
     type: typeof TOKEN.FROM_STORAGE,
diff --git a/src/js/actions/TrezorConnectActions.js b/src/js/actions/TrezorConnectActions.js
index e7d7258f..16d784f2 100644
--- a/src/js/actions/TrezorConnectActions.js
+++ b/src/js/actions/TrezorConnectActions.js
@@ -10,7 +10,6 @@ import * as NOTIFICATION from 'actions/constants/notification';
 import * as WALLET from 'actions/constants/wallet';
 
 import { push } from 'react-router-redux';
-import * as DiscoveryActions from './DiscoveryActions';
 import { resolveAfter } from 'utils/promiseUtils';
 
 
@@ -33,6 +32,7 @@ import type {
     TrezorDevice,
     RouterLocationState,
 } from 'flowtype';
+import * as DiscoveryActions from './DiscoveryActions';
 
 
 export type TrezorConnectAction = {
@@ -207,7 +207,7 @@ export const onSelectDevice = (device: TrezorDevice | Device): ThunkAction => (d
     // switch to initial url and reset this value
 
     if (!device.features) {
-        dispatch(push(`/device/${device.path}/${ device.type === 'unreadable' ? 'unreadable' : 'acquire' }`));
+        dispatch(push(`/device/${device.path}/${device.type === 'unreadable' ? 'unreadable' : 'acquire'}`));
     } else if (device.features.bootloader_mode) {
         dispatch(push(`/device/${device.path}/bootloader`));
     } else if (!device.features.initialized) {
diff --git a/src/js/actions/WalletActions.js b/src/js/actions/WalletActions.js
index 3e7e2018..82c529b7 100644
--- a/src/js/actions/WalletActions.js
+++ b/src/js/actions/WalletActions.js
@@ -75,8 +75,7 @@ export const toggleDeviceDropdown = (opened: boolean): WalletAction => ({
 export const clearUnavailableDevicesData = (prevState: State, device: Device): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
     if (!device.features) return;
 
-    const affectedDevices = prevState.devices.filter(d => 
-            d.features && device.features
+    const affectedDevices = prevState.devices.filter(d => d.features && device.features
             && d.features.device_id === device.features.device_id
             && d.features.passphrase_protection !== device.features.passphrase_protection);
 
diff --git a/src/js/actions/Web3Actions.js b/src/js/actions/Web3Actions.js
index c0fa56fc..6fa64672 100644
--- a/src/js/actions/Web3Actions.js
+++ b/src/js/actions/Web3Actions.js
@@ -13,8 +13,6 @@ import type { TransactionStatus, TransactionReceipt } from 'web3';
 import { strip } from 'utils/ethUtils';
 import * as WEB3 from 'actions/constants/web3';
 import * as PENDING from 'actions/constants/pendingTx';
-import * as AccountsActions from './AccountsActions';
-import * as TokenActions from './TokenActions';
 
 import type {
     Dispatch,
@@ -28,6 +26,8 @@ import type { PendingTx } from 'reducers/PendingTxReducer';
 import type { Web3Instance } from 'reducers/Web3Reducer';
 import type { Token } from 'reducers/TokensReducer';
 import type { NetworkToken } from 'reducers/LocalStorageReducer';
+import * as TokenActions from './TokenActions';
+import * as AccountsActions from './AccountsActions';
 
 export type Web3Action = {
     type: typeof WEB3.READY,
diff --git a/src/js/components/landing/LandingPage.js b/src/js/components/landing/LandingPage.js
index 76552a1a..a8765758 100644
--- a/src/js/components/landing/LandingPage.js
+++ b/src/js/components/landing/LandingPage.js
@@ -2,8 +2,8 @@
 
 
 import React from 'react';
-import Preloader from './Preloader';
 import { H2 } from 'components/common/Heading';
+import Preloader from './Preloader';
 import ConnectDevice from './ConnectDevice';
 import InstallBridge from './InstallBridge';
 import LocalStorageError from './LocalStorageError';
diff --git a/src/js/components/landing/index.js b/src/js/components/landing/index.js
index e7fae9ef..ed7fec6c 100644
--- a/src/js/components/landing/index.js
+++ b/src/js/components/landing/index.js
@@ -5,10 +5,10 @@ import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import LandingPage from './LandingPage';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
+import LandingPage from './LandingPage';
 
 export type StateProps = {
     localStorage: $ElementType<State, 'localStorage'>,
diff --git a/src/js/components/modal/index.js b/src/js/components/modal/index.js
index 0f5837dd..f565e441 100644
--- a/src/js/components/modal/index.js
+++ b/src/js/components/modal/index.js
@@ -13,6 +13,11 @@ import { UI } from 'trezor-connect';
 import { default as ModalActions } from 'actions/ModalActions';
 import { default as ReceiveActions } from 'actions/ReceiveActions';
 
+import * as RECEIVE from 'actions/constants/receive';
+import * as MODAL from 'actions/constants/modal';
+import * as CONNECT from 'actions/constants/TrezorConnect';
+import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
 import Pin from './Pin';
 import InvalidPin from './InvalidPin';
 import Passphrase from './Passphrase';
@@ -22,12 +27,6 @@ import ConfirmAddress, { ConfirmUnverifiedAddress } from './ConfirmAddress';
 import RememberDevice, { ForgetDevice } from './RememberDevice';
 import DuplicateDevice from './DuplicateDevice';
 
-import * as RECEIVE from 'actions/constants/receive';
-import * as MODAL from 'actions/constants/modal';
-import * as CONNECT from 'actions/constants/TrezorConnect';
-
-import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from 'flowtype';
 
 type OwnProps = { }
 
diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js
index cd3217f5..4873496c 100644
--- a/src/js/components/wallet/account/receive/Receive.js
+++ b/src/js/components/wallet/account/receive/Receive.js
@@ -6,8 +6,8 @@ import { H2 } from 'components/common/Heading';
 import Tooltip from 'rc-tooltip';
 import { QRCode } from 'react-qr-svg';
 
-import SelectedAccount from '../SelectedAccount';
 import { Notification } from 'components/common/Notification';
+import SelectedAccount from '../SelectedAccount';
 
 import type { Props } from './index';
 
diff --git a/src/js/components/wallet/account/receive/index.js b/src/js/components/wallet/account/receive/index.js
index 12579224..6285193f 100644
--- a/src/js/components/wallet/account/receive/index.js
+++ b/src/js/components/wallet/account/receive/index.js
@@ -8,9 +8,9 @@ import { connect } from 'react-redux';
 import { default as ReceiveActions } from 'actions/ReceiveActions';
 import * as TokenActions from 'actions/TokenActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
 import Receive from './Receive';
 
-import type { State, Dispatch } from 'flowtype';
 import type {
     StateProps as BaseStateProps,
     DispatchProps as BaseDispatchProps,
diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
index aadf9e9b..5d9ca9ce 100644
--- a/src/js/components/wallet/account/send/SendForm.js
+++ b/src/js/components/wallet/account/send/SendForm.js
@@ -4,17 +4,17 @@ import React, { Component } from 'react';
 import styled from 'styled-components';
 import Select from 'react-select';
 import { H2 } from 'components/common/Heading';
+import { findAccountTokens } from 'reducers/TokensReducer';
+import { calculate, validation } from 'actions/SendFormActions';
+import { findToken } from 'reducers/TokensReducer';
+import type { Token } from 'flowtype';
 import AdvancedForm from './AdvancedForm';
 import PendingTransactions from './PendingTransactions';
 import { FeeSelectValue, FeeSelectOption } from './FeeSelect';
 import SelectedAccount from '../SelectedAccount';
-import { findAccountTokens } from 'reducers/TokensReducer';
-import { calculate, validation } from 'actions/SendFormActions';
 
-import { findToken } from 'reducers/TokensReducer';
 
 import type { Props } from './index';
-import type { Token } from 'flowtype';
 
 export default class SendContainer extends Component<Props> {
     componentWillReceiveProps(newProps: Props) {
diff --git a/src/js/components/wallet/account/send/index.js b/src/js/components/wallet/account/send/index.js
index 629b4dea..c37f2556 100644
--- a/src/js/components/wallet/account/send/index.js
+++ b/src/js/components/wallet/account/send/index.js
@@ -8,9 +8,9 @@ import { connect } from 'react-redux';
 import { default as SendFormActions } from 'actions/SendFormActions';
 import * as SessionStorageActions from 'actions/SessionStorageActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
 import SendForm from './SendForm';
 
-import type { State, Dispatch } from 'flowtype';
 import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
 
 type OwnProps = { }
diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
index a6e4fe49..3add7a7b 100644
--- a/src/js/components/wallet/account/summary/Summary.js
+++ b/src/js/components/wallet/account/summary/Summary.js
@@ -7,14 +7,14 @@ import { Async as AsyncSelect } from 'react-select';
 import Tooltip from 'rc-tooltip';
 
 import { resolveAfter } from 'utils/promiseUtils';
-import SelectedAccount from '../SelectedAccount';
 import { Notification } from 'components/common/Notification';
+import * as stateUtils from 'reducers/utils';
+import type { NetworkToken } from 'reducers/LocalStorageReducer';
+import SelectedAccount from '../SelectedAccount';
 import SummaryDetails from './SummaryDetails.js';
 import SummaryTokens from './SummaryTokens.js';
-import * as stateUtils from 'reducers/utils';
 
 import type { Props } from './index';
-import type { NetworkToken } from 'reducers/LocalStorageReducer';
 
 const StyledH2 = styled(H2)`
     padding: 20px 48px;
diff --git a/src/js/components/wallet/account/summary/SummaryDetails.js b/src/js/components/wallet/account/summary/SummaryDetails.js
index edae60c3..77a7d9db 100644
--- a/src/js/components/wallet/account/summary/SummaryDetails.js
+++ b/src/js/components/wallet/account/summary/SummaryDetails.js
@@ -4,8 +4,8 @@
 import React from 'react';
 import BigNumber from 'bignumber.js';
 
-import type { Props as BaseProps } from './index';
 import type { Coin } from 'reducers/LocalStorageReducer';
+import type { Props as BaseProps } from './index';
 
 type Props = {
     // coin: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'coin'>,
diff --git a/src/js/components/wallet/account/summary/index.js b/src/js/components/wallet/account/summary/index.js
index b4fefd9a..02cce0e7 100644
--- a/src/js/components/wallet/account/summary/index.js
+++ b/src/js/components/wallet/account/summary/index.js
@@ -6,11 +6,11 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import Summary from './Summary';
 import * as SummaryActions from 'actions/SummaryActions';
 import * as TokenActions from 'actions/TokenActions';
 
 import type { State, Dispatch } from 'flowtype';
+import Summary from './Summary';
 import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
 
 type OwnProps = { }
diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js
index f2dd03af..515b159c 100644
--- a/src/js/components/wallet/aside/AccountSelection.js
+++ b/src/js/components/wallet/aside/AccountSelection.js
@@ -10,8 +10,8 @@ import * as stateUtils from 'reducers/utils';
 import Loader from 'components/common/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
-import type { Props } from './index';
 import type { TrezorDevice, Accounts } from 'flowtype';
+import type { Props } from './index';
 
 const AccountSelection = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
diff --git a/src/js/components/wallet/aside/Aside.js b/src/js/components/wallet/aside/Aside.js
index 07325589..558f4714 100644
--- a/src/js/components/wallet/aside/Aside.js
+++ b/src/js/components/wallet/aside/Aside.js
@@ -6,13 +6,13 @@ import * as React from 'react';
 import { Link, NavLink } from 'react-router-dom';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 
+import type { TrezorDevice } from 'flowtype';
 import { DeviceSelect, DeviceDropdown } from './DeviceSelection';
 import AccountSelection from './AccountSelection';
 import CoinSelection from './CoinSelection';
 import StickyContainer from './StickyContainer';
 
 import type { Props } from './index';
-import type { TrezorDevice } from 'flowtype';
 
 
 type TransitionMenuProps = {
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 3723d668..010aab73 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -4,8 +4,8 @@
 import React from 'react';
 import { Link, NavLink } from 'react-router-dom';
 
-import type { Props } from './index';
 import type { TrezorDevice } from 'flowtype';
+import type { Props } from './index';
 
 const CoinSelection = (props: Props): React$Element<string> => {
     const { location } = props.router;
diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js
index c44b38e1..ca6ee4fa 100644
--- a/src/js/components/wallet/aside/DeviceSelection.js
+++ b/src/js/components/wallet/aside/DeviceSelection.js
@@ -5,8 +5,8 @@ import React, { Component } from 'react';
 import Select from 'react-select';
 import TrezorConnect from 'trezor-connect';
 
-import type { Props } from './index';
 import type { TrezorDevice } from 'flowtype';
+import type { Props } from './index';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
@@ -25,18 +25,16 @@ export const DeviceSelect = (props: Props) => {
     } else if (!selected.available) {
         css += ' unavailable';
         deviceStatus = 'Unavailable';
-    } else {
-        if (selected.type === 'acquired') {
-            if (selected.status === 'occupied') {
-                css += ' used-elsewhere';
-                deviceStatus = 'Used in other window';
-            } else if (selected.status === 'used') {
-                css += ' reload-features';
-            }
-        } else if (selected.type === 'unacquired') {
-            css += ' unacquired';
+    } else if (selected.type === 'acquired') {
+        if (selected.status === 'occupied') {
+            css += ' used-elsewhere';
             deviceStatus = 'Used in other window';
+        } else if (selected.status === 'used') {
+            css += ' reload-features';
         }
+    } else if (selected.type === 'unacquired') {
+        css += ' unacquired';
+        deviceStatus = 'Used in other window';
     }
 
     if (selected.features && selected.features.major_version > 1) {
diff --git a/src/js/components/wallet/aside/index.js b/src/js/components/wallet/aside/index.js
index 950cc897..07491fed 100644
--- a/src/js/components/wallet/aside/index.js
+++ b/src/js/components/wallet/aside/index.js
@@ -9,10 +9,10 @@ import { withRouter } from 'react-router-dom';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 import { toggleDeviceDropdown } from 'actions/WalletActions';
 
-import Aside from './Aside';
 
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
+import Aside from './Aside';
 
 type OwnProps = {
 
diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js
index b1c46eda..b66c3a15 100644
--- a/src/js/components/wallet/index.js
+++ b/src/js/components/wallet/index.js
@@ -5,6 +5,8 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import { Route, withRouter } from 'react-router-dom';
 
+import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
 import Header from '../common/Header';
 import Footer from '../common/Footer';
 import AccountTabs from './account/AccountTabs';
@@ -14,8 +16,6 @@ import ModalContainer from '../modal';
 import Notifications from '../common/Notification';
 import Log from '../common/Log';
 
-import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from 'flowtype';
 
 type WalletContainerProps = {
     wallet: $ElementType<State, 'wallet'>,
diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/components/wallet/pages/UnreadableDevice.js
index beef9c18..a76279f4 100644
--- a/src/js/components/wallet/pages/UnreadableDevice.js
+++ b/src/js/components/wallet/pages/UnreadableDevice.js
@@ -14,18 +14,16 @@ type Props = {
     acquireDevice: typeof TrezorConnectActions.acquire
 }
 
-const UnreadableDevice = (props: Props) => {
-    return (
-        <section className="acquire">
-            <Notification
-                title="Unreadable device"
-                message="Please install bridge"
-                className="error"
-                cancelable={false}
-            />
-        </section>
-    );
-};
+const UnreadableDevice = (props: Props) => (
+    <section className="acquire">
+        <Notification
+            title="Unreadable device"
+            message="Please install bridge"
+            className="error"
+            cancelable={false}
+        />
+    </section>
+);
 
 export default connect(
     (state: State) => ({
diff --git a/src/js/index.js b/src/js/index.js
index bfe8cfb2..7dfa42f4 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2,10 +2,10 @@
 import React from 'react';
 import { render } from 'react-dom';
 import baseStyles from 'support/BaseStyles';
-import store from './store';
-import App from './router';
 import { onBeforeUnload } from 'actions/WalletActions';
-import styles from 'styles/index.less';
+import 'styles/index.less';
+import App from './router';
+import store from './store';
 
 const root: ?HTMLElement = document.getElementById('root');
 if (root) {
diff --git a/src/js/reducers/DevicesReducer.js b/src/js/reducers/DevicesReducer.js
index b360499f..59ed5c8d 100644
--- a/src/js/reducers/DevicesReducer.js
+++ b/src/js/reducers/DevicesReducer.js
@@ -38,26 +38,25 @@ const mergeDevices = (current: TrezorDevice, upcoming: Device | TrezorDevice): T
         instanceName: typeof upcoming.instanceName === 'string' ? upcoming.instanceName : current.instanceName,
         state: current.state,
         ts: typeof upcoming.ts === 'number' ? upcoming.ts : current.ts,
-    }
+    };
 
     if (upcoming.type === 'acquired') {
-        return { ...upcoming, ...extended }; 
-    } else if (upcoming.type === 'unacquired' && current.features && current.state) {
+        return { ...upcoming, ...extended };
+    } if (upcoming.type === 'unacquired' && current.features && current.state) {
         // corner-case: trying to merge unacquired device with acquired
         // make sure that sensitive fields will not be changed and device will remain acquired
         return {
             type: 'acquired',
             path: upcoming.path,
             ...current,
-            ...extended
-        }
-    } else {
-        return {
-            ...upcoming,
-            features: null,
-            ...extended
-        }
+            ...extended,
+        };
     }
+    return {
+        ...upcoming,
+        features: null,
+        ...extended,
+    };
 };
 
 const addDevice = (state: State, device: Device): State => {
@@ -72,10 +71,9 @@ const addDevice = (state: State, device: Device): State => {
         }
         otherDevices = state.filter(d => affectedDevices.indexOf(d) === -1);
     } else {
-        affectedDevices = state.filter(d => 
-            d.features && 
-            device.features &&
-            d.features.device_id === device.features.device_id);
+        affectedDevices = state.filter(d => d.features
+            && device.features
+            && d.features.device_id === device.features.device_id);
         const unacquiredDevices = state.filter(d => d.path.length > 0 && d.path === device.path);
         otherDevices = state.filter(d => affectedDevices.indexOf(d) < 0 && unacquiredDevices.indexOf(d) < 0);
     }
@@ -90,17 +88,17 @@ const addDevice = (state: State, device: Device): State => {
         instanceLabel: device.label,
         instanceName: null,
         ts: new Date().getTime(),
-    }
+    };
 
 
     const newDevice: TrezorDevice = device.type === 'acquired' ? {
         ...device,
         // acquiring: false,
-        ...extended
+        ...extended,
     } : {
         ...device,
         features: null,
-        ...extended
+        ...extended,
     };
 
     if (affectedDevices.length > 0) {
@@ -131,12 +129,11 @@ const addDevice = (state: State, device: Device): State => {
         //     changedDevices.push(newDevice);
         // }
 
-        const changedDevices: Array<TrezorDevice> = affectedDevices.filter(d => 
-            d.features && device.features &&
-            d.features.passphrase_protection === device.features.passphrase_protection).map(d => {
-                const extended: Object = { connected: true, available: true }
-                return mergeDevices(d, { ...device, ...extended })
-            });
+        const changedDevices: Array<TrezorDevice> = affectedDevices.filter(d => d.features && device.features
+            && d.features.passphrase_protection === device.features.passphrase_protection).map((d) => {
+            const extended: Object = { connected: true, available: true };
+            return mergeDevices(d, { ...device, ...extended });
+        });
         if (changedDevices.length !== affectedDevices.length) {
             changedDevices.push(newDevice);
         }
@@ -174,8 +171,7 @@ const changeDevice = (state: State, device: Device | TrezorDevice, extended: Obj
 
     // find devices with the same device_id and passphrase_protection settings
     // or devices with the same path (TODO: should be that way?)
-    const affectedDevices: Array<TrezorDevice> = state.filter(d => 
-        (d.features && device.features && d.features.device_id === device.features.device_id && d.features.passphrase_protection === device.features.passphrase_protection)
+    const affectedDevices: Array<TrezorDevice> = state.filter(d => (d.features && device.features && d.features.device_id === device.features.device_id && d.features.passphrase_protection === device.features.passphrase_protection)
         || (d.features && d.path.length > 0 && d.path === device.path));
 
     const otherDevices: Array<TrezorDevice> = state.filter(d => affectedDevices.indexOf(d) === -1);
@@ -207,15 +203,15 @@ const devicesFromStorage = (devices: Array<TrezorDevice>): State => devices.map(
         connected: false,
         available: false,
         path: '',
-    }
+    };
 
     return device.type === 'acquired' ? {
         ...device,
-        ...extended
+        ...extended,
     } : {
         ...device,
         features: null,
-        ...extended
+        ...extended,
     };
 });
 
@@ -236,7 +232,7 @@ const disconnectDevice = (state: State, device: Device): State => {
     const otherDevices: State = state.filter(d => affectedDevices.indexOf(d) === -1);
 
     if (affectedDevices.length > 0) {
-        const acquiredDevices = affectedDevices.filter(d => d.features && d.state).map(d => {
+        const acquiredDevices = affectedDevices.filter(d => d.features && d.state).map((d) => {
             if (d.type === 'acquired') {
                 d.connected = false;
                 d.available = false;
@@ -255,7 +251,7 @@ const onSelectedDevice = (state: State, device: ?TrezorDevice): State => {
     if (device) {
         const otherDevices: Array<TrezorDevice> = state.filter(d => d !== device);
         device.ts = new Date().getTime();
-        return otherDevices.concat([ device ]);
+        return otherDevices.concat([device]);
     }
     return state;
 };
diff --git a/src/js/reducers/index.js b/src/js/reducers/index.js
index 1ad3c9b9..1d0be6a7 100644
--- a/src/js/reducers/index.js
+++ b/src/js/reducers/index.js
@@ -1,26 +1,24 @@
 /* @flow */
-
-
 import { combineReducers } from 'redux';
 import { routerReducer } from 'react-router-redux';
 
-import log from './LogReducer.js';
-import localStorage from './LocalStorageReducer.js';
-import connect from './TrezorConnectReducer.js';
-import notifications from './NotificationReducer.js';
-import modal from './ModalReducer.js';
-import web3 from './Web3Reducer.js';
-import accounts from './AccountsReducer.js';
-import selectedAccount from './SelectedAccountReducer.js';
-import sendForm from './SendFormReducer.js';
-import receive from './ReceiveReducer.js';
-import summary from './SummaryReducer.js';
-import tokens from './TokensReducer.js';
-import discovery from './DiscoveryReducer.js';
-import pending from './PendingTxReducer.js';
-import fiat from './FiatRateReducer.js';
-import wallet from './WalletReducer.js';
-import devices from './DevicesReducer.js';
+import log from 'reducers/LogReducer';
+import localStorage from 'reducers/LocalStorageReducer';
+import connect from 'reducers/TrezorConnectReducer';
+import notifications from 'reducers/NotificationReducer';
+import modal from 'reducers/ModalReducer';
+import web3 from 'reducers/Web3Reducer';
+import accounts from 'reducers/AccountsReducer';
+import selectedAccount from 'reducers/SelectedAccountReducer';
+import sendForm from 'reducers/SendFormReducer';
+import receive from 'reducers/ReceiveReducer';
+import summary from 'reducers/SummaryReducer';
+import tokens from 'reducers/TokensReducer';
+import discovery from 'reducers/DiscoveryReducer';
+import pending from 'reducers/PendingTxReducer';
+import fiat from 'reducers/FiatRateReducer';
+import wallet from 'reducers/WalletReducer';
+import devices from 'reducers/DevicesReducer';
 
 const reducers = {
     router: routerReducer,
diff --git a/src/js/router/index.js b/src/js/router/index.js
index 0c4994ae..fcf1c40f 100644
--- a/src/js/router/index.js
+++ b/src/js/router/index.js
@@ -3,7 +3,6 @@ import { hot } from 'react-hot-loader';
 import { Route, Switch } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
-import store, { history } from '../store';
 
 import ErrorBoundary from 'support/ErrorBoundary';
 
@@ -21,6 +20,7 @@ import ReceiveContainer from 'components/wallet/account/receive';
 import SignVerifyContainer from 'components/wallet/account/sign/SignVerify';
 import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
 import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
+import store, { history } from '../store';
 
 const App = () => (
     <Provider store={store}>
diff --git a/src/js/services/CoinmarketcapService.js b/src/js/services/CoinmarketcapService.js
index d2a14d0d..0b87c34e 100644
--- a/src/js/services/CoinmarketcapService.js
+++ b/src/js/services/CoinmarketcapService.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-
 import { JSONRequest, httpRequest } from 'utils/networkUtils';
 import { resolveAfter } from 'utils/promiseUtils';
 import { READY } from 'actions/constants/localStorage';
diff --git a/src/js/utils/promiseUtils.js b/src/js/utils/promiseUtils.js
index 5d41a3ce..e1e992f1 100644
--- a/src/js/utils/promiseUtils.js
+++ b/src/js/utils/promiseUtils.js
@@ -5,7 +5,7 @@
 // import Promise from 'es6-promise';
 
 export async function resolveAfter<T>(msec: number, value: any = null): Promise<T> {
-    return await new Promise((resolve) => {
+    await new Promise((resolve) => {
         //root.setTimeout(resolve, msec, value);
         window.setTimeout(resolve, msec, value);
     });

From 2737faf979087cd56b75263d8ec0e6a5b330c922 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:37:52 +0200
Subject: [PATCH 035/103] Resolve merge

---
 src/js/components/wallet/pages/Acquire.js | 2 --
 src/js/support/BaseStyles.js              | 6 +++---
 src/styles/receive.less                   | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js
index cd3f6f06..dd0a28ae 100644
--- a/src/js/components/wallet/pages/Acquire.js
+++ b/src/js/components/wallet/pages/Acquire.js
@@ -1,6 +1,4 @@
 /* @flow */
-
-
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
diff --git a/src/js/support/BaseStyles.js b/src/js/support/BaseStyles.js
index 7c2f0523..f3f6ef71 100644
--- a/src/js/support/BaseStyles.js
+++ b/src/js/support/BaseStyles.js
@@ -33,9 +33,9 @@ const baseStyles = () => injectGlobal`
         cursor: pointer;
     }
 
-    a:focus, 
-    button:focus, 
-    input:focus, 
+    a:focus,
+    button:focus,
+    input:focus,
     textarea:focus {
         outline: 0;
     }
diff --git a/src/styles/receive.less b/src/styles/receive.less
index 62ff8054..ba6f94e3 100644
--- a/src/styles/receive.less
+++ b/src/styles/receive.less
@@ -57,7 +57,7 @@
                     padding-right: 4px;
                 }
             }
-            
+
         }
 
         &.hidden {
@@ -117,7 +117,7 @@
             }
         }
 
-        
+
     }
 
     .qr {

From 6b3e4c2e62e9eff49fd607bb45d6b044dc5eb63d Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:38:28 +0200
Subject: [PATCH 036/103] Prepare 'REDIRECT' icon svg

---
 src/js/constants/icons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/constants/icons.js b/src/js/constants/icons.js
index bb2f7fa6..02df2b2c 100644
--- a/src/js/constants/icons.js
+++ b/src/js/constants/icons.js
@@ -1,3 +1,4 @@
 export default {
+    REDIRECT: 'M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z',
     WARNING: 'M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z',
 };
\ No newline at end of file

From 82cbdcffdfead6abf8df3b6bf0c80614bc6cc12f Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:56:37 +0200
Subject: [PATCH 037/103] Create file with global css variables

---
 src/js/config/variables.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/js/config/variables.js

diff --git a/src/js/config/variables.js b/src/js/config/variables.js
new file mode 100644
index 00000000..0b064a33
--- /dev/null
+++ b/src/js/config/variables.js
@@ -0,0 +1,13 @@
+export const FONT_SIZE = {
+    SMALLER: '12px',
+    SMALL: '14px',
+    BASE: '16px',
+};
+
+export const TRANSITION_TIME = {
+    BASE: '0.3s',
+}
+
+export const ICON_SIZE = {
+    BASE: '20px',
+}

From 7497c78a39b05efd1a6ed77bc63fb4da45b0ae74 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:58:07 +0200
Subject: [PATCH 038/103] Create coin link styled components for aside panel

---
 .../wallet/aside/CoinLink/CoinLink.js         | 52 +++++++++++++++++++
 .../wallet/aside/CoinLink/CoinLogo.js         | 44 ++++++++++++++++
 .../wallet/aside/CoinLink/ExternalCoinLink.js | 32 ++++++++++++
 .../wallet/aside/CoinLink/WalletCoinLink.js   | 24 +++++++++
 .../wallet/aside/CoinLink/common.js           |  8 +++
 .../components/wallet/aside/CoinLink/index.js |  2 +
 6 files changed, 162 insertions(+)
 create mode 100644 src/js/components/wallet/aside/CoinLink/CoinLink.js
 create mode 100644 src/js/components/wallet/aside/CoinLink/CoinLogo.js
 create mode 100644 src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js
 create mode 100644 src/js/components/wallet/aside/CoinLink/WalletCoinLink.js
 create mode 100644 src/js/components/wallet/aside/CoinLink/common.js
 create mode 100644 src/js/components/wallet/aside/CoinLink/index.js

diff --git a/src/js/components/wallet/aside/CoinLink/CoinLink.js b/src/js/components/wallet/aside/CoinLink/CoinLink.js
new file mode 100644
index 00000000..f906816f
--- /dev/null
+++ b/src/js/components/wallet/aside/CoinLink/CoinLink.js
@@ -0,0 +1,52 @@
+import styled from 'styled-components';
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import Icon from 'components/common/Icon';
+import colors from 'config/colors';
+import { FONT_SIZE, TRANSITION_TIME } from 'config/variables';
+
+import { coinProp } from './common';
+import CoinLogo from './CoinLogo';
+
+const Wrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    padding: 16px 24px;
+
+    cursor: pointer;
+    font-size: ${FONT_SIZE.BASE};
+
+    transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
+
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
+`;
+
+const CoinLink = ({ coin, iconRight }) => (
+    <Wrapper>
+        <CoinLogo
+            coinImg={coin.img}
+            text={coin.name}
+        />
+        {iconRight ? (
+            <Icon
+                icon={iconRight.type}
+                color={iconRight.color}
+            />
+        ) : null}
+    </Wrapper>
+);
+
+CoinLink.propTypes = {
+    ...coinProp,
+    iconRight: PropTypes.shape({
+        type: PropTypes.string.isRequired,
+        color: PropTypes.string.isRequired,
+    }),
+};
+
+export default CoinLink;
diff --git a/src/js/components/wallet/aside/CoinLink/CoinLogo.js b/src/js/components/wallet/aside/CoinLink/CoinLogo.js
new file mode 100644
index 00000000..12928c79
--- /dev/null
+++ b/src/js/components/wallet/aside/CoinLink/CoinLogo.js
@@ -0,0 +1,44 @@
+import styled from 'styled-components';
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import colors from 'config/colors';
+import { ICON_SIZE } from 'config/variables';
+
+const Wrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    p {
+        color: ${colors.TEXT_PRIMARY};
+    }
+
+`;
+
+const Logo = styled.div`
+    height: ${ICON_SIZE.BASE};
+    width: ${ICON_SIZE.BASE};
+    margin-right: 10px;
+
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: auto ${ICON_SIZE.BASE};
+    background-image: url('images/${props => props.coinImg}-logo.png');
+`;
+
+const CoinLogo = ({ coinImg, text }) => (
+    <Wrapper>
+        <Logo
+            coinImg={coinImg}
+        />
+        <p>{text}</p>
+    </Wrapper>
+);
+
+CoinLogo.propTypes = {
+    coinImg: PropTypes.string.isRequired,
+    text: PropTypes.string.isRequired,
+};
+
+export default CoinLogo
diff --git a/src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js b/src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js
new file mode 100644
index 00000000..dda81e28
--- /dev/null
+++ b/src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js
@@ -0,0 +1,32 @@
+import styled from 'styled-components';
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import ICONS from 'constants/icons';
+import colors from 'config/colors';
+
+import { coinProp } from './common';
+import CoinLink from './CoinLink';
+
+const A = styled.a`
+    display: block;
+`;
+
+const ExternalCoinLink = ({ coin, url }) => (
+    <A href={url}>
+        <CoinLink
+            coin={coin}
+            iconRight={{
+                type: ICONS.REDIRECT,
+                color: colors.TEXT_SECONDARY,
+            }}
+        />
+    </A>
+);
+
+ExternalCoinLink.propTypes = {
+    ...coinProp,
+    url: PropTypes.string,
+};
+
+export default ExternalCoinLink;
diff --git a/src/js/components/wallet/aside/CoinLink/WalletCoinLink.js b/src/js/components/wallet/aside/CoinLink/WalletCoinLink.js
new file mode 100644
index 00000000..a344e969
--- /dev/null
+++ b/src/js/components/wallet/aside/CoinLink/WalletCoinLink.js
@@ -0,0 +1,24 @@
+import styled from 'styled-components';
+import React from 'react';
+import PropTypes from 'prop-types';
+import { NavLink } from 'react-router-dom';
+
+import { coinProp } from './common';
+import CoinLink from './CoinLink';
+
+const Wrapper = styled(NavLink)`
+    display: block;
+`;
+
+const WalletCoinLink = ({ coin, url }) => (
+    <Wrapper to={url}>
+        <CoinLink coin={coin}/>
+    </Wrapper>
+);
+
+WalletCoinLink.propTypes = {
+    ...coinProp,
+    url: PropTypes.string.isRequired,
+};
+
+export default WalletCoinLink;
diff --git a/src/js/components/wallet/aside/CoinLink/common.js b/src/js/components/wallet/aside/CoinLink/common.js
new file mode 100644
index 00000000..b8d60525
--- /dev/null
+++ b/src/js/components/wallet/aside/CoinLink/common.js
@@ -0,0 +1,8 @@
+import PropTypes from 'prop-types';
+
+export const coinProp = {
+    coin: PropTypes.shape({
+        img: PropTypes.string.isRequired,
+        name: PropTypes.string.isRequired,
+    }).isRequired,
+};
diff --git a/src/js/components/wallet/aside/CoinLink/index.js b/src/js/components/wallet/aside/CoinLink/index.js
new file mode 100644
index 00000000..a3391655
--- /dev/null
+++ b/src/js/components/wallet/aside/CoinLink/index.js
@@ -0,0 +1,2 @@
+export { default as ExternalCoinLink } from './ExternalCoinLink';
+export { default as WalletCoinLink } from './WalletCoinLink';

From 57a9b3e11445e841083d0e3812f844d01c29a9bb Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:59:06 +0200
Subject: [PATCH 039/103] Use 'CoinLink' components inside a 'CoinSelection'
 component

---
 .../components/wallet/aside/CoinSelection.js  | 100 +++++++++++++-----
 1 file changed, 73 insertions(+), 27 deletions(-)

diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 010aab73..659ffcdb 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,12 +1,21 @@
 /* @flow */
 
-
+import styled from 'styled-components';
 import React from 'react';
-import { Link, NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
+
+import { ExternalCoinLink, WalletCoinLink } from './CoinLink/';
+import AsideDivider from './AsideDivider';
 
 import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
+const Section = styled.section`
+    width: 320px;
+    display: inline-block;
+    vertical-align: top;
+`;
+
 const CoinSelection = (props: Props): React$Element<string> => {
     const { location } = props.router;
     const { config } = props.localStorage;
@@ -23,39 +32,76 @@ const CoinSelection = (props: Props): React$Element<string> => {
     const walletCoins = config.coins.map((item) => {
         const url = `${baseUrl}/network/${item.network}/account/0`;
         const className = `coin ${item.network}`;
+
+        let coinImg = item.network;
+        if (item.network === 'ethereum') {
+            coinImg = 'eth';
+        } else if (item.network === 'ethereum-classic' ) {
+            coinImg = 'etc';
+        }
+
         return (
-            <NavLink key={item.network} to={url} className={className}>
-                { item.name }
-            </NavLink>
+            <WalletCoinLink
+                key={item.network}
+                coin={{
+                    img: coinImg,
+                    name: item.name,
+                }}
+                url={url}
+            />
         );
     });
 
     return (
-        <section>
+        <Section>
             { walletCoins }
             <div className="coin-divider">
                 Other coins <span>(You will be redirected)</span>
-            </div>
-            <a href="https://wallet.trezor.io/#/coin/btc" className="coin btc external">
-                Bitcoin
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/ltc" className="coin ltc external">
-                Litecoin
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/bch" className="coin bch external">
-                Bitcoin Cash
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/btg" className="coin btg external">
-                Bitcoin Gold
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/dash" className="coin dash external">
-                Dash
-            </a>
-            <a href="https://wallet.trezor.io/#/coin/zec" className="coin zec external">
-                Zcash
-            </a>
-        </section>
+
+            <ExternalCoinLink
+                coin={{
+                    img: 'btc',
+                    name: 'Bitcoin',
+                }}
+                url={'https://wallet.trezor.io/#/coin/ltc'}
+            />
+            <ExternalCoinLink
+                coin={{
+                    img: 'ltc',
+                    name: 'Litecoin',
+                }}
+                url={'https://wallet.trezor.io/#/coin/ltc'}
+            />
+            <ExternalCoinLink
+                coin={{
+                    img: 'bch',
+                    name: 'Bitcoin Cash',
+                }}
+                url={'https://wallet.trezor.io/#/coin/bch'}
+            />
+            <ExternalCoinLink
+                coin={{
+                    img: 'btg',
+                    name: 'Bitcoin Gold',
+                }}
+                url={'https://wallet.trezor.io/#/coin/btg'}
+            />
+            <ExternalCoinLink
+                coin={{
+                    img: 'Dash',
+                    name: 'Dash',
+                }}
+                url={'https://wallet.trezor.io/#/coin/dash'}
+            />
+            <ExternalCoinLink
+                coin={{
+                    img: 'zec',
+                    name: 'Zcash',
+                }}
+                url={'https://wallet.trezor.io/#/coin/zec'}
+            />
+        </Section>
     );
 };
 
-export default CoinSelection;
\ No newline at end of file
+export default CoinSelection;

From 44ae2b82ddf04a8fb2ab6a2a67fee62f07c3bd0f Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:59:30 +0200
Subject: [PATCH 040/103] Create a styled component for divider in aside panel

---
 .../components/wallet/aside/AsideDivider.js   | 35 +++++++++++++++++++
 .../components/wallet/aside/CoinSelection.js  |  6 ++--
 .../wallet/aside/DeviceSelection.js           |  4 ++-
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/js/components/wallet/aside/AsideDivider.js

diff --git a/src/js/components/wallet/aside/AsideDivider.js b/src/js/components/wallet/aside/AsideDivider.js
new file mode 100644
index 00000000..f9600078
--- /dev/null
+++ b/src/js/components/wallet/aside/AsideDivider.js
@@ -0,0 +1,35 @@
+import styled from 'styled-components';
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import colors from 'config/colors';
+import { FONT_SIZE } from 'config/variables';
+
+const Wrapper = styled.div`
+    display: flex;
+    justify-content: space-between;
+
+    padding: 8px 28px 8px 24px;
+
+    font-size: ${FONT_SIZE.SMALLER};
+    color: ${colors.TEXT_SECONDARY};
+
+    background: ${colors.GRAY_LIGHT};
+
+    border-top: 1px solid ${colors.DIVIDER};
+    border-bottom: 1px solid ${colors.DIVIDER};
+`;
+
+const AsideDivider = ({ textLeft, textRight }) => (
+    <Wrapper>
+        <p>{textLeft}</p>
+        <p>{textRight}</p>
+    </Wrapper>
+);
+
+AsideDivider.propTypes = {
+    textLeft: PropTypes.string.isRequired,
+    textRight: PropTypes.string.isRequired,
+};
+
+export default AsideDivider;
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 659ffcdb..c3b46702 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -55,8 +55,10 @@ const CoinSelection = (props: Props): React$Element<string> => {
     return (
         <Section>
             { walletCoins }
-            <div className="coin-divider">
-                Other coins <span>(You will be redirected)</span>
+            <AsideDivider
+                textLeft={'Other coins'}
+                textRight={'(You will be redirected)'}
+            />
 
             <ExternalCoinLink
                 coin={{
diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js
index ca6ee4fa..a3f99525 100644
--- a/src/js/components/wallet/aside/DeviceSelection.js
+++ b/src/js/components/wallet/aside/DeviceSelection.js
@@ -5,6 +5,8 @@ import React, { Component } from 'react';
 import Select from 'react-select';
 import TrezorConnect from 'trezor-connect';
 
+import AsideDivider from './AsideDivider';
+
 import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
@@ -214,7 +216,7 @@ export class DeviceDropdown extends Component<Props> {
         return (
             <section>
                 { currentDeviceMenu }
-                { deviceList.length > 1 ? <div className="device-divider">Other devices</div> : null }
+                { deviceList.length > 1 ? <AsideDivider textLeft={'Other devices'}/> : null }
                 { deviceList }
                 { webUsbButton }
             </section>

From 9d55216bf981dbfe9996f73c375670bbfcdb04ae Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:59:46 +0200
Subject: [PATCH 041/103] Disable css for new styled components

---
 src/styles/aside.less | 160 +++++++++++++++++++++---------------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/src/styles/aside.less b/src/styles/aside.less
index ac253b83..a06e67c8 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -29,12 +29,12 @@ aside {
 
     .transition-container {
         width: 640px;
-     
-        section {
-            width: 320px;
-            display: inline-block;
-            vertical-align: top;
-        }
+
+        // section {
+        //     width: 320px;
+        //     display: inline-block;
+        //     vertical-align: top;
+        // }
     }
 
     .trezor-webusb-button {
@@ -171,13 +171,13 @@ aside {
                 text-overflow: ellipsis;
                 overflow: hidden;
                 white-space: nowrap;
-    
+
                 &.label {
                     font-weight: 500;
                     font-size: 14px;
                     color: @color_text_primary;
                 }
-    
+
                 &.status {
                     font-size: 12px;
                     color: @color_text_secondary;
@@ -265,20 +265,20 @@ aside {
     }
 
     a {
-        position: relative;
-        display: block;
-        cursor: pointer;
-        font-size: 16px;
-        padding: 16px 0 16px 24px;
-        white-space: nowrap;
-        color: @color_text_primary;
-        height: 50px;
+        // position: relative;
+        // display: block;
+        // cursor: pointer;
+        // font-size: 16px;
+        // padding: 16px 0 16px 24px;
+        // white-space: nowrap;
+        // color: @color_text_primary;
+        // height: 50px;
 
-        transition: background-color 0.3s, color 0.3s;
+        // transition: background-color 0.3s, color 0.3s;
 
-        &:hover {
-            background-color: @color_gray_light;
-        }
+        // &:hover {
+        //     background-color: @color_gray_light;
+        // }
 
         &.account {
             height: 64px;
@@ -309,15 +309,15 @@ aside {
                 //border-left: 3px solid @color_green_primary;
                 //border-bottom: 1px solid @color_divider;
                 //padding-left: 27px;
-    
+
                 &:before {
                     width: 3px;
                 }
-    
+
                 &:hover {
                     background: @color_white;
                 }
-    
+
                 &:last-child {
                     // border-bottom: 1px solid @color_divider;
                     &:after {
@@ -334,47 +334,47 @@ aside {
             }
         }
 
-       
 
-        &.coin {
-            padding-left: 60px;
-            &:before {
-                content: '';
-                position: absolute;
-                display: block;
-                width: 20px;
-                height: 20px;
-                left: 24px;
-                top: 0px;
-                bottom: 0px;
-                margin: auto 0;
-                background-repeat: no-repeat;
-                background-position: center;
-                background-size: 20px 20px;
-                
-            }
-        }
 
-        &.external {
-            &:after {
-                .icomoon-redirect;
-                position: absolute;
-                display: block;
-                width: 30px;
-                height: 30px;
-                right: 20px;
-                top: 0px;
-                bottom: 0px;
-                margin: auto 0;
-                font-size: 30px;
-                color: @color_text_secondary;
-                .hover();
-            }
+        // &.coin {
+        //     padding-left: 60px;
+        //     &:before {
+        //         content: '';
+        //         position: absolute;
+        //         display: block;
+        //         width: 20px;
+        //         height: 20px;
+        //         left: 24px;
+        //         top: 0px;
+        //         bottom: 0px;
+        //         margin: auto 0;
+        //         background-repeat: no-repeat;
+        //         background-position: center;
+        //         background-size: 20px 20px;
 
-            &:hover:after {
-                color: @color_text_primary;
-            }
-        }
+        //     }
+        // }
+
+        // &.external {
+        //     &:after {
+        //         .icomoon-redirect;
+        //         position: absolute;
+        //         display: block;
+        //         width: 30px;
+        //         height: 30px;
+        //         right: 20px;
+        //         top: 0px;
+        //         bottom: 0px;
+        //         margin: auto 0;
+        //         font-size: 30px;
+        //         color: @color_text_secondary;
+        //         .hover();
+        //     }
+
+        //     &:hover:after {
+        //         color: @color_text_primary;
+        //     }
+        // }
 
         &.back {
             padding-left: 80px;
@@ -407,7 +407,7 @@ aside {
                 font-size: 20px;
             }
         }
-        
+
         &.ethereum:before,
         &.ethereum-classic:before,
         &.ropsten:before,
@@ -416,7 +416,7 @@ aside {
             background-position: 2px 0px;
         }
 
-        
+
         &.ethereum:before {
             background-image: url('../images/eth-logo.png');
         }
@@ -450,20 +450,20 @@ aside {
         }
     }
 
-    .coin-divider {
-        font-size: 12px;
-        display: flex;
-        justify-content: space-between;
-        color: @color_text_secondary;
-        background: @color_gray_light;
-        padding: 8px 28px 8px 24px;
-        border-top: 1px solid @color_divider;
-        border-bottom: 1px solid @color_divider;
-        span {
-            display: flex;
-            justify-content: flex-end;
-        }
-    }
+    // .coin-divider {
+    //     font-size: 12px;
+    //     display: flex;
+    //     justify-content: space-between;
+    //     color: @color_text_secondary;
+    //     background: @color_gray_light;
+    //     padding: 8px 28px 8px 24px;
+    //     border-top: 1px solid @color_divider;
+    //     border-bottom: 1px solid @color_divider;
+    //     span {
+    //         display: flex;
+    //         justify-content: flex-end;
+    //     }
+    // }
 
     .device-divider {
         font-size: 12px;
@@ -492,7 +492,7 @@ aside {
             display: inline-block;
             padding: 8px;
             height: auto;
-            
+
             &:before {
                 .icomoon-chat;
                 font-size: 32px;
@@ -521,7 +521,7 @@ aside {
         color: @color_text_secondary;
         display: flex;
         align-items: center;
-        
+
         &:before {
             .icomoon-plus;
             margin-right: 12px;
@@ -568,7 +568,7 @@ aside {
     // menu trasitions
 
     @slide_transition_time: 300ms;
-    
+
     .slide-left-enter {
         transform: translate(100%);
         pointer-events: none;

From bb94eb7ed024ad7cf5eff2fd86c736aaa9f71765 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 08:41:54 +0200
Subject: [PATCH 042/103] Rename components & flatten folder structure

- 'CoinLogo' is now 'CoinName'
- 'CoinLink' is now 'AsideRowCoin'
- 'ExternalCoinLink' is now 'AsideRowCoinExternal'
- 'WalletCoinLink' is now 'AsideRowCoinWallet'
---
 .../{CoinLink/CoinLink.js => AsideRowCoin.js}   | 10 +++++-----
 ...ernalCoinLink.js => AsideRowCoinExternal.js} | 10 +++++-----
 .../WalletCoinLink.js => AsideRowCoinWallet.js} | 10 +++++-----
 .../aside/{CoinLink/CoinLogo.js => CoinName.js} |  7 +++----
 src/js/components/wallet/aside/CoinSelection.js | 17 +++++++++--------
 .../wallet/aside/{CoinLink => }/common.js       |  0
 6 files changed, 27 insertions(+), 27 deletions(-)
 rename src/js/components/wallet/aside/{CoinLink/CoinLink.js => AsideRowCoin.js} (86%)
 rename src/js/components/wallet/aside/{CoinLink/ExternalCoinLink.js => AsideRowCoinExternal.js} (72%)
 rename src/js/components/wallet/aside/{CoinLink/WalletCoinLink.js => AsideRowCoinWallet.js} (63%)
 rename src/js/components/wallet/aside/{CoinLink/CoinLogo.js => CoinName.js} (90%)
 rename src/js/components/wallet/aside/{CoinLink => }/common.js (100%)

diff --git a/src/js/components/wallet/aside/CoinLink/CoinLink.js b/src/js/components/wallet/aside/AsideRowCoin.js
similarity index 86%
rename from src/js/components/wallet/aside/CoinLink/CoinLink.js
rename to src/js/components/wallet/aside/AsideRowCoin.js
index f906816f..4332e9af 100644
--- a/src/js/components/wallet/aside/CoinLink/CoinLink.js
+++ b/src/js/components/wallet/aside/AsideRowCoin.js
@@ -7,7 +7,7 @@ import colors from 'config/colors';
 import { FONT_SIZE, TRANSITION_TIME } from 'config/variables';
 
 import { coinProp } from './common';
-import CoinLogo from './CoinLogo';
+import CoinName from './CoinName';
 
 const Wrapper = styled.div`
     display: flex;
@@ -26,9 +26,9 @@ const Wrapper = styled.div`
     }
 `;
 
-const CoinLink = ({ coin, iconRight }) => (
+const AsideRowCoin = ({ coin, iconRight }) => (
     <Wrapper>
-        <CoinLogo
+        <CoinName
             coinImg={coin.img}
             text={coin.name}
         />
@@ -41,7 +41,7 @@ const CoinLink = ({ coin, iconRight }) => (
     </Wrapper>
 );
 
-CoinLink.propTypes = {
+AsideRowCoin.propTypes = {
     ...coinProp,
     iconRight: PropTypes.shape({
         type: PropTypes.string.isRequired,
@@ -49,4 +49,4 @@ CoinLink.propTypes = {
     }),
 };
 
-export default CoinLink;
+export default AsideRowCoin;
diff --git a/src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js b/src/js/components/wallet/aside/AsideRowCoinExternal.js
similarity index 72%
rename from src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js
rename to src/js/components/wallet/aside/AsideRowCoinExternal.js
index dda81e28..a6804f39 100644
--- a/src/js/components/wallet/aside/CoinLink/ExternalCoinLink.js
+++ b/src/js/components/wallet/aside/AsideRowCoinExternal.js
@@ -6,15 +6,15 @@ import ICONS from 'constants/icons';
 import colors from 'config/colors';
 
 import { coinProp } from './common';
-import CoinLink from './CoinLink';
+import AsideRowCoin from './AsideRowCoin';
 
 const A = styled.a`
     display: block;
 `;
 
-const ExternalCoinLink = ({ coin, url }) => (
+const AsideRowCoinExternal = ({ coin, url }) => (
     <A href={url}>
-        <CoinLink
+        <AsideRowCoin
             coin={coin}
             iconRight={{
                 type: ICONS.REDIRECT,
@@ -24,9 +24,9 @@ const ExternalCoinLink = ({ coin, url }) => (
     </A>
 );
 
-ExternalCoinLink.propTypes = {
+AsideRowCoinExternal.propTypes = {
     ...coinProp,
     url: PropTypes.string,
 };
 
-export default ExternalCoinLink;
+export default AsideRowCoinExternal;
diff --git a/src/js/components/wallet/aside/CoinLink/WalletCoinLink.js b/src/js/components/wallet/aside/AsideRowCoinWallet.js
similarity index 63%
rename from src/js/components/wallet/aside/CoinLink/WalletCoinLink.js
rename to src/js/components/wallet/aside/AsideRowCoinWallet.js
index a344e969..c80278d0 100644
--- a/src/js/components/wallet/aside/CoinLink/WalletCoinLink.js
+++ b/src/js/components/wallet/aside/AsideRowCoinWallet.js
@@ -4,21 +4,21 @@ import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
 
 import { coinProp } from './common';
-import CoinLink from './CoinLink';
+import AsideRowCoin from './AsideRowCoin';
 
 const Wrapper = styled(NavLink)`
     display: block;
 `;
 
-const WalletCoinLink = ({ coin, url }) => (
+const AsideRowCoinWallet = ({ coin, url }) => (
     <Wrapper to={url}>
-        <CoinLink coin={coin}/>
+        <AsideRowCoin coin={coin}/>
     </Wrapper>
 );
 
-WalletCoinLink.propTypes = {
+AsideRowCoinWallet.propTypes = {
     ...coinProp,
     url: PropTypes.string.isRequired,
 };
 
-export default WalletCoinLink;
+export default AsideRowCoinWallet;
diff --git a/src/js/components/wallet/aside/CoinLink/CoinLogo.js b/src/js/components/wallet/aside/CoinName.js
similarity index 90%
rename from src/js/components/wallet/aside/CoinLink/CoinLogo.js
rename to src/js/components/wallet/aside/CoinName.js
index 12928c79..15b119e2 100644
--- a/src/js/components/wallet/aside/CoinLink/CoinLogo.js
+++ b/src/js/components/wallet/aside/CoinName.js
@@ -13,7 +13,6 @@ const Wrapper = styled.div`
     p {
         color: ${colors.TEXT_PRIMARY};
     }
-
 `;
 
 const Logo = styled.div`
@@ -27,7 +26,7 @@ const Logo = styled.div`
     background-image: url('images/${props => props.coinImg}-logo.png');
 `;
 
-const CoinLogo = ({ coinImg, text }) => (
+const CoinName = ({ coinImg, text }) => (
     <Wrapper>
         <Logo
             coinImg={coinImg}
@@ -36,9 +35,9 @@ const CoinLogo = ({ coinImg, text }) => (
     </Wrapper>
 );
 
-CoinLogo.propTypes = {
+CoinName.propTypes = {
     coinImg: PropTypes.string.isRequired,
     text: PropTypes.string.isRequired,
 };
 
-export default CoinLogo
+export default CoinName
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index c3b46702..b1967c31 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -4,7 +4,8 @@ import styled from 'styled-components';
 import React from 'react';
 import { NavLink } from 'react-router-dom';
 
-import { ExternalCoinLink, WalletCoinLink } from './CoinLink/';
+import AsideRowCoinWallet from './AsideRowCoinWallet';
+import AsideRowCoinExternal from './AsideRowCoinExternal';
 import AsideDivider from './AsideDivider';
 
 import type { TrezorDevice } from 'flowtype';
@@ -41,7 +42,7 @@ const CoinSelection = (props: Props): React$Element<string> => {
         }
 
         return (
-            <WalletCoinLink
+            <AsideRowCoinWallet
                 key={item.network}
                 coin={{
                     img: coinImg,
@@ -60,42 +61,42 @@ const CoinSelection = (props: Props): React$Element<string> => {
                 textRight={'(You will be redirected)'}
             />
 
-            <ExternalCoinLink
+            <AsideRowCoinExternal
                 coin={{
                     img: 'btc',
                     name: 'Bitcoin',
                 }}
                 url={'https://wallet.trezor.io/#/coin/ltc'}
             />
-            <ExternalCoinLink
+            <AsideRowCoinExternal
                 coin={{
                     img: 'ltc',
                     name: 'Litecoin',
                 }}
                 url={'https://wallet.trezor.io/#/coin/ltc'}
             />
-            <ExternalCoinLink
+            <AsideRowCoinExternal
                 coin={{
                     img: 'bch',
                     name: 'Bitcoin Cash',
                 }}
                 url={'https://wallet.trezor.io/#/coin/bch'}
             />
-            <ExternalCoinLink
+            <AsideRowCoinExternal
                 coin={{
                     img: 'btg',
                     name: 'Bitcoin Gold',
                 }}
                 url={'https://wallet.trezor.io/#/coin/btg'}
             />
-            <ExternalCoinLink
+            <AsideRowCoinExternal
                 coin={{
                     img: 'Dash',
                     name: 'Dash',
                 }}
                 url={'https://wallet.trezor.io/#/coin/dash'}
             />
-            <ExternalCoinLink
+            <AsideRowCoinExternal
                 coin={{
                     img: 'zec',
                     name: 'Zcash',
diff --git a/src/js/components/wallet/aside/CoinLink/common.js b/src/js/components/wallet/aside/common.js
similarity index 100%
rename from src/js/components/wallet/aside/CoinLink/common.js
rename to src/js/components/wallet/aside/common.js

From d6383a45401cd0a2038141711c530c17aac88789 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 09:12:53 +0200
Subject: [PATCH 043/103] Create 'AsideSection' component

---
 .../components/wallet/aside/AccountSelection.js  |  6 ++++--
 src/js/components/wallet/aside/AsideSection.js   | 16 ++++++++++++++++
 src/js/components/wallet/aside/CoinSelection.js  | 12 ++++--------
 .../components/wallet/aside/DeviceSelection.js   |  6 ++++--
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 src/js/components/wallet/aside/AsideSection.js

diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js
index 515b159c..2d932245 100644
--- a/src/js/components/wallet/aside/AccountSelection.js
+++ b/src/js/components/wallet/aside/AccountSelection.js
@@ -10,6 +10,8 @@ import * as stateUtils from 'reducers/utils';
 import Loader from 'components/common/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
+import AsideSection from './AsideSection';
+
 import type { TrezorDevice, Accounts } from 'flowtype';
 import type { Props } from './index';
 
@@ -128,13 +130,13 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
     }
 
     return (
-        <section>
+        <AsideSection>
             { backButton }
             <div>
                 { selectedAccounts }
             </div>
             { discoveryStatus }
-        </section>
+        </AsideSection>
     );
 };
 
diff --git a/src/js/components/wallet/aside/AsideSection.js b/src/js/components/wallet/aside/AsideSection.js
new file mode 100644
index 00000000..518ed77b
--- /dev/null
+++ b/src/js/components/wallet/aside/AsideSection.js
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+import React from 'react';
+
+const Section = styled.section`
+    width: 320px;
+    display: inline-block;
+    vertical-align: top;
+`;
+
+const AsideSection = (props) => (
+    <Section>
+        {props.children}
+    </Section>
+);
+
+export default AsideSection;
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index b1967c31..561c8233 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -4,18 +4,14 @@ import styled from 'styled-components';
 import React from 'react';
 import { NavLink } from 'react-router-dom';
 
+import AsideDivider from './AsideDivider';
 import AsideRowCoinWallet from './AsideRowCoinWallet';
 import AsideRowCoinExternal from './AsideRowCoinExternal';
-import AsideDivider from './AsideDivider';
+import AsideSection from './AsideSection';
 
 import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
-const Section = styled.section`
-    width: 320px;
-    display: inline-block;
-    vertical-align: top;
-`;
 
 const CoinSelection = (props: Props): React$Element<string> => {
     const { location } = props.router;
@@ -54,7 +50,7 @@ const CoinSelection = (props: Props): React$Element<string> => {
     });
 
     return (
-        <Section>
+        <AsideSection>
             { walletCoins }
             <AsideDivider
                 textLeft={'Other coins'}
@@ -103,7 +99,7 @@ const CoinSelection = (props: Props): React$Element<string> => {
                 }}
                 url={'https://wallet.trezor.io/#/coin/zec'}
             />
-        </Section>
+        </AsideSection>
     );
 };
 
diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js
index a3f99525..6b2fb332 100644
--- a/src/js/components/wallet/aside/DeviceSelection.js
+++ b/src/js/components/wallet/aside/DeviceSelection.js
@@ -10,6 +10,8 @@ import AsideDivider from './AsideDivider';
 import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
+import AsideSection from './AsideSection';
+
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
     const { transport } = props.connect;
@@ -214,12 +216,12 @@ export class DeviceDropdown extends Component<Props> {
 
 
         return (
-            <section>
+            <AsideSection>
                 { currentDeviceMenu }
                 { deviceList.length > 1 ? <AsideDivider textLeft={'Other devices'}/> : null }
                 { deviceList }
                 { webUsbButton }
-            </section>
+            </AsideSection>
         );
     }
 }
\ No newline at end of file

From af80ebb511c66fd374fa056eb1dd1c9ce39121fc Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 09:14:08 +0200
Subject: [PATCH 044/103] Cleanup

---
 src/js/components/wallet/aside/CoinLink/index.js | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 src/js/components/wallet/aside/CoinLink/index.js

diff --git a/src/js/components/wallet/aside/CoinLink/index.js b/src/js/components/wallet/aside/CoinLink/index.js
deleted file mode 100644
index a3391655..00000000
--- a/src/js/components/wallet/aside/CoinLink/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as ExternalCoinLink } from './ExternalCoinLink';
-export { default as WalletCoinLink } from './WalletCoinLink';

From c81e74db715b980943d4ddf8907b3ba044cc8094 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 09:56:31 +0200
Subject: [PATCH 045/103] Create a general 'AsideRow' component

- delete 'AsideRowCoin' and move logic up into 'AsideRowCoinExternal' and 'AsideRowCoinWallet'
---
 src/js/components/wallet/aside/AsideRow.js    | 30 +++++++++++
 .../components/wallet/aside/AsideRowCoin.js   | 52 -------------------
 .../wallet/aside/AsideRowCoinExternal.js      | 23 ++++----
 .../wallet/aside/AsideRowCoinWallet.js        | 11 +++-
 4 files changed, 53 insertions(+), 63 deletions(-)
 create mode 100644 src/js/components/wallet/aside/AsideRow.js
 delete mode 100644 src/js/components/wallet/aside/AsideRowCoin.js

diff --git a/src/js/components/wallet/aside/AsideRow.js b/src/js/components/wallet/aside/AsideRow.js
new file mode 100644
index 00000000..4343ddea
--- /dev/null
+++ b/src/js/components/wallet/aside/AsideRow.js
@@ -0,0 +1,30 @@
+import styled from 'styled-components';
+import React from 'react';
+
+import colors from 'config/colors';
+import { FONT_SIZE, TRANSITION_TIME } from 'config/variables';
+
+const Wrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    padding: 16px 24px;
+
+    cursor: pointer;
+    font-size: ${FONT_SIZE.BASE};
+
+    transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
+
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
+`;
+
+const AsideRow = (props) => (
+    <Wrapper>
+        {props.children}
+    </Wrapper>
+);
+
+export default AsideRow;
diff --git a/src/js/components/wallet/aside/AsideRowCoin.js b/src/js/components/wallet/aside/AsideRowCoin.js
deleted file mode 100644
index 4332e9af..00000000
--- a/src/js/components/wallet/aside/AsideRowCoin.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import styled from 'styled-components';
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import Icon from 'components/common/Icon';
-import colors from 'config/colors';
-import { FONT_SIZE, TRANSITION_TIME } from 'config/variables';
-
-import { coinProp } from './common';
-import CoinName from './CoinName';
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    padding: 16px 24px;
-
-    cursor: pointer;
-    font-size: ${FONT_SIZE.BASE};
-
-    transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
-
-    &:hover {
-        background-color: ${colors.GRAY_LIGHT};
-    }
-`;
-
-const AsideRowCoin = ({ coin, iconRight }) => (
-    <Wrapper>
-        <CoinName
-            coinImg={coin.img}
-            text={coin.name}
-        />
-        {iconRight ? (
-            <Icon
-                icon={iconRight.type}
-                color={iconRight.color}
-            />
-        ) : null}
-    </Wrapper>
-);
-
-AsideRowCoin.propTypes = {
-    ...coinProp,
-    iconRight: PropTypes.shape({
-        type: PropTypes.string.isRequired,
-        color: PropTypes.string.isRequired,
-    }),
-};
-
-export default AsideRowCoin;
diff --git a/src/js/components/wallet/aside/AsideRowCoinExternal.js b/src/js/components/wallet/aside/AsideRowCoinExternal.js
index a6804f39..2039e297 100644
--- a/src/js/components/wallet/aside/AsideRowCoinExternal.js
+++ b/src/js/components/wallet/aside/AsideRowCoinExternal.js
@@ -2,11 +2,13 @@ import styled from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import Icon from 'components/common/Icon';
+import AsideRow from './AsideRow';
+import CoinName from './CoinName';
+
 import ICONS from 'constants/icons';
 import colors from 'config/colors';
-
 import { coinProp } from './common';
-import AsideRowCoin from './AsideRowCoin';
 
 const A = styled.a`
     display: block;
@@ -14,13 +16,16 @@ const A = styled.a`
 
 const AsideRowCoinExternal = ({ coin, url }) => (
     <A href={url}>
-        <AsideRowCoin
-            coin={coin}
-            iconRight={{
-                type: ICONS.REDIRECT,
-                color: colors.TEXT_SECONDARY,
-            }}
-        />
+        <AsideRow>
+            <CoinName
+                coinImg={coin.img}
+                text={coin.name}
+            />
+            <Icon
+                icon={ICONS.REDIRECT}
+                color={colors.TEXT_SECONDARY}
+            />
+        </AsideRow>
     </A>
 );
 
diff --git a/src/js/components/wallet/aside/AsideRowCoinWallet.js b/src/js/components/wallet/aside/AsideRowCoinWallet.js
index c80278d0..9a07a2cf 100644
--- a/src/js/components/wallet/aside/AsideRowCoinWallet.js
+++ b/src/js/components/wallet/aside/AsideRowCoinWallet.js
@@ -3,8 +3,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
 
+import AsideRow from './AsideRow';
+import CoinName from './CoinName';
+
 import { coinProp } from './common';
-import AsideRowCoin from './AsideRowCoin';
 
 const Wrapper = styled(NavLink)`
     display: block;
@@ -12,7 +14,12 @@ const Wrapper = styled(NavLink)`
 
 const AsideRowCoinWallet = ({ coin, url }) => (
     <Wrapper to={url}>
-        <AsideRowCoin coin={coin}/>
+        <AsideRow>
+            <CoinName
+                coinImg={coin.img}
+                text={coin.name}
+            />
+        </AsideRow>
     </Wrapper>
 );
 

From d3c601c41f020761a44d0e4077c24a396fb2ab38 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 09:56:36 +0200
Subject: [PATCH 046/103] Cleanup

---
 src/styles/aside.less | 74 +++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/styles/aside.less b/src/styles/aside.less
index a06e67c8..17387f5b 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -408,46 +408,46 @@ aside {
             }
         }
 
-        &.ethereum:before,
-        &.ethereum-classic:before,
-        &.ropsten:before,
-        &.rinkeby:before {
-            background-size: auto 20px;
-            background-position: 2px 0px;
-        }
+        // &.ethereum:before,
+        // &.ethereum-classic:before,
+        // &.ropsten:before,
+        // &.rinkeby:before {
+        //     background-size: auto 20px;
+        //     background-position: 2px 0px;
+        // }
 
 
-        &.ethereum:before {
-            background-image: url('../images/eth-logo.png');
-        }
-        &.ethereum-classic:before {
-            background-image: url('../images/etc-logo.png');
-        }
-        &.ropsten:before {
-            background-image: url('../images/ropsten-logo.png');
-        }
-        &.rinkeby:before {
-            background-image: url('../images/rinkeby-logo.png');
-        }
+        // &.ethereum:before {
+        //     background-image: url('../images/eth-logo.png');
+        // }
+        // &.ethereum-classic:before {
+        //     background-image: url('../images/etc-logo.png');
+        // }
+        // &.ropsten:before {
+        //     background-image: url('../images/ropsten-logo.png');
+        // }
+        // &.rinkeby:before {
+        //     background-image: url('../images/rinkeby-logo.png');
+        // }
 
-        &.btc:before {
-            background-image: url('../images/btc-logo.png');
-        }
-        &.bch:before {
-            background-image: url('../images/bch-logo.png');
-        }
-        &.btg:before {
-            background-image: url('../images/btg-logo.png');
-        }
-        &.ltc:before {
-            background-image: url('../images/ltc-logo.png');
-        }
-        &.dash:before {
-            background-image: url('../images/dash-logo.png');
-        }
-        &.zec:before {
-            background-image: url('../images/zec-logo.png');
-        }
+        // &.btc:before {
+        //     background-image: url('../images/btc-logo.png');
+        // }
+        // &.bch:before {
+        //     background-image: url('../images/bch-logo.png');
+        // }
+        // &.btg:before {
+        //     background-image: url('../images/btg-logo.png');
+        // }
+        // &.ltc:before {
+        //     background-image: url('../images/ltc-logo.png');
+        // }
+        // &.dash:before {
+        //     background-image: url('../images/dash-logo.png');
+        // }
+        // &.zec:before {
+        //     background-image: url('../images/zec-logo.png');
+        // }
     }
 
     // .coin-divider {

From d511a9d2f4bcfaec52452571b7d23d6041b9934c Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 14:03:13 +0200
Subject: [PATCH 047/103] Separate row coin logic into a 'AsideRowCoin'
 component

---
 src/js/components/wallet/aside/AsideRow.js    | 39 ++++++++++++-------
 .../components/wallet/aside/AsideRowCoin.js   | 24 ++++++++++++
 .../wallet/aside/AsideRowCoinExternal.js      | 31 +++++++--------
 .../wallet/aside/AsideRowCoinWallet.js        | 24 ++++++------
 src/js/components/wallet/aside/CoinName.js    |  4 --
 5 files changed, 75 insertions(+), 47 deletions(-)
 create mode 100644 src/js/components/wallet/aside/AsideRowCoin.js

diff --git a/src/js/components/wallet/aside/AsideRow.js b/src/js/components/wallet/aside/AsideRow.js
index 4343ddea..45a18db4 100644
--- a/src/js/components/wallet/aside/AsideRow.js
+++ b/src/js/components/wallet/aside/AsideRow.js
@@ -1,30 +1,39 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import colors from 'config/colors';
-import { FONT_SIZE, TRANSITION_TIME } from 'config/variables';
+import { TRANSITION_TIME } from 'config/variables';
 
 const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
     padding: 16px 24px;
 
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    ${props => props.column && css`
+        flex-direction: column;
+        align-items: flex-start;
+    `}
+
     cursor: pointer;
-    font-size: ${FONT_SIZE.BASE};
-
     transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
-
-    &:hover {
-        background-color: ${colors.GRAY_LIGHT};
-    }
 `;
 
-const AsideRow = (props) => (
-    <Wrapper>
-        {props.children}
+const AsideRow = ({ children, column }) => (
+    <Wrapper
+        column={column}
+    >{children}
     </Wrapper>
 );
 
+AsideRow.propTypes = {
+    column: PropTypes.bool,
+};
+
+AsideRow.defaultProps = {
+    column: false,
+}
+
 export default AsideRow;
diff --git a/src/js/components/wallet/aside/AsideRowCoin.js b/src/js/components/wallet/aside/AsideRowCoin.js
new file mode 100644
index 00000000..33d072a9
--- /dev/null
+++ b/src/js/components/wallet/aside/AsideRowCoin.js
@@ -0,0 +1,24 @@
+
+import styled from 'styled-components';
+import React from 'react';
+import colors from 'config/colors';
+import { FONT_SIZE } from 'config/variables';
+
+const Wrapper = styled.div`
+    display: block;
+    height: 50px;
+
+    font-size: ${FONT_SIZE.BASE};
+    color: ${colors.TEXT_PRIMARY};
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
+`;
+
+const AsideRowCoin = ({ children }) => (
+    <Wrapper>
+        {children}
+    </Wrapper>
+);
+
+export default AsideRowCoin;
diff --git a/src/js/components/wallet/aside/AsideRowCoinExternal.js b/src/js/components/wallet/aside/AsideRowCoinExternal.js
index 2039e297..20e5cde4 100644
--- a/src/js/components/wallet/aside/AsideRowCoinExternal.js
+++ b/src/js/components/wallet/aside/AsideRowCoinExternal.js
@@ -4,29 +4,28 @@ import PropTypes from 'prop-types';
 
 import Icon from 'components/common/Icon';
 import AsideRow from './AsideRow';
+import AsideRowCoin from './AsideRowCoin';
 import CoinName from './CoinName';
 
 import ICONS from 'constants/icons';
 import colors from 'config/colors';
 import { coinProp } from './common';
 
-const A = styled.a`
-    display: block;
-`;
-
 const AsideRowCoinExternal = ({ coin, url }) => (
-    <A href={url}>
-        <AsideRow>
-            <CoinName
-                coinImg={coin.img}
-                text={coin.name}
-            />
-            <Icon
-                icon={ICONS.REDIRECT}
-                color={colors.TEXT_SECONDARY}
-            />
-        </AsideRow>
-    </A>
+    <a href={url}>
+        <AsideRowCoin>
+            <AsideRow>
+                <CoinName
+                    coinImg={coin.img}
+                    text={coin.name}
+                />
+                <Icon
+                    icon={ICONS.REDIRECT}
+                    color={colors.TEXT_SECONDARY}
+                />
+            </AsideRow>
+        </AsideRowCoin>
+    </a>
 );
 
 AsideRowCoinExternal.propTypes = {
diff --git a/src/js/components/wallet/aside/AsideRowCoinWallet.js b/src/js/components/wallet/aside/AsideRowCoinWallet.js
index 9a07a2cf..390fc39e 100644
--- a/src/js/components/wallet/aside/AsideRowCoinWallet.js
+++ b/src/js/components/wallet/aside/AsideRowCoinWallet.js
@@ -4,23 +4,23 @@ import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
 
 import AsideRow from './AsideRow';
+import AsideRowCoin from './AsideRowCoin';
 import CoinName from './CoinName';
 
+import colors from 'config/colors';
 import { coinProp } from './common';
 
-const Wrapper = styled(NavLink)`
-    display: block;
-`;
-
 const AsideRowCoinWallet = ({ coin, url }) => (
-    <Wrapper to={url}>
-        <AsideRow>
-            <CoinName
-                coinImg={coin.img}
-                text={coin.name}
-            />
-        </AsideRow>
-    </Wrapper>
+    <NavLink to={url}>
+        <AsideRowCoin>
+            <AsideRow>
+                <CoinName
+                    coinImg={coin.img}
+                    text={coin.name}
+                />
+            </AsideRow>
+        </AsideRowCoin>
+    </NavLink>
 );
 
 AsideRowCoinWallet.propTypes = {
diff --git a/src/js/components/wallet/aside/CoinName.js b/src/js/components/wallet/aside/CoinName.js
index 15b119e2..22b5dbc3 100644
--- a/src/js/components/wallet/aside/CoinName.js
+++ b/src/js/components/wallet/aside/CoinName.js
@@ -9,10 +9,6 @@ const Wrapper = styled.div`
     display: flex;
     align-items: center;
     justify-content: space-between;
-
-    p {
-        color: ${colors.TEXT_PRIMARY};
-    }
 `;
 
 const Logo = styled.div`

From f4651785d7fd6e6c33db2b68ab8d4ca61ada4659 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 14:03:29 +0200
Subject: [PATCH 048/103] AsideRowAccount component WIP

---
 .../wallet/aside/AccountSelection.js          | 30 ++++++---
 .../wallet/aside/AsideRowAccount.js           | 64 +++++++++++++++++++
 src/js/config/variables.js                    |  4 ++
 src/styles/aside.less                         | 22 +++----
 4 files changed, 100 insertions(+), 20 deletions(-)
 create mode 100644 src/js/components/wallet/aside/AsideRowAccount.js

diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js
index 2d932245..e72cc8ef 100644
--- a/src/js/components/wallet/aside/AccountSelection.js
+++ b/src/js/components/wallet/aside/AccountSelection.js
@@ -10,6 +10,7 @@ import * as stateUtils from 'reducers/utils';
 import Loader from 'components/common/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
+import AsideRowAccount from './AsideRowAccount';
 import AsideSection from './AsideSection';
 
 import type { TrezorDevice, Accounts } from 'flowtype';
@@ -52,10 +53,16 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
         }
 
         return (
-            <NavLink key={i} activeClassName="selected" className="account" to={url}>
-                { `Account #${(account.index + 1)}` }
-                <span>{ account.loaded ? balance : 'Loading...' }</span>
-            </NavLink>
+            <AsideRowAccount
+                accountIndex={account.index}
+                balance={balance}
+                url={url}
+            />
+
+            // <NavLink key={i} activeClassName="selected" className="account" to={url}>
+            //     { `Account #${(account.index + 1)}` }
+            //     <span>{ account.loaded ? balance : 'Loading...' }</span>
+            // </NavLink>
         );
     });
 
@@ -63,10 +70,15 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
         if (selected.connected) {
             const url: string = location.pathname.replace(/account+\/([0-9]*)/, 'account/0');
             selectedAccounts = (
-                <NavLink activeClassName="selected" className="account" to={url}>
-                    Account #1
-                    <span>Loading...</span>
-                </NavLink>
+                <AsideRowAccount
+                    accountIndex={0}
+                    url={url}
+                />
+
+                // <NavLink activeClassName="selected" className="account" to={url}>
+                //     Account #1
+                //     <span>Loading...</span>
+                // </NavLink>
             );
         }
     }
@@ -131,7 +143,7 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
 
     return (
         <AsideSection>
-            { backButton }
+            {/* { backButton } */}
             <div>
                 { selectedAccounts }
             </div>
diff --git a/src/js/components/wallet/aside/AsideRowAccount.js b/src/js/components/wallet/aside/AsideRowAccount.js
new file mode 100644
index 00000000..54938263
--- /dev/null
+++ b/src/js/components/wallet/aside/AsideRowAccount.js
@@ -0,0 +1,64 @@
+import styled, { css } from 'styled-components';
+import React from 'react';
+import PropTypes from 'prop-types';
+import { NavLink } from 'react-router-dom';
+
+import AsideRow from './AsideRow';
+
+import colors from 'config/colors';
+import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
+
+const Wrapper = styled.div`
+    height: 64px;
+    font-size: ${FONT_SIZE.SMALL};
+
+    border-top: 1px solid ${colors.DIVIDER};
+    span {
+        font-size: ${FONT_SIZE.SMALLER};
+        color: ${colors.TEXT_SECONDARY};
+    }
+
+    ${props => props.selected && css`
+        border-left: ${BORDER_WIDTH.SELECTED} solid ${colors.GREEN_PRIMARY};
+        background: ${colors.WHITE};
+
+        &:hover {
+            background-color: ${colors.WHITE};
+        }
+
+        &:last-child {
+            border-bottom: 1px solid ${colors.DIVIDER};
+        }
+    `}
+`;
+
+const AsideRowAccount = ({ accountIndex, balance, url, selected }) => (
+    <NavLink to={url}>
+        <Wrapper
+            to={url}
+            selected={selected}
+        >
+            <AsideRow column>
+                Account #{accountIndex + 1}
+                {balance ? (
+                    <span>{balance}</span>
+                ) : (
+                    <span>Loading...</span>
+                )}
+            </AsideRow>
+        </Wrapper>
+    </NavLink>
+);
+
+AsideRowAccount.propTypes = {
+    accountIndex: PropTypes.number.isRequired,
+    balance: PropTypes.string,
+    url: PropTypes.string.isRequired,
+    selected: PropTypes.bool,
+};
+
+AsideRowAccount.defaultProps = {
+    selected: true,
+};
+
+export default AsideRowAccount;
diff --git a/src/js/config/variables.js b/src/js/config/variables.js
index 0b064a33..25358460 100644
--- a/src/js/config/variables.js
+++ b/src/js/config/variables.js
@@ -11,3 +11,7 @@ export const TRANSITION_TIME = {
 export const ICON_SIZE = {
     BASE: '20px',
 }
+
+export const BORDER_WIDTH = {
+    SELECTED: '3px',
+};
diff --git a/src/styles/aside.less b/src/styles/aside.less
index 17387f5b..a907a040 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -281,17 +281,17 @@ aside {
         // }
 
         &.account {
-            height: 64px;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-evenly;
-            font-size: 14px;
-            border-top: 1px solid @color_divider;
-            span {
-                display: block;
-                font-size: 12px;
-                color: @color_text_secondary;
-            }
+            // height: 64px;
+            // display: flex;
+            // flex-direction: column;
+            // justify-content: space-evenly;
+            // font-size: 14px;
+            // border-top: 1px solid @color_divider;
+            // span {
+            //     display: block;
+            //     font-size: 12px;
+            //     color: @color_text_secondary;
+            // }
 
             &:before {
                 content: '';

From dddc354aad360559c7cbe63ff2e2890861d0bb4c Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 15:03:07 +0200
Subject: [PATCH 049/103] Move 'icons.js' to 'config/'

---
 src/js/{constants => config}/icons.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/js/{constants => config}/icons.js (100%)

diff --git a/src/js/constants/icons.js b/src/js/config/icons.js
similarity index 100%
rename from src/js/constants/icons.js
rename to src/js/config/icons.js

From ed94a0dd307b1382c09cf77e26ba757fc28c755c Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Wed, 15 Aug 2018 15:24:57 +0200
Subject: [PATCH 050/103] Add external coin links into a separate file

---
 .../components/wallet/aside/CoinSelection.js  | 61 +++++--------------
 src/js/constants/coins.js                     | 32 ++++++++++
 2 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 src/js/constants/coins.js

diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 561c8233..dff99a4b 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,9 +1,10 @@
 /* @flow */
 
-import styled from 'styled-components';
 import React from 'react';
 import { NavLink } from 'react-router-dom';
 
+import coins from 'constants/coins';
+
 import AsideDivider from './AsideDivider';
 import AsideRowCoinWallet from './AsideRowCoinWallet';
 import AsideRowCoinExternal from './AsideRowCoinExternal';
@@ -49,56 +50,24 @@ const CoinSelection = (props: Props): React$Element<string> => {
         );
     });
 
+    const externalCoins = coins.map(coin => (
+        <AsideDivider
+            coin={{
+                img: coin.image,
+                name: coin.coinName,
+            }}
+            url={coin.url}
+        />
+    ));
+
     return (
         <AsideSection>
             { walletCoins }
             <AsideDivider
-                textLeft={'Other coins'}
-                textRight={'(You will be redirected)'}
-            />
-
-            <AsideRowCoinExternal
-                coin={{
-                    img: 'btc',
-                    name: 'Bitcoin',
-                }}
-                url={'https://wallet.trezor.io/#/coin/ltc'}
-            />
-            <AsideRowCoinExternal
-                coin={{
-                    img: 'ltc',
-                    name: 'Litecoin',
-                }}
-                url={'https://wallet.trezor.io/#/coin/ltc'}
-            />
-            <AsideRowCoinExternal
-                coin={{
-                    img: 'bch',
-                    name: 'Bitcoin Cash',
-                }}
-                url={'https://wallet.trezor.io/#/coin/bch'}
-            />
-            <AsideRowCoinExternal
-                coin={{
-                    img: 'btg',
-                    name: 'Bitcoin Gold',
-                }}
-                url={'https://wallet.trezor.io/#/coin/btg'}
-            />
-            <AsideRowCoinExternal
-                coin={{
-                    img: 'Dash',
-                    name: 'Dash',
-                }}
-                url={'https://wallet.trezor.io/#/coin/dash'}
-            />
-            <AsideRowCoinExternal
-                coin={{
-                    img: 'zec',
-                    name: 'Zcash',
-                }}
-                url={'https://wallet.trezor.io/#/coin/zec'}
+                textLeft="Other coins"
+                textRight="(You will be redirected)"
             />
+            { externalCoins }
         </AsideSection>
     );
 };
diff --git a/src/js/constants/coins.js b/src/js/constants/coins.js
new file mode 100644
index 00000000..cfdd9d26
--- /dev/null
+++ b/src/js/constants/coins.js
@@ -0,0 +1,32 @@
+export default [
+    {
+        coinName: 'Bitcoin',
+        url: 'https://wallet.trezor.io/#/coin/btc',
+        image: '../images/btc-logo.png',
+    },
+    {
+        coinName: 'Litecoin',
+        url: 'https://wallet.trezor.io/#/coin/ltc',
+        image: '../images/ltc-logo.png',
+    },
+    {
+        coinName: 'Bitcoin Cash',
+        url: 'https://wallet.trezor.io/#/coin/bch',
+        image: '../images/bch-logo.png',
+    },
+    {
+        coinName: 'Bitcoin Gold',
+        url: 'https://wallet.trezor.io/#/coin/btg',
+        image: '../images/btg-logo.png',
+    },
+    {
+        coinName: 'Dash',
+        url: 'https://wallet.trezor.io/#/coin/dash',
+        image: '../images/dash-logo.png',
+    },
+    {
+        coinName: 'Zcash',
+        url: 'https://wallet.trezor.io/#/coin/zec',
+        image: '../images/zec-logo.png',
+    },
+];

From e75c96d84da0c6fddfab45426d8165fb60c0808c Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Wed, 15 Aug 2018 15:26:03 +0200
Subject: [PATCH 051/103] Removed required default props

---
 .eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc b/.eslintrc
index 121738b5..0c77d1ce 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -9,6 +9,7 @@
         "jest": true
     },
     "rules": {
+        "react/require-default-props": 0,
         "react/destructuring-assignment": 0,
         "react/jsx-one-expression-per-line": 0,
         "react/jsx-indent": [2, 4],

From be49f6901e2f828eda5fefe6d78578caaba8f38a Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 09:00:52 +0200
Subject: [PATCH 052/103] Set default prop values in function parameter

---
 src/js/components/common/Icon.js           | 14 +++++---------
 src/js/components/wallet/aside/AsideRow.js |  6 +-----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/js/components/common/Icon.js b/src/js/components/common/Icon.js
index 213b2132..91f308fb 100644
--- a/src/js/components/common/Icon.js
+++ b/src/js/components/common/Icon.js
@@ -1,27 +1,27 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const Icon = (props) => {
+const Icon = ({ icon, size = 30, color = 'black' }) => {
     const styles = {
         svg: {
             display: 'inline-block',
             verticalAlign: 'middle',
         },
         path: {
-            fill: props.color,
+            fill: color,
         },
     };
 
     return (
         <svg
             style={styles.svg}
-            width={`${props.size}`}
-            height={`${props.size}`}
+            width={`${size}`}
+            height={`${size}`}
             viewBox="0 0 16 16"
         >
             <path
                 style={styles.path}
-                d={props.icon}
+                d={icon}
 
             />
         </svg>
@@ -34,9 +34,5 @@ Icon.propTypes = {
     color: PropTypes.string,
 };
 
-Icon.defaultProps = {
-    size: 30,
-    color: 'black',
-};
 
 export default Icon;
\ No newline at end of file
diff --git a/src/js/components/wallet/aside/AsideRow.js b/src/js/components/wallet/aside/AsideRow.js
index 45a18db4..0f1b2812 100644
--- a/src/js/components/wallet/aside/AsideRow.js
+++ b/src/js/components/wallet/aside/AsideRow.js
@@ -21,7 +21,7 @@ const Wrapper = styled.div`
     transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
 `;
 
-const AsideRow = ({ children, column }) => (
+const AsideRow = ({ children, column = false }) => (
     <Wrapper
         column={column}
     >{children}
@@ -32,8 +32,4 @@ AsideRow.propTypes = {
     column: PropTypes.bool,
 };
 
-AsideRow.defaultProps = {
-    column: false,
-}
-
 export default AsideRow;

From 779bb84c018daab6f58c95b230ec12eff816d4bd Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 09:01:35 +0200
Subject: [PATCH 053/103] Cleanup & fix path to config/constants

---
 src/js/components/wallet/aside/AsideRowCoinExternal.js | 5 +++--
 src/js/components/wallet/aside/AsideRowCoinWallet.js   | 2 --
 src/js/components/wallet/pages/DeviceSettings.js       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/js/components/wallet/aside/AsideRowCoinExternal.js b/src/js/components/wallet/aside/AsideRowCoinExternal.js
index 20e5cde4..8d425ed5 100644
--- a/src/js/components/wallet/aside/AsideRowCoinExternal.js
+++ b/src/js/components/wallet/aside/AsideRowCoinExternal.js
@@ -2,13 +2,14 @@ import styled from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import ICONS from 'config/icons';
+import colors from 'config/colors';
+
 import Icon from 'components/common/Icon';
 import AsideRow from './AsideRow';
 import AsideRowCoin from './AsideRowCoin';
 import CoinName from './CoinName';
 
-import ICONS from 'constants/icons';
-import colors from 'config/colors';
 import { coinProp } from './common';
 
 const AsideRowCoinExternal = ({ coin, url }) => (
diff --git a/src/js/components/wallet/aside/AsideRowCoinWallet.js b/src/js/components/wallet/aside/AsideRowCoinWallet.js
index 390fc39e..c5435367 100644
--- a/src/js/components/wallet/aside/AsideRowCoinWallet.js
+++ b/src/js/components/wallet/aside/AsideRowCoinWallet.js
@@ -1,4 +1,3 @@
-import styled from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
@@ -7,7 +6,6 @@ import AsideRow from './AsideRow';
 import AsideRowCoin from './AsideRowCoin';
 import CoinName from './CoinName';
 
-import colors from 'config/colors';
 import { coinProp } from './common';
 
 const AsideRowCoinWallet = ({ coin, url }) => (
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index 2a27021e..2a9817e3 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -4,7 +4,7 @@ import { H2 } from 'components/common/Heading';
 import Icon from 'components/common/Icon';
 import colors from 'config/colors';
 import Button from 'components/common/Button';
-import ICONS from 'constants/icons';
+import ICONS from 'config/icons';
 import { connect } from 'react-redux';
 
 const Section = styled.section`

From 82c215dc81fafea3d5efe8b37f52fb6fbad620d5 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 11:27:30 +0200
Subject: [PATCH 054/103] Add folder structure

---
 .../wallet/aside/{ => row}/AsideRow.js         |  5 +++++
 .../aside/{ => row/account}/AsideRowAccount.js | 18 ++++++++----------
 .../wallet/aside/{ => row/coin}/CoinName.js    |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
 rename src/js/components/wallet/aside/{ => row}/AsideRow.js (85%)
 rename src/js/components/wallet/aside/{ => row/account}/AsideRowAccount.js (83%)
 rename src/js/components/wallet/aside/{ => row/coin}/CoinName.js (91%)

diff --git a/src/js/components/wallet/aside/AsideRow.js b/src/js/components/wallet/aside/row/AsideRow.js
similarity index 85%
rename from src/js/components/wallet/aside/AsideRow.js
rename to src/js/components/wallet/aside/row/AsideRow.js
index 0f1b2812..ab5478aa 100644
--- a/src/js/components/wallet/aside/AsideRow.js
+++ b/src/js/components/wallet/aside/row/AsideRow.js
@@ -7,6 +7,7 @@ import { TRANSITION_TIME } from 'config/variables';
 
 const Wrapper = styled.div`
     padding: 16px 24px;
+    height: 100%;
 
     display: flex;
     flex-direction: row;
@@ -29,6 +30,10 @@ const AsideRow = ({ children, column = false }) => (
 );
 
 AsideRow.propTypes = {
+    children: PropTypes.oneOfType([
+        PropTypes.arrayOf(PropTypes.node),
+        PropTypes.node,
+    ]),
     column: PropTypes.bool,
 };
 
diff --git a/src/js/components/wallet/aside/AsideRowAccount.js b/src/js/components/wallet/aside/row/account/AsideRowAccount.js
similarity index 83%
rename from src/js/components/wallet/aside/AsideRowAccount.js
rename to src/js/components/wallet/aside/row/account/AsideRowAccount.js
index 54938263..e6e3b7c7 100644
--- a/src/js/components/wallet/aside/AsideRowAccount.js
+++ b/src/js/components/wallet/aside/row/account/AsideRowAccount.js
@@ -3,14 +3,16 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
 
-import AsideRow from './AsideRow';
+import AsideRow from '../AsideRow';
 
 import colors from 'config/colors';
 import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
 
 const Wrapper = styled.div`
     height: 64px;
+
     font-size: ${FONT_SIZE.SMALL};
+    color: ${colors.TEXT_PRIMARY};
 
     border-top: 1px solid ${colors.DIVIDER};
     span {
@@ -18,7 +20,7 @@ const Wrapper = styled.div`
         color: ${colors.TEXT_SECONDARY};
     }
 
-    ${props => props.selected && css`
+    ${props => props.isSelected && css`
         border-left: ${BORDER_WIDTH.SELECTED} solid ${colors.GREEN_PRIMARY};
         background: ${colors.WHITE};
 
@@ -32,11 +34,11 @@ const Wrapper = styled.div`
     `}
 `;
 
-const AsideRowAccount = ({ accountIndex, balance, url, selected }) => (
+const AsideRowAccount = ({ accountIndex, balance, url, isSelected = false }) => (
     <NavLink to={url}>
         <Wrapper
             to={url}
-            selected={selected}
+            isSelected={isSelected}
         >
             <AsideRow column>
                 Account #{accountIndex + 1}
@@ -52,13 +54,9 @@ const AsideRowAccount = ({ accountIndex, balance, url, selected }) => (
 
 AsideRowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
-    balance: PropTypes.string,
     url: PropTypes.string.isRequired,
-    selected: PropTypes.bool,
-};
-
-AsideRowAccount.defaultProps = {
-    selected: true,
+    balance: PropTypes.string,
+    isSelected: PropTypes.bool,
 };
 
 export default AsideRowAccount;
diff --git a/src/js/components/wallet/aside/CoinName.js b/src/js/components/wallet/aside/row/coin/CoinName.js
similarity index 91%
rename from src/js/components/wallet/aside/CoinName.js
rename to src/js/components/wallet/aside/row/coin/CoinName.js
index 22b5dbc3..48321f58 100644
--- a/src/js/components/wallet/aside/CoinName.js
+++ b/src/js/components/wallet/aside/row/coin/CoinName.js
@@ -19,7 +19,7 @@ const Logo = styled.div`
     background-repeat: no-repeat;
     background-position: center;
     background-size: auto ${ICON_SIZE.BASE};
-    background-image: url('images/${props => props.coinImg}-logo.png');
+    background-image: url('${props => props.coinImg}');
 `;
 
 const CoinName = ({ coinImg, text }) => (

From 0410735c2a4545fe9f792c748ca342256b848d1e Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 11:29:14 +0200
Subject: [PATCH 055/103] Delete 'AsideRowCoinExternal' and
 'AsideRowCoinWallet' and move its logic into 'AsideRowCoin'

---
 .../components/wallet/aside/AsideRowCoin.js   | 24 -------
 .../wallet/aside/AsideRowCoinExternal.js      | 37 -----------
 .../wallet/aside/AsideRowCoinWallet.js        | 29 ---------
 .../components/wallet/aside/CoinSelection.js  | 63 ++++++++++---------
 .../wallet/aside/row/coin/AsideRowCoin.js     | 49 +++++++++++++++
 5 files changed, 82 insertions(+), 120 deletions(-)
 delete mode 100644 src/js/components/wallet/aside/AsideRowCoin.js
 delete mode 100644 src/js/components/wallet/aside/AsideRowCoinExternal.js
 delete mode 100644 src/js/components/wallet/aside/AsideRowCoinWallet.js
 create mode 100644 src/js/components/wallet/aside/row/coin/AsideRowCoin.js

diff --git a/src/js/components/wallet/aside/AsideRowCoin.js b/src/js/components/wallet/aside/AsideRowCoin.js
deleted file mode 100644
index 33d072a9..00000000
--- a/src/js/components/wallet/aside/AsideRowCoin.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-import styled from 'styled-components';
-import React from 'react';
-import colors from 'config/colors';
-import { FONT_SIZE } from 'config/variables';
-
-const Wrapper = styled.div`
-    display: block;
-    height: 50px;
-
-    font-size: ${FONT_SIZE.BASE};
-    color: ${colors.TEXT_PRIMARY};
-    &:hover {
-        background-color: ${colors.GRAY_LIGHT};
-    }
-`;
-
-const AsideRowCoin = ({ children }) => (
-    <Wrapper>
-        {children}
-    </Wrapper>
-);
-
-export default AsideRowCoin;
diff --git a/src/js/components/wallet/aside/AsideRowCoinExternal.js b/src/js/components/wallet/aside/AsideRowCoinExternal.js
deleted file mode 100644
index 8d425ed5..00000000
--- a/src/js/components/wallet/aside/AsideRowCoinExternal.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import styled from 'styled-components';
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import ICONS from 'config/icons';
-import colors from 'config/colors';
-
-import Icon from 'components/common/Icon';
-import AsideRow from './AsideRow';
-import AsideRowCoin from './AsideRowCoin';
-import CoinName from './CoinName';
-
-import { coinProp } from './common';
-
-const AsideRowCoinExternal = ({ coin, url }) => (
-    <a href={url}>
-        <AsideRowCoin>
-            <AsideRow>
-                <CoinName
-                    coinImg={coin.img}
-                    text={coin.name}
-                />
-                <Icon
-                    icon={ICONS.REDIRECT}
-                    color={colors.TEXT_SECONDARY}
-                />
-            </AsideRow>
-        </AsideRowCoin>
-    </a>
-);
-
-AsideRowCoinExternal.propTypes = {
-    ...coinProp,
-    url: PropTypes.string,
-};
-
-export default AsideRowCoinExternal;
diff --git a/src/js/components/wallet/aside/AsideRowCoinWallet.js b/src/js/components/wallet/aside/AsideRowCoinWallet.js
deleted file mode 100644
index c5435367..00000000
--- a/src/js/components/wallet/aside/AsideRowCoinWallet.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { NavLink } from 'react-router-dom';
-
-import AsideRow from './AsideRow';
-import AsideRowCoin from './AsideRowCoin';
-import CoinName from './CoinName';
-
-import { coinProp } from './common';
-
-const AsideRowCoinWallet = ({ coin, url }) => (
-    <NavLink to={url}>
-        <AsideRowCoin>
-            <AsideRow>
-                <CoinName
-                    coinImg={coin.img}
-                    text={coin.name}
-                />
-            </AsideRow>
-        </AsideRowCoin>
-    </NavLink>
-);
-
-AsideRowCoinWallet.propTypes = {
-    ...coinProp,
-    url: PropTypes.string.isRequired,
-};
-
-export default AsideRowCoinWallet;
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index dff99a4b..671c38fa 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,21 +1,18 @@
 /* @flow */
-
-import React from 'react';
-import { NavLink } from 'react-router-dom';
-
 import coins from 'constants/coins';
+import colors from 'config/colors';
+import ICONS from 'config/icons';
+import { NavLink } from 'react-router-dom';
+import React from 'react';
 
 import AsideDivider from './AsideDivider';
-import AsideRowCoinWallet from './AsideRowCoinWallet';
-import AsideRowCoinExternal from './AsideRowCoinExternal';
-import AsideSection from './AsideSection';
+import AsideRowCoin from './row/coin/AsideRowCoin';
+
 
-import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
 
-const CoinSelection = (props: Props): React$Element<string> => {
-    const { location } = props.router;
+const CoinSelection = (props: Props) => {
     const { config } = props.localStorage;
     const { selectedDevice } = props.wallet;
 
@@ -29,37 +26,43 @@ const CoinSelection = (props: Props): React$Element<string> => {
 
     const walletCoins = config.coins.map((item) => {
         const url = `${baseUrl}/network/${item.network}/account/0`;
-        const className = `coin ${item.network}`;
 
-        let coinImg = item.network;
+        let imgName = item.network;
         if (item.network === 'ethereum') {
-            coinImg = 'eth';
-        } else if (item.network === 'ethereum-classic' ) {
-            coinImg = 'etc';
+            imgName = 'eth';
+        } else if (item.network === 'ethereum-classic') {
+            imgName = 'etc';
         }
+        const imgUrl = `../images/${imgName}-logo.png`;
 
         return (
-            <AsideRowCoinWallet
-                key={item.network}
-                coin={{
-                    img: coinImg,
-                    name: item.name,
-                }}
-                url={url}
-            />
+            <NavLink to={url}>
+                <AsideRowCoin
+                    coin={{
+                        img: imgUrl,
+                        name: item.name,
+                    }}
+                />
+            </NavLink>
         );
     });
 
     const externalCoins = coins.map(coin => (
-        <AsideDivider
-            coin={{
-                img: coin.image,
-                name: coin.coinName,
-            }}
-            url={coin.url}
-        />
+        <a href={coin.url}>
+            <AsideRowCoin
+                coin={{
+                    img: coin.image,
+                    name: coin.coinName,
+                }}
+                icon={{
+                    type: ICONS.REDIRECT,
+                    color: colors.TEXT_SECONDARY,
+                }}
+            />
+        </a>
     ));
 
+
     return (
         <AsideSection>
             { walletCoins }
diff --git a/src/js/components/wallet/aside/row/coin/AsideRowCoin.js b/src/js/components/wallet/aside/row/coin/AsideRowCoin.js
new file mode 100644
index 00000000..ee7f5a3f
--- /dev/null
+++ b/src/js/components/wallet/aside/row/coin/AsideRowCoin.js
@@ -0,0 +1,49 @@
+
+import colors from 'config/colors';
+import { FONT_SIZE } from 'config/variables';
+import Icon from 'components/common/Icon';
+import PropTypes from 'prop-types';
+import React from 'react';
+import styled from 'styled-components';
+
+import AsideRow from '../AsideRow';
+import CoinName from './CoinName';
+import { coinProp } from '../../common';
+
+const Wrapper = styled.div`
+    display: block;
+    height: 50px;
+
+    font-size: ${FONT_SIZE.BASE};
+    color: ${colors.TEXT_PRIMARY};
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
+`;
+
+const AsideRowCoin = ({ coin, icon }) => (
+    <Wrapper>
+        <AsideRow>
+            <CoinName
+                coinImg={coin.img}
+                text={coin.name}
+            />
+            {icon && (
+                <Icon
+                    icon={icon.type}
+                    color={icon.color}
+                />
+            )}
+        </AsideRow>
+    </Wrapper>
+);
+
+AsideRowCoin.propTypes = {
+    ...coinProp,
+    icon: PropTypes.shape({
+        type: PropTypes.string.isRequired,
+        color: PropTypes.string.isRequired,
+    }),
+};
+
+export default AsideRowCoin;

From fbbceedd4871e01feaf863a1cdf57c0d819b47d8 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 12:19:13 +0200
Subject: [PATCH 056/103] Landing folder structure refactored

---
 .babelrc                                      |  3 ++-
 jsconfig.json                                 |  1 +
 .../components/wallet/aside/AsideDivider.js   |  4 ----
 src/js/components/wallet/aside/AsideRow.js    |  6 +-----
 .../wallet/aside/AsideRowAccount.js           |  6 ++++--
 .../components/wallet/aside/CoinSelection.js  | 20 +++++++++----------
 src/js/components/wallet/index.js             |  2 --
 src/js/config/variables.js                    |  4 ++--
 src/js/index.js                               |  2 +-
 src/js/views/Device/index.js                  |  0
 .../index.js => views/Landing/Container.js}   |  4 +---
 .../Landing/components}/ConnectDevice.js      |  0
 .../Landing/components}/InstallBridge.js      |  0
 .../Landing/components}/LocalStorageError.js  |  0
 .../Landing/components}/Preloader.js          |  2 +-
 .../Landing/components}/TrezorConnectError.js |  0
 .../LandingPage.js => views/Landing/index.js} | 20 +++++++++----------
 src/js/views/Settings/index.js                |  0
 src/js/{router => views}/index.js             |  8 ++++----
 19 files changed, 37 insertions(+), 45 deletions(-)
 create mode 100644 src/js/views/Device/index.js
 rename src/js/{components/landing/index.js => views/Landing/Container.js} (96%)
 rename src/js/{components/landing => views/Landing/components}/ConnectDevice.js (100%)
 rename src/js/{components/landing => views/Landing/components}/InstallBridge.js (100%)
 rename src/js/{components/landing => views/Landing/components}/LocalStorageError.js (100%)
 rename src/js/{components/landing => views/Landing/components}/Preloader.js (78%)
 rename src/js/{components/landing => views/Landing/components}/TrezorConnectError.js (100%)
 rename src/js/{components/landing/LandingPage.js => views/Landing/index.js} (82%)
 create mode 100644 src/js/views/Settings/index.js
 rename src/js/{router => views}/index.js (91%)

diff --git a/.babelrc b/.babelrc
index 9e072680..53b6a302 100644
--- a/.babelrc
+++ b/.babelrc
@@ -25,7 +25,8 @@
                 "reducers": "./src/js/reducers",
                 "support": "./src/js/support",
                 "utils": "./src/js/utils",
-                "services": "./src/js/services"
+                "services": "./src/js/services",
+                "views": "./src/js/views"
             }
         }],
         "babel-plugin-styled-components"
diff --git a/jsconfig.json b/jsconfig.json
index 045103d3..d48f8ef8 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -11,6 +11,7 @@
             "reducers/*": ["./src/js/reducers/*"],
             "utils/*": ["./src/js/utils/*"],
             "services/*": ["./src/js/services/*"],
+            "views/*": ["./src/js/views/*"],
         }
     }
 }
\ No newline at end of file
diff --git a/src/js/components/wallet/aside/AsideDivider.js b/src/js/components/wallet/aside/AsideDivider.js
index f9600078..3ed44cc4 100644
--- a/src/js/components/wallet/aside/AsideDivider.js
+++ b/src/js/components/wallet/aside/AsideDivider.js
@@ -8,14 +8,10 @@ import { FONT_SIZE } from 'config/variables';
 const Wrapper = styled.div`
     display: flex;
     justify-content: space-between;
-
     padding: 8px 28px 8px 24px;
-
     font-size: ${FONT_SIZE.SMALLER};
     color: ${colors.TEXT_SECONDARY};
-
     background: ${colors.GRAY_LIGHT};
-
     border-top: 1px solid ${colors.DIVIDER};
     border-bottom: 1px solid ${colors.DIVIDER};
 `;
diff --git a/src/js/components/wallet/aside/AsideRow.js b/src/js/components/wallet/aside/AsideRow.js
index 45a18db4..0f1b2812 100644
--- a/src/js/components/wallet/aside/AsideRow.js
+++ b/src/js/components/wallet/aside/AsideRow.js
@@ -21,7 +21,7 @@ const Wrapper = styled.div`
     transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
 `;
 
-const AsideRow = ({ children, column }) => (
+const AsideRow = ({ children, column = false }) => (
     <Wrapper
         column={column}
     >{children}
@@ -32,8 +32,4 @@ AsideRow.propTypes = {
     column: PropTypes.bool,
 };
 
-AsideRow.defaultProps = {
-    column: false,
-}
-
 export default AsideRow;
diff --git a/src/js/components/wallet/aside/AsideRowAccount.js b/src/js/components/wallet/aside/AsideRowAccount.js
index 54938263..d1e3c2fb 100644
--- a/src/js/components/wallet/aside/AsideRowAccount.js
+++ b/src/js/components/wallet/aside/AsideRowAccount.js
@@ -3,10 +3,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
 
-import AsideRow from './AsideRow';
 
 import colors from 'config/colors';
 import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
+import AsideRow from './AsideRow';
 
 const Wrapper = styled.div`
     height: 64px;
@@ -32,7 +32,9 @@ const Wrapper = styled.div`
     `}
 `;
 
-const AsideRowAccount = ({ accountIndex, balance, url, selected }) => (
+const AsideRowAccount = ({
+    accountIndex, balance, url, selected,
+}) => (
     <NavLink to={url}>
         <Wrapper
             to={url}
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 561c8233..cccde75f 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -4,12 +4,12 @@ import styled from 'styled-components';
 import React from 'react';
 import { NavLink } from 'react-router-dom';
 
+import type { TrezorDevice } from 'flowtype';
 import AsideDivider from './AsideDivider';
 import AsideRowCoinWallet from './AsideRowCoinWallet';
 import AsideRowCoinExternal from './AsideRowCoinExternal';
 import AsideSection from './AsideSection';
 
-import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
 
@@ -33,7 +33,7 @@ const CoinSelection = (props: Props): React$Element<string> => {
         let coinImg = item.network;
         if (item.network === 'ethereum') {
             coinImg = 'eth';
-        } else if (item.network === 'ethereum-classic' ) {
+        } else if (item.network === 'ethereum-classic') {
             coinImg = 'etc';
         }
 
@@ -53,8 +53,8 @@ const CoinSelection = (props: Props): React$Element<string> => {
         <AsideSection>
             { walletCoins }
             <AsideDivider
-                textLeft={'Other coins'}
-                textRight={'(You will be redirected)'}
+                textLeft="Other coins"
+                textRight="(You will be redirected)"
             />
 
             <AsideRowCoinExternal
@@ -62,42 +62,42 @@ const CoinSelection = (props: Props): React$Element<string> => {
                     img: 'btc',
                     name: 'Bitcoin',
                 }}
-                url={'https://wallet.trezor.io/#/coin/ltc'}
+                url="https://wallet.trezor.io/#/coin/ltc"
             />
             <AsideRowCoinExternal
                 coin={{
                     img: 'ltc',
                     name: 'Litecoin',
                 }}
-                url={'https://wallet.trezor.io/#/coin/ltc'}
+                url="https://wallet.trezor.io/#/coin/ltc"
             />
             <AsideRowCoinExternal
                 coin={{
                     img: 'bch',
                     name: 'Bitcoin Cash',
                 }}
-                url={'https://wallet.trezor.io/#/coin/bch'}
+                url="https://wallet.trezor.io/#/coin/bch"
             />
             <AsideRowCoinExternal
                 coin={{
                     img: 'btg',
                     name: 'Bitcoin Gold',
                 }}
-                url={'https://wallet.trezor.io/#/coin/btg'}
+                url="https://wallet.trezor.io/#/coin/btg"
             />
             <AsideRowCoinExternal
                 coin={{
                     img: 'Dash',
                     name: 'Dash',
                 }}
-                url={'https://wallet.trezor.io/#/coin/dash'}
+                url="https://wallet.trezor.io/#/coin/dash"
             />
             <AsideRowCoinExternal
                 coin={{
                     img: 'zec',
                     name: 'Zcash',
                 }}
-                url={'https://wallet.trezor.io/#/coin/zec'}
+                url="https://wallet.trezor.io/#/coin/zec"
             />
         </AsideSection>
     );
diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js
index b66c3a15..49a34a79 100644
--- a/src/js/components/wallet/index.js
+++ b/src/js/components/wallet/index.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Route, withRouter } from 'react-router-dom';
@@ -16,7 +15,6 @@ import ModalContainer from '../modal';
 import Notifications from '../common/Notification';
 import Log from '../common/Log';
 
-
 type WalletContainerProps = {
     wallet: $ElementType<State, 'wallet'>,
     children?: React.Node
diff --git a/src/js/config/variables.js b/src/js/config/variables.js
index 25358460..754d18ca 100644
--- a/src/js/config/variables.js
+++ b/src/js/config/variables.js
@@ -6,11 +6,11 @@ export const FONT_SIZE = {
 
 export const TRANSITION_TIME = {
     BASE: '0.3s',
-}
+};
 
 export const ICON_SIZE = {
     BASE: '20px',
-}
+};
 
 export const BORDER_WIDTH = {
     SELECTED: '3px',
diff --git a/src/js/index.js b/src/js/index.js
index 7dfa42f4..372ede76 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -4,7 +4,7 @@ import { render } from 'react-dom';
 import baseStyles from 'support/BaseStyles';
 import { onBeforeUnload } from 'actions/WalletActions';
 import 'styles/index.less';
-import App from './router';
+import App from 'views/index';
 import store from './store';
 
 const root: ?HTMLElement = document.getElementById('root');
diff --git a/src/js/views/Device/index.js b/src/js/views/Device/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/js/components/landing/index.js b/src/js/views/Landing/Container.js
similarity index 96%
rename from src/js/components/landing/index.js
rename to src/js/views/Landing/Container.js
index ed7fec6c..e1cc0226 100644
--- a/src/js/components/landing/index.js
+++ b/src/js/views/Landing/Container.js
@@ -1,14 +1,12 @@
 /* @flow */
 
-
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
-import LandingPage from './LandingPage';
+import LandingPage from './index';
 
 export type StateProps = {
     localStorage: $ElementType<State, 'localStorage'>,
diff --git a/src/js/components/landing/ConnectDevice.js b/src/js/views/Landing/components/ConnectDevice.js
similarity index 100%
rename from src/js/components/landing/ConnectDevice.js
rename to src/js/views/Landing/components/ConnectDevice.js
diff --git a/src/js/components/landing/InstallBridge.js b/src/js/views/Landing/components/InstallBridge.js
similarity index 100%
rename from src/js/components/landing/InstallBridge.js
rename to src/js/views/Landing/components/InstallBridge.js
diff --git a/src/js/components/landing/LocalStorageError.js b/src/js/views/Landing/components/LocalStorageError.js
similarity index 100%
rename from src/js/components/landing/LocalStorageError.js
rename to src/js/views/Landing/components/LocalStorageError.js
diff --git a/src/js/components/landing/Preloader.js b/src/js/views/Landing/components/Preloader.js
similarity index 78%
rename from src/js/components/landing/Preloader.js
rename to src/js/views/Landing/components/Preloader.js
index cd80785a..f7d41e7f 100644
--- a/src/js/components/landing/Preloader.js
+++ b/src/js/views/Landing/components/Preloader.js
@@ -2,7 +2,7 @@
 
 
 import React from 'react';
-import Loader from '../common/LoaderCircle';
+import Loader from 'components/common/LoaderCircle';
 
 export default (props: {}): React$Element<string> => (
     <section className="landing">
diff --git a/src/js/components/landing/TrezorConnectError.js b/src/js/views/Landing/components/TrezorConnectError.js
similarity index 100%
rename from src/js/components/landing/TrezorConnectError.js
rename to src/js/views/Landing/components/TrezorConnectError.js
diff --git a/src/js/components/landing/LandingPage.js b/src/js/views/Landing/index.js
similarity index 82%
rename from src/js/components/landing/LandingPage.js
rename to src/js/views/Landing/index.js
index a8765758..b1569b71 100644
--- a/src/js/components/landing/LandingPage.js
+++ b/src/js/views/Landing/index.js
@@ -1,17 +1,17 @@
 /* @flow */
 
-
 import React from 'react';
 import { H2 } from 'components/common/Heading';
-import Preloader from './Preloader';
-import ConnectDevice from './ConnectDevice';
-import InstallBridge from './InstallBridge';
-import LocalStorageError from './LocalStorageError';
-import TrezorConnectError from './TrezorConnectError';
-import Header from '../common/Header';
-import Footer from '../common/Footer';
-import Log from '../common/Log';
-import Notifications, { Notification } from '../common/Notification';
+import Header from 'components/common/Header';
+import Footer from 'components/common/Footer';
+import Log from 'components/common/Log';
+import Notifications, { Notification } from 'components/common/Notification';
+
+import Preloader from './components/Preloader';
+import ConnectDevice from './components/ConnectDevice';
+import InstallBridge from './components/InstallBridge';
+import LocalStorageError from './components/LocalStorageError';
+import TrezorConnectError from './components/TrezorConnectError';
 
 import type { Props } from './index';
 
diff --git a/src/js/views/Settings/index.js b/src/js/views/Settings/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/js/router/index.js b/src/js/views/index.js
similarity index 91%
rename from src/js/router/index.js
rename to src/js/views/index.js
index fcf1c40f..eb3e63a8 100644
--- a/src/js/router/index.js
+++ b/src/js/views/index.js
@@ -6,7 +6,6 @@ import { ConnectedRouter } from 'react-router-redux';
 
 import ErrorBoundary from 'support/ErrorBoundary';
 
-import LandingPageContainer from 'components/landing';
 import WalletContainer from 'components/wallet';
 import BootloaderContainer from 'components/wallet/pages/Bootloader';
 import InitializeContainer from 'components/wallet/pages/Initialize';
@@ -20,15 +19,16 @@ import ReceiveContainer from 'components/wallet/account/receive';
 import SignVerifyContainer from 'components/wallet/account/sign/SignVerify';
 import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
 import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
+import LandingContainer from 'views/Landing/Container';
 import store, { history } from '../store';
 
 const App = () => (
     <Provider store={store}>
         <ConnectedRouter history={history}>
             <Switch>
-                <Route exact path="/" component={LandingPageContainer} />
-                <Route exact path="/bridge" component={LandingPageContainer} />
-                <Route exact path="/import" component={LandingPageContainer} />
+                <Route exact path="/" component={LandingContainer} />
+                <Route exact path="/bridge" component={LandingContainer} />
+                <Route exact path="/import" component={LandingContainer} />
                 <Route>
                     <WalletContainer>
                         <ErrorBoundary>

From f8c11f918ea6016c3bec1db22eb7152376c90956 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 12:26:40 +0200
Subject: [PATCH 057/103] Convert 'CoinSelection' to a class component

---
 .../components/wallet/aside/CoinSelection.js  | 119 ++++++++++--------
 1 file changed, 64 insertions(+), 55 deletions(-)

diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 671c38fa..9a18c314 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -3,7 +3,8 @@ import coins from 'constants/coins';
 import colors from 'config/colors';
 import ICONS from 'config/icons';
 import { NavLink } from 'react-router-dom';
-import React from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 
 import AsideDivider from './AsideDivider';
 import AsideRowCoin from './row/coin/AsideRowCoin';
@@ -12,67 +13,75 @@ import AsideRowCoin from './row/coin/AsideRowCoin';
 import type { Props } from './index';
 
 
-const CoinSelection = (props: Props) => {
-    const { config } = props.localStorage;
-    const { selectedDevice } = props.wallet;
-
-    let baseUrl: string = '';
-    if (selectedDevice && selectedDevice.features) {
-        baseUrl = `/device/${selectedDevice.features.device_id}`;
-        if (selectedDevice.instance) {
-            baseUrl += `:${selectedDevice.instance}`;
+class CoinSelection extends Component {
+    getBaseUrl() {
+        const { selectedDevice } = this.props.wallet;
+        let baseUrl = '';
+        if (selectedDevice && selectedDevice.features) {
+            baseUrl = `/device/${selectedDevice.features.device_id}`;
+            if (selectedDevice.instance) {
+                baseUrl += `:${selectedDevice.instance}`;
+            }
         }
+
+        return baseUrl;
     }
 
-    const walletCoins = config.coins.map((item) => {
-        const url = `${baseUrl}/network/${item.network}/account/0`;
-
-        let imgName = item.network;
-        if (item.network === 'ethereum') {
-            imgName = 'eth';
-        } else if (item.network === 'ethereum-classic') {
-            imgName = 'etc';
-        }
-        const imgUrl = `../images/${imgName}-logo.png`;
-
+    render() {
+        const { config } = this.props.localStorage;
         return (
-            <NavLink to={url}>
-                <AsideRowCoin
-                    coin={{
-                        img: imgUrl,
-                        name: item.name,
-                    }}
+            <React.Fragment>
+                {config.coins.map((item) => {
+                    let imgName = item.network;
+                    if (item.network === 'ethereum') {
+                        imgName = 'eth';
+                    } else if (item.network === 'ethereum-classic') {
+                        imgName = 'etc';
+                    }
+                    const imgUrl = `../images/${imgName}-logo.png`;
+
+                    return (
+                        <NavLink
+                            key={item.network}
+                            to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
+                        >
+                            <AsideRowCoin
+                                coin={{
+                                    img: imgUrl,
+                                    name: item.name,
+                                }}
+                            />
+                        </NavLink>
+                    );
+                })}
+                <AsideDivider
+                    textLeft="Other coins"
+                    textRight="(You will be redirected)"
                 />
-            </NavLink>
+                {coins.map(coin => (
+                    <a href={coin.url}>
+                        <AsideRowCoin
+                            coin={{
+                                img: coin.image,
+                                name: coin.coinName,
+                            }}
+                            icon={{
+                                type: ICONS.REDIRECT,
+                                color: colors.TEXT_SECONDARY,
+                            }}
+                        />
+                    </a>
+                ))}
+            </React.Fragment>
         );
-    });
+    }
+}
 
-    const externalCoins = coins.map(coin => (
-        <a href={coin.url}>
-            <AsideRowCoin
-                coin={{
-                    img: coin.image,
-                    name: coin.coinName,
-                }}
-                icon={{
-                    type: ICONS.REDIRECT,
-                    color: colors.TEXT_SECONDARY,
-                }}
-            />
-        </a>
-    ));
-
-
-    return (
-        <AsideSection>
-            { walletCoins }
-            <AsideDivider
-                textLeft="Other coins"
-                textRight="(You will be redirected)"
-            />
-            { externalCoins }
-        </AsideSection>
-    );
+CoinSelection.propTypes = {
+    config: PropTypes.object,
+    wallet: PropTypes.object,
+    selectedDevice: PropTypes.object,
+    localStorage: PropTypes.object,
 };
 
 export default CoinSelection;

From f4117c1aef0b1694cffd208138b5ba43be393c66 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 13:14:13 +0200
Subject: [PATCH 058/103] Refactored /account folder to new folder structure

---
 .eslintrc                                     |   1 +
 src/js/components/common/Button.js            |  59 -----
 src/js/components/modal/index.js              |   2 +
 .../Account/components/Receive/Container.js   |  45 ++++
 .../views/Account/components/Receive/index.js | 101 +++++++++
 .../components/SelectedAccount/index.js       | 114 ++++++++++
 .../Account/components/Send/Container.js      |  47 ++++
 .../Send/components/AdvancedForm.js           | 191 ++++++++++++++++
 .../Send/components/CoinSelectOption.js       |  51 +++++
 .../components/Send/components/FeeSelect.js   |  61 ++++++
 .../Send/components/PendingTransactions.js    |  95 ++++++++
 .../views/Account/components/Send/index.js    | 205 ++++++++++++++++++
 .../views/Account/components/Sign/index.js    |  66 ++++++
 .../Account/components/Summary/Container.js   |  52 +++++
 .../Summary/components/Details/index.js       |  75 +++++++
 .../Summary/components/Tokens/index.js        |  54 +++++
 .../views/Account/components/Summary/index.js | 120 ++++++++++
 .../views/Account/components/Tabs/index.js    | 105 +++++++++
 src/js/views/Landing/Container.js             |   1 -
 .../views/Landing/components/InstallBridge.js |  12 +-
 20 files changed, 1391 insertions(+), 66 deletions(-)
 delete mode 100644 src/js/components/common/Button.js
 create mode 100644 src/js/views/Device/views/Account/components/Receive/Container.js
 create mode 100644 src/js/views/Device/views/Account/components/Receive/index.js
 create mode 100644 src/js/views/Device/views/Account/components/SelectedAccount/index.js
 create mode 100644 src/js/views/Device/views/Account/components/Send/Container.js
 create mode 100644 src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js
 create mode 100644 src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js
 create mode 100644 src/js/views/Device/views/Account/components/Send/components/FeeSelect.js
 create mode 100644 src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js
 create mode 100644 src/js/views/Device/views/Account/components/Send/index.js
 create mode 100644 src/js/views/Device/views/Account/components/Sign/index.js
 create mode 100644 src/js/views/Device/views/Account/components/Summary/Container.js
 create mode 100644 src/js/views/Device/views/Account/components/Summary/components/Details/index.js
 create mode 100644 src/js/views/Device/views/Account/components/Summary/components/Tokens/index.js
 create mode 100644 src/js/views/Device/views/Account/components/Summary/index.js
 create mode 100644 src/js/views/Device/views/Account/components/Tabs/index.js

diff --git a/.eslintrc b/.eslintrc
index 0c77d1ce..6bc0340c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,6 +10,7 @@
     },
     "rules": {
         "react/require-default-props": 0,
+        "react/forbid-prop-types": 0,
         "react/destructuring-assignment": 0,
         "react/jsx-one-expression-per-line": 0,
         "react/jsx-indent": [2, 4],
diff --git a/src/js/components/common/Button.js b/src/js/components/common/Button.js
deleted file mode 100644
index 6c96c199..00000000
--- a/src/js/components/common/Button.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import styled, { css } from 'styled-components';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import colors from 'config/colors';
-
-const Wrapper = styled.button`
-    padding: 12px 24px;
-    border-radius: 3px;
-    font-size: 14px;
-    font-weight: 300;
-    cursor: pointer;
-    background: ${colors.GREEN_PRIMARY};
-    color: ${colors.WHITE};
-    border: 0;
-
-    &:hover {
-        background: ${colors.GREEN_SECONDARY};
-    }
-
-    &:active {
-        background: ${colors.GREEN_TERTIARY};
-    }
-
-    ${props => props.disabled && css`
-        pointer-events: none;
-        color: ${colors.TEXT_SECONDARY};
-        background: ${colors.GRAY_LIGHT};
-    `}
-`;
-
-const Button = ({
-    text, onClick, disabled, blue, white,
-}) => (
-    <Wrapper
-        onClick={onClick}
-        disabled={disabled}
-        blue={blue}
-        white={white}
-    >{text}
-    </Wrapper>
-);
-
-Button.propTypes = {
-    onClick: PropTypes.func,
-    disabled: PropTypes.bool,
-    blue: PropTypes.bool,
-    white: PropTypes.bool,
-    text: PropTypes.string.isRequired,
-};
-
-Button.defaultProps = {
-    onClick: () => {},
-    disabled: false,
-    blue: false,
-    white: false,
-};
-
-export default Button;
diff --git a/src/js/components/modal/index.js b/src/js/components/modal/index.js
index f565e441..47984166 100644
--- a/src/js/components/modal/index.js
+++ b/src/js/components/modal/index.js
@@ -103,6 +103,8 @@ class Modal extends Component<Props> {
             case CONNECT.TRY_TO_DUPLICATE:
                 component = (<DuplicateDevice {...this.props} />);
                 break;
+
+            default: null;
         }
 
         let ch = null;
diff --git a/src/js/views/Device/views/Account/components/Receive/Container.js b/src/js/views/Device/views/Account/components/Receive/Container.js
new file mode 100644
index 00000000..6285193f
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Receive/Container.js
@@ -0,0 +1,45 @@
+/* @flow */
+
+
+import React, { Component, PropTypes } from 'react';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import { default as ReceiveActions } from 'actions/ReceiveActions';
+import * as TokenActions from 'actions/TokenActions';
+import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
+import Receive from './Receive';
+
+import type {
+    StateProps as BaseStateProps,
+    DispatchProps as BaseDispatchProps,
+} from '../SelectedAccount';
+
+type OwnProps = { }
+
+type StateProps = BaseStateProps & {
+    receive: $ElementType<State, 'receive'>,
+    modal: $ElementType<State, 'modal'>,
+}
+
+type DispatchProps = BaseDispatchProps & {
+    showAddress: typeof ReceiveActions.showAddress
+};
+
+export type Props = StateProps & BaseStateProps & DispatchProps & BaseDispatchProps;
+
+const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
+    className: 'receive',
+    selectedAccount: state.selectedAccount,
+    wallet: state.wallet,
+
+    receive: state.receive,
+    modal: state.modal,
+});
+
+const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
+    showAddress: bindActionCreators(ReceiveActions.showAddress, dispatch),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Receive);
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Receive/index.js b/src/js/views/Device/views/Account/components/Receive/index.js
new file mode 100644
index 00000000..4873496c
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Receive/index.js
@@ -0,0 +1,101 @@
+/* @flow */
+import React, { Component } from 'react';
+import styled from 'styled-components';
+import { H2 } from 'components/common/Heading';
+
+import Tooltip from 'rc-tooltip';
+import { QRCode } from 'react-qr-svg';
+
+import { Notification } from 'components/common/Notification';
+import SelectedAccount from '../SelectedAccount';
+
+import type { Props } from './index';
+
+const Wrapper = styled.div``;
+const StyledH2 = styled(H2)`
+    padding: 20px 48px;
+`;
+
+const Receive = (props: Props) => {
+    const device = props.wallet.selectedDevice;
+    const {
+        account,
+        network,
+        discovery,
+    } = props.selectedAccount;
+
+    if (!device || !account || !discovery) return null;
+
+    const {
+        addressVerified,
+        addressUnverified,
+    } = props.receive;
+
+    let qrCode = null;
+    let address = `${account.address.substring(0, 20)}...`;
+    let className = 'address hidden';
+    let button = (
+        <button disabled={device.connected && !discovery.completed} onClick={event => props.showAddress(account.addressPath)}>
+            <span>Show full address</span>
+        </button>
+    );
+
+    if (addressVerified || addressUnverified) {
+        qrCode = (
+            <QRCode
+                className="qr"
+                bgColor="#FFFFFF"
+                fgColor="#000000"
+                level="Q"
+                style={{ width: 256 }}
+                value={account.address}
+            />
+        );
+        address = account.address;
+        className = addressUnverified ? 'address unverified' : 'address';
+
+        const tooltip = addressUnverified
+            ? (<div>Unverified address.<br />{ device.connected && device.available ? 'Show on TREZOR' : 'Connect your TREZOR to verify it.' }</div>)
+            : (<div>{ device.connected ? 'Show on TREZOR' : 'Connect your TREZOR to verify address.' }</div>);
+
+        button = (
+            <Tooltip
+                arrowContent={<div className="rc-tooltip-arrow-inner" />}
+                overlay={tooltip}
+                placement="bottomRight"
+            >
+                <button className="white" onClick={event => props.showAddress(account.addressPath)}>
+                    <span />
+                </button>
+            </Tooltip>
+        );
+    }
+
+    let ver = null;
+    if (props.modal.opened && props.modal.windowType === 'ButtonRequest_Address') {
+        className = 'address verifying';
+        address = account.address;
+        ver = (<div className="confirm">Confirm address on TREZOR</div>);
+        button = (<div className="confirm">{ account.network } account #{ (account.index + 1) }</div>);
+    }
+
+    return (
+        <Wrapper>
+            <StyledH2>Receive Ethereum or tokens</StyledH2>
+            <div className={className}>
+                { ver }
+                <div className="value">
+                    { address }
+                </div>
+                { button }
+            </div>
+            { qrCode }
+        </Wrapper>
+    );
+};
+
+export default (props: Props) => (
+    <SelectedAccount {...props}>
+        <Receive {...props} />
+    </SelectedAccount>
+);
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/SelectedAccount/index.js b/src/js/views/Device/views/Account/components/SelectedAccount/index.js
new file mode 100644
index 00000000..1fdd6c92
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/SelectedAccount/index.js
@@ -0,0 +1,114 @@
+/* @flow */
+
+
+import * as React from 'react';
+import { Notification } from 'components/common/Notification';
+
+import type {
+    State, TrezorDevice, Action, ThunkAction,
+} from 'flowtype';
+import type { Account } from 'reducers/AccountsReducer';
+import type { Discovery } from 'reducers/DiscoveryReducer';
+
+export type StateProps = {
+    className: string;
+    selectedAccount: $ElementType<State, 'selectedAccount'>,
+    wallet: $ElementType<State, 'wallet'>,
+    children?: React.Node
+}
+
+export type DispatchProps = {
+
+}
+
+export type Props = StateProps & DispatchProps;
+
+const SelectedAccount = (props: Props) => {
+    const device = props.wallet.selectedDevice;
+    if (!device || !device.state) {
+        return (<section><Notification className="info" title="Loading device..." /></section>);
+    }
+
+    const accountState = props.selectedAccount;
+
+    const {
+        account,
+        discovery,
+    } = accountState;
+
+    // account not found (yet). checking why...
+    if (!account) {
+        if (!discovery || discovery.waitingForDevice) {
+            if (device.connected) {
+                // case 1: device is connected but discovery not started yet (probably waiting for auth)
+                if (device.available) {
+                    return (
+                        <section>
+                            <Notification className="info" title="Loading accounts..." />
+                        </section>
+                    );
+                }
+                // case 2: device is unavailable (created with different passphrase settings) account cannot be accessed
+                return (
+                    <section>
+                        <Notification
+                            className="info"
+                            title={`Device ${device.instanceLabel} is unavailable`}
+                            message="Change passphrase settings to use this device"
+                        />
+                    </section>
+                );
+            }
+            // case 3: device is disconnected
+            return (
+                <section>
+                    <Notification
+                        className="info"
+                        title={`Device ${device.instanceLabel} is disconnected`}
+                        message="Connect device to load accounts"
+                    />
+                </section>
+            );
+        } if (discovery.waitingForBackend) {
+            // case 4: backend is not working
+            return (
+                <section>
+                    <Notification className="warning" title="Backend not working" />
+                </section>
+            );
+        } if (discovery.completed) {
+            // case 5: account not found and discovery is completed
+            return (
+                <section>
+                    <Notification className="warning" title="Account does not exist" />
+                </section>
+            );
+        }
+        // case 6: discovery is not completed yet
+        return (
+            <section>
+                <Notification className="info" title="Loading accounts..." />
+            </section>
+        );
+    }
+
+    let notification: ?React$Element<typeof Notification> = null;
+    if (!device.connected) {
+        notification = <Notification className="info" title={`Device ${device.instanceLabel} is disconnected`} />;
+    } else if (!device.available) {
+        notification = <Notification className="info" title={`Device ${device.instanceLabel} is unavailable`} message="Change passphrase settings to use this device" />;
+    }
+
+    if (discovery && !discovery.completed && !notification) {
+        notification = <Notification className="info" title="Loading accounts..." />;
+    }
+
+    return (
+        <section className={props.className}>
+            { notification }
+            { props.children }
+        </section>
+    );
+};
+
+export default SelectedAccount;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/Container.js b/src/js/views/Device/views/Account/components/Send/Container.js
new file mode 100644
index 00000000..c37f2556
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Send/Container.js
@@ -0,0 +1,47 @@
+/* @flow */
+
+
+import * as React from 'react';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import { default as SendFormActions } from 'actions/SendFormActions';
+import * as SessionStorageActions from 'actions/SessionStorageActions';
+import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
+import SendForm from './SendForm';
+
+import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
+
+type OwnProps = { }
+
+export type StateProps = BaseStateProps & {
+    sendForm: $ElementType<State, 'sendForm'>,
+    fiat: $ElementType<State, 'fiat'>,
+    localStorage: $ElementType<State, 'localStorage'>,
+    children?: React.Node;
+}
+
+export type DispatchProps = BaseDispatchProps & {
+    sendFormActions: typeof SendFormActions,
+    saveSessionStorage: typeof SessionStorageActions.save
+}
+
+export type Props = StateProps & BaseStateProps & DispatchProps & BaseDispatchProps;
+
+const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
+    className: 'send-from',
+    selectedAccount: state.selectedAccount,
+    wallet: state.wallet,
+
+    sendForm: state.sendForm,
+    fiat: state.fiat,
+    localStorage: state.localStorage,
+});
+
+const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
+    sendFormActions: bindActionCreators(SendFormActions, dispatch),
+    saveSessionStorage: bindActionCreators(SessionStorageActions.save, dispatch),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(SendForm);
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js b/src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js
new file mode 100644
index 00000000..978f9268
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js
@@ -0,0 +1,191 @@
+/* @flow */
+
+
+import React from 'react';
+import Tooltip from 'rc-tooltip';
+import type { Props as BaseProps } from './index';
+
+type Props = {
+    selectedAccount: $ElementType<BaseProps, 'selectedAccount'>,
+    sendForm: $ElementType<BaseProps, 'sendForm'>,
+    sendFormActions: $ElementType<BaseProps, 'sendFormActions'>,
+    children?: $ElementType<BaseProps, 'children'>,
+};
+
+const AdvancedForm = (props: Props) => {
+    const {
+        account,
+        network,
+    } = props.selectedAccount;
+
+    const {
+        networkSymbol,
+        currency,
+        gasPrice,
+        gasLimit,
+        recommendedGasPrice,
+        calculatingGasLimit,
+        nonce,
+        data,
+        errors,
+        warnings,
+        infos,
+        advanced,
+    } = props.sendForm;
+
+    const {
+        toggleAdvanced,
+        onGasPriceChange,
+        onGasLimitChange,
+        onNonceChange,
+        onDataChange,
+    } = props.sendFormActions;
+
+    if (!advanced) {
+        return (
+            <div className="advanced-container">
+                <a className="advanced" onClick={toggleAdvanced}>Advanced settings</a>
+                { props.children }
+            </div>
+        );
+    }
+
+    const nonceTooltip = (
+        <div className="tooltip-wrapper">
+            TODO<br />
+        </div>
+    );
+
+    let gasLimitTooltipCurrency: string;
+    let gasLimitTooltipValue: string;
+    if (networkSymbol !== currency) {
+        gasLimitTooltipCurrency = 'tokens';
+        gasLimitTooltipValue = network.defaultGasLimitTokens;
+    } else {
+        gasLimitTooltipCurrency = networkSymbol;
+        gasLimitTooltipValue = network.defaultGasLimit;
+    }
+
+    const gasLimitTooltip = (
+        <div className="tooltip-wrapper">
+            Gas limit is the amount of gas to send with your transaction.<br />
+            <span>TX fee = gas price * gas limit</span> &amp; is paid to miners for including your TX in a block.<br />
+            Increasing this number will not get your TX mined faster.<br />
+            Default value for sending { gasLimitTooltipCurrency } is <span>{ gasLimitTooltipValue }</span>
+        </div>
+    );
+
+    const gasPriceTooltip = (
+        <div className="tooltip-wrapper">
+            Gas Price is the amount you pay per unit of gas.<br />
+            <span>TX fee = gas price * gas limit</span> &amp; is paid to miners for including your TX in a block.<br />
+            Higher the gas price = faster transaction, but more expensive. Recommended is <span>{ recommendedGasPrice } GWEI.</span><br />
+            <a className="green" href="https://myetherwallet.github.io/knowledge-base/gas/what-is-gas-ethereum.html" target="_blank" rel="noreferrer noopener">Read more</a>
+        </div>
+    );
+
+    const dataTooltip = (
+        <div className="tooltip-wrapper">
+            Data is usually used when you send transactions to contracts.
+        </div>
+    );
+
+
+    return (
+        <div className="advanced-container opened">
+            <a className="advanced" onClick={toggleAdvanced}>Advanced settings</a>
+            <div className="row gas-row">
+                {/* <div className="column nonce">
+                    <label>
+                        Nonce
+                        <Tooltip
+                            arrowContent={<div className="rc-tooltip-arrow-inner"></div>}
+                            overlay={ nonceTooltip }
+                            placement="top">
+                            <span className="what-is-it"></span>
+                        </Tooltip>
+                    </label>
+                    <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={ nonce }
+                        onChange={ event => onNonceChange(event.target.value) } />
+                    { errors.nonce ? (<span className="error">{ errors.nonce }</span>) : null }
+                    { warnings.nonce ? (<span className="warning">{ warnings.nonce }</span>) : null }
+                </div> */}
+                <div className="column">
+                    <label>
+                        Gas limit
+                        <Tooltip
+                            arrowContent={<div className="rc-tooltip-arrow-inner" />}
+                            overlay={gasLimitTooltip}
+                            placement="top"
+                        >
+                            <span className="what-is-it" />
+                        </Tooltip>
+                    </label>
+                    <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={gasLimit}
+                        disabled={networkSymbol === currency && data.length > 0}
+                        onChange={event => onGasLimitChange(event.target.value)}
+                    />
+                    { errors.gasLimit ? (<span className="error">{ errors.gasLimit }</span>) : null }
+                    { warnings.gasLimit ? (<span className="warning">{ warnings.gasLimit }</span>) : null }
+                    { calculatingGasLimit ? (<span className="info">Calculating...</span>) : null }
+                </div>
+                <div className="column">
+                    <label>
+                        Gas price
+                        <Tooltip
+                            arrowContent={<div className="rc-tooltip-arrow-inner" />}
+                            overlay={gasPriceTooltip}
+                            placement="top"
+                        >
+                            <span className="what-is-it" />
+                        </Tooltip>
+                    </label>
+                    <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={gasPrice}
+                        onChange={event => onGasPriceChange(event.target.value)}
+                    />
+                    { errors.gasPrice ? (<span className="error">{ errors.gasPrice }</span>) : null }
+                </div>
+            </div>
+
+            <div className="row">
+                <label>
+                    Data
+                    <Tooltip
+                        arrowContent={<div className="rc-tooltip-arrow-inner" />}
+                        overlay={dataTooltip}
+                        placement="top"
+                    >
+                        <span className="what-is-it" />
+                    </Tooltip>
+                </label>
+                <textarea disabled={networkSymbol !== currency} value={networkSymbol !== currency ? '' : data} onChange={event => onDataChange(event.target.value)} />
+                { errors.data ? (<span className="error">{ errors.data }</span>) : null }
+            </div>
+
+            <div className="row">
+                { props.children }
+            </div>
+
+        </div>
+    );
+};
+
+export default AdvancedForm;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js b/src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js
new file mode 100644
index 00000000..075688da
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js
@@ -0,0 +1,51 @@
+/* @flow */
+
+
+import * as React from 'react';
+
+type Props = {
+    children: React.Node,
+    className: string,
+    isDisabled: boolean,
+    isFocused: boolean,
+    isSelected: boolean,
+    onFocus: Function,
+    onSelect: Function,
+    option: any,
+}
+
+export default class CoinSelectOption extends React.Component<Props> {
+    constructor(props: Props) {
+        super(props);
+    }
+
+    handleMouseDown(event: MouseEvent) {
+        event.preventDefault();
+        event.stopPropagation();
+        this.props.onSelect(this.props.option, event);
+    }
+
+    handleMouseEnter(event: MouseEvent) {
+        this.props.onFocus(this.props.option, event);
+    }
+
+    handleMouseMove(event: MouseEvent) {
+        if (this.props.isFocused) return;
+        this.props.onFocus(this.props.option, event);
+    }
+
+    render() {
+        const css = `${this.props.className} ${this.props.option.value}`;
+        return (
+            <div
+                className={css}
+                onMouseDown={this.handleMouseDown.bind(this)}
+                onMouseEnter={this.handleMouseEnter.bind(this)}
+                onMouseMove={this.handleMouseMove.bind(this)}
+                title={this.props.option.label}
+            >
+                <span>{ this.props.children }</span>
+            </div>
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/components/FeeSelect.js b/src/js/views/Device/views/Account/components/Send/components/FeeSelect.js
new file mode 100644
index 00000000..2974970a
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Send/components/FeeSelect.js
@@ -0,0 +1,61 @@
+/* @flow */
+
+
+import * as React from 'react';
+import PropTypes from 'prop-types';
+
+
+export const FeeSelectValue = (props: any): any => (
+    <div>
+        <div className="Select-value fee-option">
+            <span className="fee-value">{ props.value.value }</span>
+            <span className="fee-label">{ props.value.label }</span>
+        </div>
+    </div>
+);
+
+type Props = {
+    children: React.Node,
+    className: string,
+    isDisabled: boolean,
+    isFocused: boolean,
+    isSelected: boolean,
+    onFocus: Function,
+    onSelect: Function,
+    option: any,
+}
+
+export class FeeSelectOption extends React.Component<Props> {
+    constructor(props: Props) {
+        super(props);
+    }
+
+    handleMouseDown(event: MouseEvent) {
+        event.preventDefault();
+        event.stopPropagation();
+        this.props.onSelect(this.props.option, event);
+    }
+
+    handleMouseEnter(event: MouseEvent) {
+        this.props.onFocus(this.props.option, event);
+    }
+
+    handleMouseMove(event: MouseEvent) {
+        if (this.props.isFocused) return;
+        this.props.onFocus(this.props.option, event);
+    }
+
+    render() {
+        return (
+            <div
+                className={this.props.className}
+                onMouseDown={this.handleMouseDown.bind(this)}
+                onMouseEnter={this.handleMouseEnter.bind(this)}
+                onMouseMove={this.handleMouseMove.bind(this)}
+            >
+                <span className="fee-value">{ this.props.option.value }</span>
+                <span className="fee-label">{ this.props.option.label }</span>
+            </div>
+        );
+    }
+}
diff --git a/src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js b/src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js
new file mode 100644
index 00000000..e7783bdd
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js
@@ -0,0 +1,95 @@
+/* @flow */
+
+
+import React from 'react';
+import ColorHash from 'color-hash';
+import { H2 } from 'components/common/Heading';
+import ScaleText from 'react-scale-text';
+
+import { findAccountTokens } from 'reducers/TokensReducer';
+
+import type { Coin } from 'reducers/LocalStorageReducer';
+import type { Token } from 'reducers/TokensReducer';
+import type { Props as BaseProps } from './index';
+
+type Props = {
+    pending: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'pending'>,
+    tokens: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'tokens'>,
+    network: Coin
+}
+
+type Style = {
+    +color: string,
+    +background: string,
+    +borderColor: string
+}
+
+const PendingTransactions = (props: Props) => {
+    const pending = props.pending.filter(tx => !tx.rejected);
+    if (pending.length < 1) return null;
+
+    const tokens: Array<Token> = props.tokens;
+
+    const bgColorFactory = new ColorHash({ lightness: 0.7 });
+    const textColorFactory = new ColorHash();
+
+    const pendingTxs: React$Element<string> = pending.map((tx, i) => {
+        let iconColor: Style;
+        let symbol: string;
+        let name: string;
+        const isSmartContractTx: boolean = tx.currency !== props.network.symbol;
+        if (isSmartContractTx) {
+            const token: ?Token = tokens.find(t => t.symbol === tx.currency);
+            if (!token) {
+                iconColor = {
+                    color: '#ffffff',
+                    background: '#000000',
+                    borderColor: '#000000',
+                };
+                symbol = 'Unknown';
+                name = 'Unknown';
+            } else {
+                const bgColor: string = bgColorFactory.hex(token.name);
+                iconColor = {
+                    color: textColorFactory.hex(token.name),
+                    background: bgColor,
+                    borderColor: bgColor,
+                };
+                symbol = token.symbol.toUpperCase();
+                name = token.name;
+            }
+        } else {
+            iconColor = {
+                color: textColorFactory.hex(tx.network),
+                background: bgColorFactory.hex(tx.network),
+                borderColor: bgColorFactory.hex(tx.network),
+            };
+            symbol = props.network.symbol;
+            name = props.network.name;
+        }
+
+        return (
+            <div key={i} className="tx">
+                <div className="icon" style={iconColor}>
+                    <div className="icon-inner">
+                        <ScaleText widthOnly><p>{ symbol }</p></ScaleText>
+                    </div>
+                </div>
+                <div className="name">
+                    <a href={`${props.network.explorer.tx}${tx.id}`} target="_blank" rel="noreferrer noopener">{ name }</a>
+                </div>
+                <div className="amount">{ isSmartContractTx ? tx.amount : tx.total } { symbol }</div>
+            </div>
+        );
+    });
+
+
+    return (
+        <div className="pending-transactions">
+            <H2>Pending transactions</H2>
+            { pendingTxs }
+        </div>
+    );
+};
+
+export default PendingTransactions;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/index.js b/src/js/views/Device/views/Account/components/Send/index.js
new file mode 100644
index 00000000..f2f028a4
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Send/index.js
@@ -0,0 +1,205 @@
+/* @flow */
+
+import React, { Component } from 'react';
+import styled from 'styled-components';
+import Select from 'react-select';
+import { H2 } from 'components/common/Heading';
+import { calculate, validation } from 'actions/SendFormActions';
+import type { Token } from 'flowtype';
+import AdvancedForm from './components/AdvancedForm';
+import PendingTransactions from './components/PendingTransactions';
+import { FeeSelectValue, FeeSelectOption } from './components/FeeSelect';
+import SelectedAccount from '../SelectedAccount';
+
+
+import type { Props } from './index';
+
+export default class SendContainer extends Component<Props> {
+    componentWillReceiveProps(newProps: Props) {
+        calculate(this.props, newProps);
+        validation(newProps);
+
+        this.props.saveSessionStorage();
+    }
+
+    render() {
+        return (
+            <SelectedAccount {...this.props}>
+                <Send {...this.props} />
+            </SelectedAccount>
+        );
+    }
+}
+
+const StyledH2 = styled(H2)`
+    padding: 20px 48px;
+`;
+
+const Send = (props: Props) => {
+    const device = props.wallet.selectedDevice;
+    const {
+        account,
+        network,
+        discovery,
+        tokens,
+    } = props.selectedAccount;
+
+    if (!device || !account || !discovery || !network) return null;
+
+    const {
+        address,
+        amount,
+        setMax,
+        networkSymbol,
+        currency,
+        feeLevels,
+        selectedFeeLevel,
+        gasPriceNeedsUpdate,
+        total,
+        errors,
+        warnings,
+        infos,
+        advanced,
+        data,
+        sending,
+    } = props.sendForm;
+
+    const {
+        onAddressChange,
+        onAmountChange,
+        onSetMax,
+        onCurrencyChange,
+        onFeeLevelChange,
+        updateFeeLevels,
+        onSend,
+    } = props.sendFormActions;
+
+    const fiatRate = props.fiat.find(f => f.network === network);
+
+    const tokensSelectData = tokens.map(t => ({ value: t.symbol, label: t.symbol }));
+    tokensSelectData.unshift({ value: network.symbol, label: network.symbol });
+
+    const setMaxClassName: string = setMax ? 'set-max enabled' : 'set-max';
+
+    let updateFeeLevelsButton = null;
+    if (gasPriceNeedsUpdate) {
+        updateFeeLevelsButton = (
+            <span className="update-fee-levels">Recommended fees updated. <a onClick={updateFeeLevels}>Click here to use them</a></span>
+        );
+    }
+
+    let addressClassName: ?string;
+    if (errors.address) {
+        addressClassName = 'not-valid';
+    } else if (warnings.address) {
+        addressClassName = 'warning';
+    } else if (address.length > 0) {
+        addressClassName = 'valid';
+    }
+
+    let buttonDisabled: boolean = Object.keys(errors).length > 0 || total === '0' || amount.length === 0 || address.length === 0 || sending;
+    let buttonLabel: string = 'Send';
+    if (networkSymbol !== currency && amount.length > 0 && !errors.amount) {
+        buttonLabel += ` ${amount} ${currency.toUpperCase()}`;
+    } else if (networkSymbol === currency && total !== '0') {
+        buttonLabel += ` ${total} ${network.symbol}`;
+    }
+
+    if (!device.connected) {
+        buttonLabel = 'Device is not connected';
+        buttonDisabled = true;
+    } else if (!device.available) {
+        buttonLabel = 'Device is unavailable';
+        buttonDisabled = true;
+    } else if (!discovery.completed) {
+        buttonLabel = 'Loading accounts';
+        buttonDisabled = true;
+    }
+
+    return (
+        <section className="send-form">
+            <StyledH2>Send Ethereum or tokens</StyledH2>
+            <div className="row address-input">
+                <label>Address</label>
+                <input
+                    type="text"
+                    autoComplete="off"
+                    autoCorrect="off"
+                    autoCapitalize="off"
+                    spellCheck="false"
+                    value={address}
+                    className={addressClassName}
+                    onChange={event => onAddressChange(event.target.value)}
+                />
+                <span className="input-icon" />
+                { errors.address ? (<span className="error">{ errors.address }</span>) : null }
+                { warnings.address ? (<span className="warning">{ warnings.address }</span>) : null }
+                { infos.address ? (<span className="info">{ infos.address }</span>) : null }
+            </div>
+
+            <div className="row">
+                <label>Amount</label>
+                <div className="amount-input">
+                    <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={amount}
+                        className={errors.amount ? 'not-valid' : null}
+                        onChange={event => onAmountChange(event.target.value)}
+                    />
+
+                    <a className={setMaxClassName} onClick={onSetMax}>Set max</a>
+
+                    <Select
+                        name="currency"
+                        className="currency"
+                        searchable={false}
+                        clearable={false}
+                        multi={false}
+                        value={currency}
+                        disabled={tokensSelectData.length < 2}
+                        onChange={onCurrencyChange}
+                        options={tokensSelectData}
+                    />
+                </div>
+                { errors.amount ? (<span className="error">{ errors.amount }</span>) : null }
+                { warnings.amount ? (<span className="warning">{ warnings.amount }</span>) : null }
+            </div>
+
+            <div className="row">
+                <label>Fee{ updateFeeLevelsButton }</label>
+                <Select
+                    name="fee"
+                    className="fee"
+                    searchable={false}
+                    clearable={false}
+                    value={selectedFeeLevel}
+                    onChange={onFeeLevelChange}
+                    valueComponent={FeeSelectValue}
+                    optionComponent={FeeSelectOption}
+                    disabled={networkSymbol === currency && data.length > 0}
+                    optionClassName="fee-option"
+                    options={feeLevels}
+                />
+            </div>
+
+            <AdvancedForm
+                selectedAccount={props.selectedAccount}
+                sendForm={props.sendForm}
+                sendFormActions={props.sendFormActions}
+            >
+                <button disabled={buttonDisabled} onClick={event => onSend()}>{ buttonLabel }</button>
+            </AdvancedForm>
+
+            <PendingTransactions
+                pending={props.selectedAccount.pending}
+                tokens={props.selectedAccount.tokens}
+                network={network}
+            />
+
+        </section>
+    );
+};
diff --git a/src/js/views/Device/views/Account/components/Sign/index.js b/src/js/views/Device/views/Account/components/Sign/index.js
new file mode 100644
index 00000000..566cfa69
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Sign/index.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import { H2 } from 'components/common/Heading';
+import colors from 'config/colors';
+
+const Wrapper = styled.div`
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    background: ${colors.WHITE};
+    padding: 50px;
+`;
+
+const StyledH2 = styled(H2)`
+    padding-bottom: 10px;
+`;
+
+const Column = styled.div`
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+`;
+
+const Sign = styled(Column)``;
+
+const Verify = styled(Column)`
+    padding-left: 20px;
+`;
+
+const Label = styled.div`
+    color: ${colors.LABEL};
+    padding: 5px 0px;
+`;
+
+const Textarea = styled.textarea`
+    resize: vertical;
+    width: 100%;
+`;
+
+const Input = styled.input``;
+
+const SignVerify = () => (
+    <Wrapper>
+        <Sign>
+            <StyledH2>Sign message</StyledH2>
+            <Label>Message</Label>
+            <Textarea rows="4" maxLength="255" />
+            <Label>Address</Label>
+            <Input type="text" />
+            <Label>Signature</Label>
+            <Textarea rows="4" maxLength="255" readOnly="readonly" />
+        </Sign>
+        <Verify>
+            <StyledH2>Verify message</StyledH2>
+            <Label>Message</Label>
+            <Textarea rows="4" maxLength="255" />
+            <Label>Address</Label>
+            <Input type="text" />
+            <Label>Signature</Label>
+            <Textarea rows="4" maxLength="255" />
+        </Verify>
+    </Wrapper>
+);
+
+export default SignVerify;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Summary/Container.js b/src/js/views/Device/views/Account/components/Summary/Container.js
new file mode 100644
index 00000000..d0e83030
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Summary/Container.js
@@ -0,0 +1,52 @@
+/* @flow */
+
+
+import React, { Component, PropTypes } from 'react';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import * as SummaryActions from 'actions/SummaryActions';
+import * as TokenActions from 'actions/TokenActions';
+
+import type { State, Dispatch } from 'flowtype';
+import Summary from './index';
+import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
+
+type OwnProps = { }
+
+type StateProps = BaseStateProps & {
+    tokens: $ElementType<State, 'tokens'>,
+    summary: $ElementType<State, 'summary'>,
+    fiat: $ElementType<State, 'fiat'>,
+    localStorage: $ElementType<State, 'localStorage'>,
+};
+
+type DispatchProps = BaseDispatchProps & {
+    onDetailsToggle: typeof SummaryActions.onDetailsToggle,
+    addToken: typeof TokenActions.add,
+    loadTokens: typeof TokenActions.load,
+    removeToken: typeof TokenActions.remove,
+}
+
+export type Props = StateProps & BaseStateProps & DispatchProps & BaseDispatchProps;
+
+const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
+    className: 'summary',
+    selectedAccount: state.selectedAccount,
+    wallet: state.wallet,
+
+    tokens: state.tokens,
+    summary: state.summary,
+    fiat: state.fiat,
+    localStorage: state.localStorage,
+});
+
+const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
+    onDetailsToggle: bindActionCreators(SummaryActions.onDetailsToggle, dispatch),
+    addToken: bindActionCreators(TokenActions.add, dispatch),
+    loadTokens: bindActionCreators(TokenActions.load, dispatch),
+    removeToken: bindActionCreators(TokenActions.remove, dispatch),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Summary);
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Summary/components/Details/index.js b/src/js/views/Device/views/Account/components/Summary/components/Details/index.js
new file mode 100644
index 00000000..77a7d9db
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Summary/components/Details/index.js
@@ -0,0 +1,75 @@
+/* @flow */
+
+
+import React from 'react';
+import BigNumber from 'bignumber.js';
+
+import type { Coin } from 'reducers/LocalStorageReducer';
+import type { Props as BaseProps } from './index';
+
+type Props = {
+    // coin: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'coin'>,
+    coin: Coin,
+    summary: $ElementType<BaseProps, 'summary'>,
+    balance: string,
+    network: string,
+    fiat: $ElementType<BaseProps, 'fiat'>,
+    onToggle: $ElementType<BaseProps, 'onDetailsToggle'>
+}
+
+const SummaryDetails = (props: Props): ?React$Element<string> => {
+    if (!props.summary.details) {
+        return (
+            <div className="summary-details">
+                <div className="toggle" onClick={props.onToggle} />
+            </div>
+        );
+    }
+
+    const selectedCoin = props.coin;
+    const fiatRate = props.fiat.find(f => f.network === selectedCoin.network);
+
+    let balanceColumn = null;
+    let rateColumn = null;
+
+    if (fiatRate) {
+        const accountBalance = new BigNumber(props.balance);
+        const fiatValue = new BigNumber(fiatRate.value);
+        const fiat = accountBalance.times(fiatValue).toFixed(2);
+
+        balanceColumn = (
+            <div className="column">
+                <div className="label">Balance</div>
+                <div className="fiat-value">${ fiat }</div>
+                <div className="value">{ props.balance } { selectedCoin.symbol }</div>
+            </div>
+        );
+
+        rateColumn = (
+            <div className="column">
+                <div className="label">Rate</div>
+                <div className="fiat-value">${ fiatValue.toFixed(2) }</div>
+                <div className="value">1.00 { selectedCoin.symbol }</div>
+            </div>
+        );
+    } else {
+        balanceColumn = (
+            <div className="column">
+                <div className="label">Balance</div>
+                <div className="fiat-value">{ props.balance } { selectedCoin.symbol }</div>
+            </div>
+        );
+    }
+
+    return (
+        <div className="summary-details opened">
+            <div className="toggle" onClick={props.onToggle} />
+            <div className="content">
+                { balanceColumn }
+                { rateColumn }
+            </div>
+        </div>
+    );
+};
+
+export default SummaryDetails;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Summary/components/Tokens/index.js b/src/js/views/Device/views/Account/components/Summary/components/Tokens/index.js
new file mode 100644
index 00000000..c6dc05c6
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Summary/components/Tokens/index.js
@@ -0,0 +1,54 @@
+/* @flow */
+
+
+import React from 'react';
+import ColorHash from 'color-hash';
+import ScaleText from 'react-scale-text';
+import * as stateUtils from 'reducers/utils';
+import BigNumber from 'bignumber.js';
+
+import type { Props as BaseProps } from './index';
+
+type Props = {
+    pending: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'pending'>,
+    tokens: $ElementType<BaseProps, 'tokens'>,
+    removeToken: $ElementType<BaseProps, 'removeToken'>
+}
+
+const SummaryTokens = (props: Props) => {
+    if (!props.tokens || props.tokens.length < 1) return null;
+
+    const bgColor = new ColorHash({ lightness: 0.7 });
+    const textColor = new ColorHash();
+
+    const tokens = props.tokens.map((token, index) => {
+        const iconColor = {
+            color: textColor.hex(token.name),
+            background: bgColor.hex(token.name),
+            borderColor: bgColor.hex(token.name),
+        };
+
+        const pendingAmount: BigNumber = stateUtils.getPendingAmount(props.pending, token.symbol, true);
+        const balance: string = new BigNumber(token.balance).minus(pendingAmount).toString(10);
+        return (
+            <div key={index} className="token">
+                <div className="icon" style={iconColor}>
+                    <div className="icon-inner">
+                        <ScaleText widthOnly><p>{ token.symbol }</p></ScaleText>
+                    </div>
+                </div>
+                <div className="name">{ token.name }</div>
+                <div className="balance">{ balance } { token.symbol }</div>
+                <button className="transparent" onClick={event => props.removeToken(token)} />
+            </div>
+        );
+    });
+
+    return (
+        <div>
+            { tokens }
+        </div>
+    );
+};
+
+export default SummaryTokens;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Summary/index.js b/src/js/views/Device/views/Account/components/Summary/index.js
new file mode 100644
index 00000000..4ce20314
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Summary/index.js
@@ -0,0 +1,120 @@
+/* @flow */
+import styled from 'styled-components';
+import React, { Component } from 'react';
+import { H2 } from 'components/common/Heading';
+import BigNumber from 'bignumber.js';
+import { Async as AsyncSelect } from 'react-select';
+import Tooltip from 'rc-tooltip';
+
+import { resolveAfter } from 'utils/promiseUtils';
+import { Notification } from 'components/common/Notification';
+import * as stateUtils from 'reducers/utils';
+import type { NetworkToken } from 'reducers/LocalStorageReducer';
+import SelectedAccount from '../SelectedAccount';
+import SummaryDetails from './components/Details';
+import SummaryTokens from './components/Tokens';
+
+import type { Props } from './index';
+
+const StyledH2 = styled(H2)`
+    padding: 20px 48px;
+`;
+
+const Summary = (props: Props) => {
+    const device = props.wallet.selectedDevice;
+    const {
+        account,
+        network,
+        tokens,
+        pending,
+    } = props.selectedAccount;
+
+    // flow
+    if (!device || !account || !network) return null;
+
+    const tokensTooltip = (
+        <div className="tooltip-wrapper">
+            Insert token name, symbol or address to be able to send it.
+        </div>
+    );
+    const explorerLink: string = `${network.explorer.address}${account.address}`;
+
+    const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);
+    const balance: string = new BigNumber(account.balance).minus(pendingAmount).toString(10);
+
+    return (
+        <div>
+            <StyledH2 className={`summary-header ${account.network}`}>
+                Account #{ parseInt(account.index) + 1 }
+                <a href={explorerLink} className="gray" target="_blank" rel="noreferrer noopener">See full transaction history</a>
+            </StyledH2>
+
+            <SummaryDetails
+                coin={network}
+                summary={props.summary}
+                balance={balance}
+                network={network.network}
+                fiat={props.fiat}
+                localStorage={props.localStorage}
+                onToggle={props.onDetailsToggle}
+            />
+
+            <StyledH2>
+                Tokens
+                <Tooltip
+                    arrowContent={<div className="rc-tooltip-arrow-inner" />}
+                    overlay={tokensTooltip}
+                    placement="top"
+                >
+                    <span className="what-is-it" />
+                </Tooltip>
+            </StyledH2>
+            {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 Lahod */}
+            {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 T01 */}
+            <div className="filter">
+                <AsyncSelect
+                    className="token-select"
+                    multi={false}
+                    autoload={false}
+                    ignoreCase
+                    backspaceRemoves
+                    value={null}
+                    onChange={token => props.addToken(token, account)}
+                    loadOptions={input => props.loadTokens(input, account.network)}
+                    filterOptions={
+                        (options: Array<NetworkToken>, search: string, values: Array<NetworkToken>) => options.map((o) => {
+                            const added = tokens.find(t => t.symbol === o.symbol);
+                            if (added) {
+                                return {
+                                    ...o,
+                                    name: `${o.name} (Already added)`,
+                                    disabled: true,
+                                };
+                            }
+                            return o;
+                        })
+                    }
+                    valueKey="symbol"
+                    labelKey="name"
+                    placeholder="Search for token"
+                    searchPromptText="Type token name or address"
+                    noResultsText="Token not found"
+                />
+
+            </div>
+
+            <SummaryTokens
+                pending={pending}
+                tokens={tokens}
+                removeToken={props.removeToken}
+            />
+
+        </div>
+    );
+};
+
+export default (props: Props) => (
+    <SelectedAccount {...props}>
+        <Summary {...props} />
+    </SelectedAccount>
+);
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Tabs/index.js b/src/js/views/Device/views/Account/components/Tabs/index.js
new file mode 100644
index 00000000..f8b85375
--- /dev/null
+++ b/src/js/views/Device/views/Account/components/Tabs/index.js
@@ -0,0 +1,105 @@
+/* @flow */
+
+
+import React, { Component } from 'react';
+import { NavLink } from 'react-router-dom';
+
+
+type Props = {
+    pathname: string;
+}
+type State = {
+    style: {
+        width: number,
+        left: number
+    };
+}
+
+class Indicator extends Component<Props, State> {
+    reposition: () => void;
+
+    state: State;
+
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {
+            style: {
+                width: 0,
+                left: 0,
+            },
+        };
+
+        this.reposition = this.reposition.bind(this);
+    }
+
+    handleResize() {
+        this.reposition();
+    }
+
+    componentDidMount() {
+        this.reposition();
+        window.addEventListener('resize', this.reposition, false);
+    }
+
+    componentWillUnmount() {
+        window.removeEventListener('resize', this.reposition, false);
+    }
+
+    componentDidUpdate(newProps: Props) {
+        this.reposition();
+    }
+
+    reposition() {
+        const tabs = document.querySelector('.account-tabs');
+        if (!tabs) return;
+        const active = tabs.querySelector('.active');
+        if (!active) return;
+        const bounds = active.getBoundingClientRect();
+
+        const left = bounds.left - tabs.getBoundingClientRect().left;
+
+        if (this.state.style.left !== left) {
+            this.setState({
+                style: {
+                    width: bounds.width,
+                    left,
+                },
+            });
+        }
+    }
+
+    render() {
+        return (
+            <div className="indicator" style={this.state.style}>{ this.props.pathname }</div>
+        );
+    }
+}
+
+const AccountTabs = (props: any) => {
+    const urlParams = props.match.params;
+    const basePath = `/device/${urlParams.device}/network/${urlParams.network}/account/${urlParams.account}`;
+
+    return (
+        <div className="account-tabs">
+            {/* <NavLink to={ `${basePath}` }>
+                History
+            </NavLink> */}
+            <NavLink exact to={`${basePath}`}>
+                Summary
+            </NavLink>
+            <NavLink to={`${basePath}/send`}>
+                Send
+            </NavLink>
+            <NavLink to={`${basePath}/receive`}>
+                Receive
+            </NavLink>
+            {/* <NavLink to={ `${basePath}/signverify` }>
+                Sign &amp; Verify
+            </NavLink> */}
+            <Indicator pathname={props.match.pathname} />
+        </div>
+    );
+};
+
+export default AccountTabs;
\ No newline at end of file
diff --git a/src/js/views/Landing/Container.js b/src/js/views/Landing/Container.js
index e1cc0226..90b22630 100644
--- a/src/js/views/Landing/Container.js
+++ b/src/js/views/Landing/Container.js
@@ -36,7 +36,6 @@ const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: St
     wallet: state.wallet,
     connect: state.connect,
     router: state.router,
-    wallet: state.wallet,
     devices: state.devices,
 });
 
diff --git a/src/js/views/Landing/components/InstallBridge.js b/src/js/views/Landing/components/InstallBridge.js
index 57171754..0799d407 100644
--- a/src/js/views/Landing/components/InstallBridge.js
+++ b/src/js/views/Landing/components/InstallBridge.js
@@ -37,12 +37,6 @@ export default class InstallBridge extends Component<Props, State> {
         };
     }
 
-    onChange(value: InstallTarget) {
-        this.setState({
-            target: value,
-        });
-    }
-
     componentWillUpdate() {
         if (this.props.browserState.osname && !this.state.target) {
             const currentTarget: ?InstallTarget = installers.find(i => i.id === this.props.browserState.osname);
@@ -52,6 +46,12 @@ export default class InstallBridge extends Component<Props, State> {
         }
     }
 
+    onChange(value: InstallTarget) {
+        this.setState({
+            target: value,
+        });
+    }
+
     render() {
         if (!this.state.target) {
             return <Preloader />;

From 98bb95722b0733a1089581a79349e534cd737761 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 14:04:17 +0200
Subject: [PATCH 059/103] Added redirect icon

---
 src/js/constants/icons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/constants/icons.js b/src/js/constants/icons.js
index 02df2b2c..7f45c659 100644
--- a/src/js/constants/icons.js
+++ b/src/js/constants/icons.js
@@ -1,4 +1,4 @@
 export default {
-    REDIRECT: 'M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z',
+    REDIRECT: 'M16 8c-4.418 0-8 3.583-8 8 0 4.419 3.582 8 8 8s8-3.581 8-8c0-4.417-3.582-8-8-8zM16.533 19.733v-2.133c-3.2-1.067-4.267 0-5.333 2.133 0-5.333 3.2-6.4 5.333-6.4v-2.133l4.267 4.267-4.267 4.266z',
     WARNING: 'M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z',
 };
\ No newline at end of file

From 5dac7f043c8217939bc71b2ea1f47a684222a214 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 14:04:40 +0200
Subject: [PATCH 060/103] put back button

---
 src/js/components/common/Button.js | 56 ++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 src/js/components/common/Button.js

diff --git a/src/js/components/common/Button.js b/src/js/components/common/Button.js
new file mode 100644
index 00000000..6a2db3d1
--- /dev/null
+++ b/src/js/components/common/Button.js
@@ -0,0 +1,56 @@
+import styled, { css } from 'styled-components';
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import colors from 'config/colors';
+
+const Wrapper = styled.button`
+    padding: 12px 24px;
+    border-radius: 3px;
+    font-size: 14px;
+    font-weight: 300;
+    cursor: pointer;
+    background: ${colors.GREEN_PRIMARY};
+    color: ${colors.WHITE};
+    border: 0;
+    &:hover {
+        background: ${colors.GREEN_SECONDARY};
+    }
+    &:active {
+        background: ${colors.GREEN_TERTIARY};
+    }
+    ${props => props.disabled && css`
+        pointer-events: none;
+        color: ${colors.TEXT_SECONDARY};
+        background: ${colors.GRAY_LIGHT};
+    `}
+`;
+
+const Button = ({
+    text, onClick, disabled, blue, white,
+}) => (
+    <Wrapper
+        onClick={onClick}
+        disabled={disabled}
+        blue={blue}
+        white={white}
+    >{text}
+    </Wrapper>
+);
+
+Button.propTypes = {
+    onClick: PropTypes.func,
+    disabled: PropTypes.bool,
+    blue: PropTypes.bool,
+    white: PropTypes.bool,
+    text: PropTypes.string.isRequired,
+};
+
+Button.defaultProps = {
+    onClick: () => {},
+    disabled: false,
+    blue: false,
+    white: false,
+};
+
+export default Button;
\ No newline at end of file

From 71d8712575a75f4353bdb2ee00cca3e8013ae881 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 14:56:35 +0200
Subject: [PATCH 061/103] Refactored /wallet/aside folder to new folder
 structure

---
 src/js/components/wallet/aside/Aside.js       |  77 ------------
 .../components/wallet/aside/AsideSection.js   |  16 ---
 .../aside/row/account/AsideRowAccount.js      |  63 ----------
 .../wallet/aside/row/coin/AsideRowCoin.js     |  49 --------
 .../wallet/aside/row/coin/CoinName.js         |  39 ------
 src/js/components/wallet/index.js             |   5 +-
 src/js/views/Device/Container.js              |   0
 .../components/LeftNavigation/Container.js}   |  15 +--
 .../components/LeftNavigation/Divider.js}     |   6 +-
 .../LeftNavigation/LeftNavigation.js          | 112 ++++++++++++++++++
 .../Device/components/LeftNavigation/Row.js}  |   8 +-
 .../LeftNavigation}/StickyContainer.js        |   2 +-
 .../components/LeftNavigation}/common.js      |   0
 .../selection}/AccountSelection.js            |  84 ++++++++++---
 .../selection}/CoinSelection.js               |  87 +++++++++++++-
 .../selection}/DeviceSelection.js             |  30 +++--
 src/js/views/Landing/index.js                 |   2 +-
 17 files changed, 294 insertions(+), 301 deletions(-)
 delete mode 100644 src/js/components/wallet/aside/Aside.js
 delete mode 100644 src/js/components/wallet/aside/AsideSection.js
 delete mode 100644 src/js/components/wallet/aside/row/account/AsideRowAccount.js
 delete mode 100644 src/js/components/wallet/aside/row/coin/AsideRowCoin.js
 delete mode 100644 src/js/components/wallet/aside/row/coin/CoinName.js
 create mode 100644 src/js/views/Device/Container.js
 rename src/js/{components/wallet/aside/index.js => views/Device/components/LeftNavigation/Container.js} (90%)
 rename src/js/{components/wallet/aside/AsideDivider.js => views/Device/components/LeftNavigation/Divider.js} (86%)
 create mode 100644 src/js/views/Device/components/LeftNavigation/LeftNavigation.js
 rename src/js/{components/wallet/aside/row/AsideRow.js => views/Device/components/LeftNavigation/Row.js} (88%)
 rename src/js/{components/wallet/aside => views/Device/components/LeftNavigation}/StickyContainer.js (99%)
 rename src/js/{components/wallet/aside => views/Device/components/LeftNavigation}/common.js (100%)
 rename src/js/{components/wallet/aside => views/Device/components/LeftNavigation/selection}/AccountSelection.js (72%)
 rename src/js/{components/wallet/aside => views/Device/components/LeftNavigation/selection}/CoinSelection.js (59%)
 rename src/js/{components/wallet/aside => views/Device/components/LeftNavigation/selection}/DeviceSelection.js (89%)

diff --git a/src/js/components/wallet/aside/Aside.js b/src/js/components/wallet/aside/Aside.js
deleted file mode 100644
index 558f4714..00000000
--- a/src/js/components/wallet/aside/Aside.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/* @flow */
-
-
-//import React, { Node } from 'react';
-import * as React from 'react';
-import { Link, NavLink } from 'react-router-dom';
-import { TransitionGroup, CSSTransition } from 'react-transition-group';
-
-import type { TrezorDevice } from 'flowtype';
-import { DeviceSelect, DeviceDropdown } from './DeviceSelection';
-import AccountSelection from './AccountSelection';
-import CoinSelection from './CoinSelection';
-import StickyContainer from './StickyContainer';
-
-import type { Props } from './index';
-
-
-type TransitionMenuProps = {
-    animationType: string;
-    children?: React.Node;
-}
-
-const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGroup> => (
-    <TransitionGroup component="div" className="transition-container">
-        <CSSTransition
-            key={props.animationType}
-            onExit={() => { window.dispatchEvent(new Event('resize')); }}
-            onExited={() => window.dispatchEvent(new Event('resize'))}
-            in
-            out
-            classNames={props.animationType}
-            appear={false}
-            timeout={300}
-        >
-            { props.children }
-        </CSSTransition>
-    </TransitionGroup>
-);
-
-const Aside = (props: Props): React$Element<typeof StickyContainer | string> => {
-    const selected: ?TrezorDevice = props.wallet.selectedDevice;
-    const { location } = props.router;
-
-    if (location.pathname === '/' || !selected) return (<aside />);
-
-    let menu = <section />;
-
-    if (props.deviceDropdownOpened) {
-        menu = <DeviceDropdown {...props} />;
-    } else if (location.state.network) {
-        menu = (
-            <TransitionMenu animationType="slide-left">
-                <AccountSelection {...props} />
-            </TransitionMenu>
-        );
-    } else if (selected.features && !selected.features.bootloader_mode && selected.features.initialized) {
-        menu = (
-            <TransitionMenu animationType="slide-right">
-                <CoinSelection {...props} />
-            </TransitionMenu>
-        );
-    }
-
-    return (
-        <StickyContainer location={location.pathname} deviceSelection={props.deviceDropdownOpened}>
-            <DeviceSelect {...props} />
-            { menu }
-            <div className="sticky-bottom">
-                <div className="help">
-                    <a href="https://trezor.io/support/" target="_blank" rel="noreferrer noopener">Need help?</a>
-                </div>
-            </div>
-        </StickyContainer>
-    );
-};
-
-export default Aside;
diff --git a/src/js/components/wallet/aside/AsideSection.js b/src/js/components/wallet/aside/AsideSection.js
deleted file mode 100644
index 518ed77b..00000000
--- a/src/js/components/wallet/aside/AsideSection.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import styled from 'styled-components';
-import React from 'react';
-
-const Section = styled.section`
-    width: 320px;
-    display: inline-block;
-    vertical-align: top;
-`;
-
-const AsideSection = (props) => (
-    <Section>
-        {props.children}
-    </Section>
-);
-
-export default AsideSection;
diff --git a/src/js/components/wallet/aside/row/account/AsideRowAccount.js b/src/js/components/wallet/aside/row/account/AsideRowAccount.js
deleted file mode 100644
index 510242fb..00000000
--- a/src/js/components/wallet/aside/row/account/AsideRowAccount.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import colors from 'config/colors';
-import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
-import { NavLink } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import React from 'react';
-import styled, { css } from 'styled-components';
-
-import AsideRow from '../AsideRow';
-
-const Wrapper = styled.div`
-    height: 64px;
-
-    font-size: ${FONT_SIZE.SMALL};
-    color: ${colors.TEXT_PRIMARY};
-
-    border-top: 1px solid ${colors.DIVIDER};
-    span {
-        font-size: ${FONT_SIZE.SMALLER};
-        color: ${colors.TEXT_SECONDARY};
-    }
-
-    ${props => props.isSelected && css`
-        border-left: ${BORDER_WIDTH.SELECTED} solid ${colors.GREEN_PRIMARY};
-        background: ${colors.WHITE};
-
-        &:hover {
-            background-color: ${colors.WHITE};
-        }
-
-        &:last-child {
-            border-bottom: 1px solid ${colors.DIVIDER};
-        }
-    `}
-`;
-
-const AsideRowAccount = ({
-    accountIndex, balance, url, isSelected = false,
-}) => (
-    <NavLink to={url}>
-        <Wrapper
-            to={url}
-            isSelected={isSelected}
-        >
-            <AsideRow column>
-                Account #{accountIndex + 1}
-                {balance ? (
-                    <span>{balance}</span>
-                ) : (
-                    <span>Loading...</span>
-                )}
-            </AsideRow>
-        </Wrapper>
-    </NavLink>
-);
-
-AsideRowAccount.propTypes = {
-    accountIndex: PropTypes.number.isRequired,
-    url: PropTypes.string.isRequired,
-    balance: PropTypes.string,
-    isSelected: PropTypes.bool,
-};
-
-export default AsideRowAccount;
diff --git a/src/js/components/wallet/aside/row/coin/AsideRowCoin.js b/src/js/components/wallet/aside/row/coin/AsideRowCoin.js
deleted file mode 100644
index ee7f5a3f..00000000
--- a/src/js/components/wallet/aside/row/coin/AsideRowCoin.js
+++ /dev/null
@@ -1,49 +0,0 @@
-
-import colors from 'config/colors';
-import { FONT_SIZE } from 'config/variables';
-import Icon from 'components/common/Icon';
-import PropTypes from 'prop-types';
-import React from 'react';
-import styled from 'styled-components';
-
-import AsideRow from '../AsideRow';
-import CoinName from './CoinName';
-import { coinProp } from '../../common';
-
-const Wrapper = styled.div`
-    display: block;
-    height: 50px;
-
-    font-size: ${FONT_SIZE.BASE};
-    color: ${colors.TEXT_PRIMARY};
-    &:hover {
-        background-color: ${colors.GRAY_LIGHT};
-    }
-`;
-
-const AsideRowCoin = ({ coin, icon }) => (
-    <Wrapper>
-        <AsideRow>
-            <CoinName
-                coinImg={coin.img}
-                text={coin.name}
-            />
-            {icon && (
-                <Icon
-                    icon={icon.type}
-                    color={icon.color}
-                />
-            )}
-        </AsideRow>
-    </Wrapper>
-);
-
-AsideRowCoin.propTypes = {
-    ...coinProp,
-    icon: PropTypes.shape({
-        type: PropTypes.string.isRequired,
-        color: PropTypes.string.isRequired,
-    }),
-};
-
-export default AsideRowCoin;
diff --git a/src/js/components/wallet/aside/row/coin/CoinName.js b/src/js/components/wallet/aside/row/coin/CoinName.js
deleted file mode 100644
index 48321f58..00000000
--- a/src/js/components/wallet/aside/row/coin/CoinName.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import styled from 'styled-components';
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import colors from 'config/colors';
-import { ICON_SIZE } from 'config/variables';
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-`;
-
-const Logo = styled.div`
-    height: ${ICON_SIZE.BASE};
-    width: ${ICON_SIZE.BASE};
-    margin-right: 10px;
-
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: auto ${ICON_SIZE.BASE};
-    background-image: url('${props => props.coinImg}');
-`;
-
-const CoinName = ({ coinImg, text }) => (
-    <Wrapper>
-        <Logo
-            coinImg={coinImg}
-        />
-        <p>{text}</p>
-    </Wrapper>
-);
-
-CoinName.propTypes = {
-    coinImg: PropTypes.string.isRequired,
-    text: PropTypes.string.isRequired,
-};
-
-export default CoinName
diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js
index 49a34a79..93a7c73c 100644
--- a/src/js/components/wallet/index.js
+++ b/src/js/components/wallet/index.js
@@ -10,7 +10,8 @@ import Header from '../common/Header';
 import Footer from '../common/Footer';
 import AccountTabs from './account/AccountTabs';
 import DeviceSettingsTabs from './pages/DeviceSettingsTabs';
-import AsideContainer from './aside';
+// import AsideContainer from './aside';
+import LeftNavigation from 'views/Device/components/LeftNavigation/Container';
 import ModalContainer from '../modal';
 import Notifications from '../common/Notification';
 import Log from '../common/Log';
@@ -29,7 +30,7 @@ const Wallet = (props: WalletContainerProps) => (
         <Header />
         {/* <div>{ props.wallet.online ? "ONLINE" : "OFFLINE" }</div> */}
         <main>
-            <AsideContainer />
+            <LeftNavigation />
             <article>
                 <nav>
                     <Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
diff --git a/src/js/views/Device/Container.js b/src/js/views/Device/Container.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/js/components/wallet/aside/index.js b/src/js/views/Device/components/LeftNavigation/Container.js
similarity index 90%
rename from src/js/components/wallet/aside/index.js
rename to src/js/views/Device/components/LeftNavigation/Container.js
index 07491fed..6c2ed692 100644
--- a/src/js/components/wallet/aside/index.js
+++ b/src/js/views/Device/components/LeftNavigation/Container.js
@@ -1,18 +1,14 @@
 /* @flow */
-
-
-import React, { Component, PropTypes } from 'react';
+import { toggleDeviceDropdown } from 'actions/WalletActions';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
-import { toggleDeviceDropdown } from 'actions/WalletActions';
-
-
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
-import Aside from './Aside';
+
+import LeftNavigation from './LeftNavigation';
 
 type OwnProps = {
 
@@ -41,8 +37,6 @@ type DispatchProps = {
     onSelectDevice: typeof TrezorConnectActions.onSelectDevice,
 }
 
-export type Props = StateProps & DispatchProps;
-
 const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
     connect: state.connect,
     accounts: state.accounts,
@@ -67,7 +61,6 @@ const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps>
     onSelectDevice: bindActionCreators(TrezorConnectActions.onSelectDevice, dispatch),
 });
 
-// export default connect(mapStateToProps, mapDispatchToProps)(Aside);
 export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(Aside),
+    connect(mapStateToProps, mapDispatchToProps)(LeftNavigation),
 );
\ No newline at end of file
diff --git a/src/js/components/wallet/aside/AsideDivider.js b/src/js/views/Device/components/LeftNavigation/Divider.js
similarity index 86%
rename from src/js/components/wallet/aside/AsideDivider.js
rename to src/js/views/Device/components/LeftNavigation/Divider.js
index 3ed44cc4..1673d82d 100644
--- a/src/js/components/wallet/aside/AsideDivider.js
+++ b/src/js/views/Device/components/LeftNavigation/Divider.js
@@ -16,16 +16,16 @@ const Wrapper = styled.div`
     border-bottom: 1px solid ${colors.DIVIDER};
 `;
 
-const AsideDivider = ({ textLeft, textRight }) => (
+const Divider = ({ textLeft, textRight }) => (
     <Wrapper>
         <p>{textLeft}</p>
         <p>{textRight}</p>
     </Wrapper>
 );
 
-AsideDivider.propTypes = {
+Divider.propTypes = {
     textLeft: PropTypes.string.isRequired,
     textRight: PropTypes.string.isRequired,
 };
 
-export default AsideDivider;
+export default Divider;
diff --git a/src/js/views/Device/components/LeftNavigation/LeftNavigation.js b/src/js/views/Device/components/LeftNavigation/LeftNavigation.js
new file mode 100644
index 00000000..1f9cacf9
--- /dev/null
+++ b/src/js/views/Device/components/LeftNavigation/LeftNavigation.js
@@ -0,0 +1,112 @@
+/* @flow */
+import * as React from 'react';
+import { TransitionGroup, CSSTransition } from 'react-transition-group';
+import styled from 'styled-components';
+
+import type { TrezorDevice } from 'flowtype';
+import { DeviceSelect, DeviceDropdown } from './selection/DeviceSelection';
+import AccountSelection from './selection/AccountSelection';
+import CoinSelection from './selection/CoinSelection';
+import StickyContainer from './StickyContainer';
+
+import type { Props } from './index';
+
+type TransitionMenuProps = {
+    animationType: string;
+    children?: React.Node;
+}
+
+const TransitionGroupWrapper = styled(TransitionGroup)`
+    width: 640px;
+`;
+const TransitionContentWrapper = styled.div`
+    width: 320px;
+    display: inline-block;
+    vertical-align: top;
+`;
+
+const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGroup> => {
+    return (
+        <TransitionGroupWrapper component="div" className="transition-container">
+            <CSSTransition
+                key={props.animationType}
+                onExit={() => { window.dispatchEvent(new Event('resize')); }}
+                onExited={() => window.dispatchEvent(new Event('resize'))}
+                in
+                out
+                classNames={props.animationType}
+                appear={false}
+                timeout={300}
+            >
+                <TransitionContentWrapper>
+                    {props.children}
+                </TransitionContentWrapper>
+            </CSSTransition>
+        </TransitionGroupWrapper>
+    );
+};
+
+
+const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | string> => {
+    const selected: ?TrezorDevice = props.wallet.selectedDevice;
+    const { location } = props.router;
+
+    if (location.pathname === '/' || !selected) return (<aside />);
+
+    let menu = <section />;
+
+    let shouldRenderDeviceSelection = false;
+    // let shouldRenderCoins = false;
+    // let shouldRenderAccounts = false;
+
+    let animationType = '';
+    if (props.deviceDropdownOpened) {
+        shouldRenderDeviceSelection = true;
+        // menu = <DeviceDropdown {...props} />;
+    } else if (location.state.network) {
+        // shouldRenderAccounts = true;
+        shouldRenderDeviceSelection = false;
+        animationType = 'slide-left';
+        // menu = (
+        //     <TransitionMenu animationType="slide-left">
+        //         <AccountSelection {...props} />
+        //     </TransitionMenu>
+        // );
+    } else if (selected.features && !selected.features.bootloader_mode && selected.features.initialized) {
+        // shouldRenderCoins = true;
+        shouldRenderDeviceSelection = false;
+        animationType = 'slide-right';
+        // menu = (
+        //     <TransitionMenu animationType="slide-right">
+        //         <CoinSelection {...props} />
+        //     </TransitionMenu>
+        // );
+    }
+
+    return (
+        <StickyContainer location={location.pathname} deviceSelection={props.deviceDropdownOpened}>
+            <DeviceSelect {...props} />
+            {/* { menu } */}
+
+            {shouldRenderDeviceSelection ? (
+                <DeviceDropdown {...props} />
+            ) : (
+                <TransitionMenu
+                    animationType={animationType}
+                >
+                    {animationType === 'slide-left' && <AccountSelection key="accounts" {...props} />}
+                    {animationType === 'slide-right' && <CoinSelection key="coins" {...props} />}
+                </TransitionMenu>
+            )}
+
+
+            <div className="sticky-bottom">
+                <div className="help">
+                    <a href="https://trezor.io/support/" target="_blank" rel="noreferrer noopener">Need help?</a>
+                </div>
+            </div>
+        </StickyContainer>
+    );
+};
+
+export default LeftNavigation;
diff --git a/src/js/components/wallet/aside/row/AsideRow.js b/src/js/views/Device/components/LeftNavigation/Row.js
similarity index 88%
rename from src/js/components/wallet/aside/row/AsideRow.js
rename to src/js/views/Device/components/LeftNavigation/Row.js
index ab5478aa..6436531f 100644
--- a/src/js/components/wallet/aside/row/AsideRow.js
+++ b/src/js/views/Device/components/LeftNavigation/Row.js
@@ -22,14 +22,16 @@ const Wrapper = styled.div`
     transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
 `;
 
-const AsideRow = ({ children, column = false }) => (
+const Row = ({
+    children, column = false,
+}) => (
     <Wrapper
         column={column}
     >{children}
     </Wrapper>
 );
 
-AsideRow.propTypes = {
+Row.propTypes = {
     children: PropTypes.oneOfType([
         PropTypes.arrayOf(PropTypes.node),
         PropTypes.node,
@@ -37,4 +39,4 @@ AsideRow.propTypes = {
     column: PropTypes.bool,
 };
 
-export default AsideRow;
+export default Row;
diff --git a/src/js/components/wallet/aside/StickyContainer.js b/src/js/views/Device/components/LeftNavigation/StickyContainer.js
similarity index 99%
rename from src/js/components/wallet/aside/StickyContainer.js
rename to src/js/views/Device/components/LeftNavigation/StickyContainer.js
index b3714a4f..090e3c8f 100644
--- a/src/js/components/wallet/aside/StickyContainer.js
+++ b/src/js/views/Device/components/LeftNavigation/StickyContainer.js
@@ -141,7 +141,7 @@ export default class StickyContainer extends React.PureComponent<Props> {
                     className="sticky-container"
                     ref={node => this.wrapper = node}
                 >
-                    { this.props.children }
+                    {this.props.children}
                 </div>
             </aside>
         );
diff --git a/src/js/components/wallet/aside/common.js b/src/js/views/Device/components/LeftNavigation/common.js
similarity index 100%
rename from src/js/components/wallet/aside/common.js
rename to src/js/views/Device/components/LeftNavigation/common.js
diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
similarity index 72%
rename from src/js/components/wallet/aside/AccountSelection.js
rename to src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
index e72cc8ef..c43ee67a 100644
--- a/src/js/components/wallet/aside/AccountSelection.js
+++ b/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
@@ -10,19 +10,75 @@ import * as stateUtils from 'reducers/utils';
 import Loader from 'components/common/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
-import AsideRowAccount from './AsideRowAccount';
-import AsideSection from './AsideSection';
+import colors from 'config/colors';
+import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
+import styled, { css } from 'styled-components';
+import Row from '../Row';
+import PropTypes from 'prop-types';
+
+//import AsideRowAccount from './row/account/AsideRowAccount';
 
 import type { TrezorDevice, Accounts } from 'flowtype';
 import type { Props } from './index';
 
+const RowAccountWrapper = styled.div`
+    height: 64px;
+
+    font-size: ${FONT_SIZE.SMALL};
+    color: ${colors.TEXT_PRIMARY};
+
+    border-top: 1px solid ${colors.DIVIDER};
+    span {
+        font-size: ${FONT_SIZE.SMALLER};
+        color: ${colors.TEXT_SECONDARY};
+    }
+
+    ${props => props.isSelected && css`
+        border-left: ${BORDER_WIDTH.SELECTED} solid ${colors.GREEN_PRIMARY};
+        background: ${colors.WHITE};
+
+        &:hover {
+            background-color: ${colors.WHITE};
+        }
+
+        &:last-child {
+            border-bottom: 1px solid ${colors.DIVIDER};
+        }
+    `}
+`;
+const RowAccount = ({
+    accountIndex, balance, url, isSelected = false,
+}) => (
+    <NavLink to={url}>
+        <RowAccountWrapper
+            to={url}
+            isSelected={isSelected}
+        >
+            <Row column>
+                Account #{accountIndex + 1}
+                {balance ? (
+                    <span>{balance}</span>
+                ) : (
+                    <span>Loading...</span>
+                )}
+            </Row>
+        </RowAccountWrapper>
+    </NavLink>
+);
+RowAccount.propTypes = {
+    accountIndex: PropTypes.number.isRequired,
+    url: PropTypes.string.isRequired,
+    balance: PropTypes.string,
+    isSelected: PropTypes.bool,
+};
+
 const AccountSelection = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
     if (!selected) return null;
 
     const { location } = props.router;
     const urlParams = location.state;
-    const accounts = props.accounts;
+    const { accounts } = props;
     const baseUrl: string = urlParams.deviceInstance ? `/device/${urlParams.device}:${urlParams.deviceInstance}` : `/device/${urlParams.device}`;
 
     const { config } = props.localStorage;
@@ -53,7 +109,7 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
         }
 
         return (
-            <AsideRowAccount
+            <RowAccount
                 accountIndex={account.index}
                 balance={balance}
                 url={url}
@@ -70,7 +126,7 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
         if (selected.connected) {
             const url: string = location.pathname.replace(/account+\/([0-9]*)/, 'account/0');
             selectedAccounts = (
-                <AsideRowAccount
+                <RowAccount
                     accountIndex={0}
                     url={url}
                 />
@@ -110,7 +166,7 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
                         placement="top"
                     >
                         <div className="add-account disabled">
-                                Add account
+                            Add account
                         </div>
                     </Tooltip>
                 );
@@ -119,7 +175,7 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
             discoveryStatus = (
                 <div className="discovery-status">
                     Accounts could not be loaded
-                    <span>{ `Connect ${selected.instanceLabel} device` }</span>
+                    <span>{`Connect ${selected.instanceLabel} device`}</span>
                 </div>
             );
         } else {
@@ -136,20 +192,20 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
     if (selectedCoin) {
         backButton = (
             <NavLink to={baseUrl} className={`back ${selectedCoin.network}`}>
-                <span className={selectedCoin.network}>{ selectedCoin.name }</span>
+                <span className={selectedCoin.network}>{selectedCoin.name}</span>
             </NavLink>
         );
     }
 
     return (
-        <AsideSection>
-            {/* { backButton } */}
+        <React.Fragment>
+            {backButton}
             <div>
-                { selectedAccounts }
+                {selectedAccounts}
             </div>
-            { discoveryStatus }
-        </AsideSection>
+            {discoveryStatus}
+        </React.Fragment>
     );
 };
 
-export default AccountSelection;
\ No newline at end of file
+export default AccountSelection;
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
similarity index 59%
rename from src/js/components/wallet/aside/CoinSelection.js
rename to src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
index 03a75efb..c3cafddb 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
@@ -1,17 +1,92 @@
 /* @flow */
 import coins from 'constants/coins';
 import colors from 'config/colors';
+import { FONT_SIZE } from 'config/variables';
+import Icon from 'components/common/Icon';
 import ICONS from 'config/icons';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import styled from 'styled-components';
+
+import { ICON_SIZE } from 'config/variables';
+import { coinProp } from '../common';
+import Divider from '../Divider';
+import Row from '../Row';
 
 import type { TrezorDevice } from 'flowtype';
-import AsideDivider from './AsideDivider';
-import AsideRowCoin from './row/coin/AsideRowCoin';
-
 import type { Props } from './index';
 
+
+const CoinNameWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+const Logo = styled.div`
+    height: ${ICON_SIZE.BASE};
+    width: ${ICON_SIZE.BASE};
+    margin-right: 10px;
+
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: auto ${ICON_SIZE.BASE};
+    background-image: url('${props => props.coinImg}');
+`;
+const CoinName = ({
+    coinImg, text,
+}) => (
+    <CoinNameWrapper>
+        <Logo
+            coinImg={coinImg}
+        />
+        <p>{text}</p>
+    </CoinNameWrapper>
+);
+
+CoinName.propTypes = {
+    coinImg: PropTypes.string.isRequired,
+    text: PropTypes.string.isRequired,
+};
+
+const RowCoinWrapper = styled.div`
+    display: block;
+    height: 50px;
+
+    font-size: ${FONT_SIZE.BASE};
+    color: ${colors.TEXT_PRIMARY};
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
+`;
+const RowCoin = ({
+    coin, icon,
+}) => (
+    <RowCoinWrapper>
+        <Row>
+            <CoinName
+                coinImg={coin.img}
+                text={coin.name}
+            />
+            {icon && (
+                <Icon
+                    icon={icon.type}
+                    color={icon.color}
+                />
+            )}
+        </Row>
+    </RowCoinWrapper>
+);
+
+RowCoin.propTypes = {
+    ...coinProp,
+    icon: PropTypes.shape({
+        type: PropTypes.string.isRequired,
+        color: PropTypes.string.isRequired,
+    }),
+};
+
+
 class CoinSelection extends Component {
     getBaseUrl() {
         const { selectedDevice } = this.props.wallet;
@@ -44,7 +119,7 @@ class CoinSelection extends Component {
                             key={item.network}
                             to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
                         >
-                            <AsideRowCoin
+                            <RowCoin
                                 coin={{
                                     img: imgUrl,
                                     name: item.name,
@@ -53,13 +128,13 @@ class CoinSelection extends Component {
                         </NavLink>
                     );
                 })}
-                <AsideDivider
+                <Divider
                     textLeft="Other coins"
                     textRight="(You will be redirected)"
                 />
                 {coins.map(coin => (
                     <a href={coin.url}>
-                        <AsideRowCoin
+                        <RowCoin
                             coin={{
                                 img: coin.image,
                                 name: coin.coinName,
diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
similarity index 89%
rename from src/js/components/wallet/aside/DeviceSelection.js
rename to src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
index 6b2fb332..276da1bc 100644
--- a/src/js/components/wallet/aside/DeviceSelection.js
+++ b/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
@@ -5,13 +5,11 @@ import React, { Component } from 'react';
 import Select from 'react-select';
 import TrezorConnect from 'trezor-connect';
 
-import AsideDivider from './AsideDivider';
+import AsideDivider from '../Divider';
 
 import type { TrezorDevice } from 'flowtype';
 import type { Props } from './index';
 
-import AsideSection from './AsideSection';
-
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
     const { transport } = props.connect;
@@ -59,10 +57,10 @@ export const DeviceSelect = (props: Props) => {
     return (
         <div className={css} onClick={!disabled ? handleOpen : null}>
             <div className="label-container">
-                <span className="label">{ selected.instanceLabel }</span>
-                <span className="status">{ deviceStatus }</span>
+                <span className="label">{selected.instanceLabel}</span>
+                <span className="status">{deviceStatus}</span>
             </div>
-            { deviceCount > 1 ? <div className="counter">{ deviceCount }</div> : null }
+            {deviceCount > 1 ? <div className="counter">{deviceCount}</div> : null}
             <div className="arrow" />
         </div>
     );
@@ -164,11 +162,11 @@ export class DeviceDropdown extends Component<Props> {
 
 
             const deviceMenuButtons = deviceMenuItems.map((item, index) => (
-                <div key={item.type} className={item.type} onClick={event => this.onDeviceMenuClick(item, selected)}>{ item.label}</div>
+                <div key={item.type} className={item.type} onClick={event => this.onDeviceMenuClick(item, selected)}>{item.label}</div>
             ));
             currentDeviceMenu = deviceMenuButtons.length < 1 ? null : (
                 <div className="device-menu">
-                    { deviceMenuButtons }
+                    {deviceMenuButtons}
                 </div>
             );
         }
@@ -199,8 +197,8 @@ export class DeviceDropdown extends Component<Props> {
             return (
                 <div key={index} className={css} onClick={() => this.props.onSelectDevice(dev)}>
                     <div className="label-container">
-                        <span className="label">{ dev.instanceLabel }</span>
-                        <span className="status">{ deviceStatus }</span>
+                        <span className="label">{dev.instanceLabel}</span>
+                        <span className="status">{deviceStatus}</span>
                     </div>
                     <div
                         className="forget-button"
@@ -216,12 +214,12 @@ export class DeviceDropdown extends Component<Props> {
 
 
         return (
-            <AsideSection>
-                { currentDeviceMenu }
-                { deviceList.length > 1 ? <AsideDivider textLeft={'Other devices'}/> : null }
-                { deviceList }
-                { webUsbButton }
-            </AsideSection>
+            <React.Fragment>
+                {currentDeviceMenu}
+                {deviceList.length > 1 ? <AsideDivider textLeft={'Other devices'} /> : null}
+                {deviceList}
+                {webUsbButton}
+            </React.Fragment>
         );
     }
 }
\ No newline at end of file
diff --git a/src/js/views/Landing/index.js b/src/js/views/Landing/index.js
index b1569b71..6366419e 100644
--- a/src/js/views/Landing/index.js
+++ b/src/js/views/Landing/index.js
@@ -34,7 +34,7 @@ const BrowserNotSupported = (props: {}): React$Element<string> => (
 
 
 export default (props: Props) => {
-    const web3 = props.web3;
+    const { web3 } = props;
     const { devices } = props;
     const { browserState, transport } = props.connect;
     const localStorageError = props.localStorage.error;

From a598a7744d8c21ce27214e0c8c0c7c5c3fbd1dd4 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 14:57:10 +0200
Subject: [PATCH 062/103] Disable unused styles

---
 src/styles/aside.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/styles/aside.less b/src/styles/aside.less
index a907a040..808c0c97 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -27,15 +27,15 @@ aside {
         }
     }
 
-    .transition-container {
-        width: 640px;
+    //.transition-container {
+        //width: 640px;
 
         // section {
         //     width: 320px;
         //     display: inline-block;
         //     vertical-align: top;
         // }
-    }
+    //}
 
     .trezor-webusb-button {
         margin: 12px 0px 12px 30px;

From c743d78bee67696f1dcf78649390029e5befcdbd Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 15:11:10 +0200
Subject: [PATCH 063/103] Cleanup

---
 .../views/Device/components/LeftNavigation/Container.js  | 2 +-
 .../Device/components/LeftNavigation/Selection/index.js  | 4 ++++
 .../LeftNavigation/{LeftNavigation.js => index.js}       | 9 ++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/js/views/Device/components/LeftNavigation/Selection/index.js
 rename src/js/views/Device/components/LeftNavigation/{LeftNavigation.js => index.js} (94%)

diff --git a/src/js/views/Device/components/LeftNavigation/Container.js b/src/js/views/Device/components/LeftNavigation/Container.js
index 6c2ed692..c22d2b19 100644
--- a/src/js/views/Device/components/LeftNavigation/Container.js
+++ b/src/js/views/Device/components/LeftNavigation/Container.js
@@ -8,7 +8,7 @@ import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
-import LeftNavigation from './LeftNavigation';
+import LeftNavigation from './index';
 
 type OwnProps = {
 
diff --git a/src/js/views/Device/components/LeftNavigation/Selection/index.js b/src/js/views/Device/components/LeftNavigation/Selection/index.js
new file mode 100644
index 00000000..2d5ec492
--- /dev/null
+++ b/src/js/views/Device/components/LeftNavigation/Selection/index.js
@@ -0,0 +1,4 @@
+export { default as AccountSelection } from './AccountSelection';
+export { default as CoinSelection } from './CoinSelection';
+export { DeviceSelect } from './DeviceSelection';
+export { DeviceDropdown } from './DeviceSelection';
diff --git a/src/js/views/Device/components/LeftNavigation/LeftNavigation.js b/src/js/views/Device/components/LeftNavigation/index.js
similarity index 94%
rename from src/js/views/Device/components/LeftNavigation/LeftNavigation.js
rename to src/js/views/Device/components/LeftNavigation/index.js
index 1f9cacf9..6554e706 100644
--- a/src/js/views/Device/components/LeftNavigation/LeftNavigation.js
+++ b/src/js/views/Device/components/LeftNavigation/index.js
@@ -4,9 +4,12 @@ import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
 
 import type { TrezorDevice } from 'flowtype';
-import { DeviceSelect, DeviceDropdown } from './selection/DeviceSelection';
-import AccountSelection from './selection/AccountSelection';
-import CoinSelection from './selection/CoinSelection';
+import {
+    AccountSelection,
+    CoinSelection,
+    DeviceSelect,
+    DeviceDropdown,
+} from './Selection';
 import StickyContainer from './StickyContainer';
 
 import type { Props } from './index';

From c447cef7ee46d6c7a411f48b1335b7e9608c745e Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 15:17:41 +0200
Subject: [PATCH 064/103] Cleanup + folder structure

---
 .../components/LeftNavigation/{Divider.js => Divider/index.js}    | 0
 .../Device/components/LeftNavigation/{Row.js => Row/index.js}     | 0
 .../{StickyContainer.js => StickyContainer/index.js}              | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename src/js/views/Device/components/LeftNavigation/{Divider.js => Divider/index.js} (100%)
 rename src/js/views/Device/components/LeftNavigation/{Row.js => Row/index.js} (100%)
 rename src/js/views/Device/components/LeftNavigation/{StickyContainer.js => StickyContainer/index.js} (100%)

diff --git a/src/js/views/Device/components/LeftNavigation/Divider.js b/src/js/views/Device/components/LeftNavigation/Divider/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/Divider.js
rename to src/js/views/Device/components/LeftNavigation/Divider/index.js
diff --git a/src/js/views/Device/components/LeftNavigation/Row.js b/src/js/views/Device/components/LeftNavigation/Row/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/Row.js
rename to src/js/views/Device/components/LeftNavigation/Row/index.js
diff --git a/src/js/views/Device/components/LeftNavigation/StickyContainer.js b/src/js/views/Device/components/LeftNavigation/StickyContainer/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/StickyContainer.js
rename to src/js/views/Device/components/LeftNavigation/StickyContainer/index.js

From 7864c5d7bf32d6565929c2ed6609d6ee9b892b18 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 15:56:39 +0200
Subject: [PATCH 065/103] Refactored whole folder structure

---
 .../components/wallet/account/AccountTabs.js  | 105 ---------
 .../wallet/account/SelectedAccount.js         | 114 ----------
 .../wallet/account/receive/Receive.js         | 101 ---------
 .../wallet/account/receive/index.js           |  45 ----
 .../wallet/account/send/SendForm.js           | 207 ------------------
 .../components/wallet/account/send/index.js   |  47 ----
 .../wallet/account/sign/SignVerify.js         |  66 ------
 .../wallet/account/summary/Summary.js         | 120 ----------
 .../wallet/account/summary/SummaryDetails.js  |  75 -------
 .../wallet/account/summary/SummaryTokens.js   |  54 -----
 .../wallet/account/summary/index.js           |  52 -----
 src/js/components/wallet/index.js             |  55 -----
 src/js/support/ErrorBoundary.js               |   1 +
 .../components/Receive/Container.js           |   2 +-
 .../Account => }/components/Receive/index.js  |   0
 .../components/SelectedAccount/index.js       |   0
 .../Account => }/components/Send/Container.js |   2 +-
 .../Send/components}/AdvancedForm.js          |   0
 .../Send/components}/CoinSelectOption.js      |   0
 .../components/Send/components}/FeeSelect.js  |   0
 .../Send/components}/PendingTransactions.js   |   0
 .../Account => }/components/Send/index.js     |   0
 .../Account => }/components/Sign/index.js     |   0
 .../components/Summary/Container.js           |   0
 .../Summary/components/Details/index.js       |   0
 .../Summary/components/Tokens/index.js        |   0
 .../Account => }/components/Summary/index.js  |   0
 .../Account => }/components/Tabs/index.js     |   0
 src/js/views/Device/index.js                  |  56 +++++
 .../Send/components/AdvancedForm.js           | 191 ----------------
 .../Send/components/CoinSelectOption.js       |  51 -----
 .../components/Send/components/FeeSelect.js   |  61 ------
 .../Send/components/PendingTransactions.js    |  95 --------
 src/js/views/index.js                         |  21 +-
 34 files changed, 71 insertions(+), 1450 deletions(-)
 delete mode 100644 src/js/components/wallet/account/AccountTabs.js
 delete mode 100644 src/js/components/wallet/account/SelectedAccount.js
 delete mode 100644 src/js/components/wallet/account/receive/Receive.js
 delete mode 100644 src/js/components/wallet/account/receive/index.js
 delete mode 100644 src/js/components/wallet/account/send/SendForm.js
 delete mode 100644 src/js/components/wallet/account/send/index.js
 delete mode 100644 src/js/components/wallet/account/sign/SignVerify.js
 delete mode 100644 src/js/components/wallet/account/summary/Summary.js
 delete mode 100644 src/js/components/wallet/account/summary/SummaryDetails.js
 delete mode 100644 src/js/components/wallet/account/summary/SummaryTokens.js
 delete mode 100644 src/js/components/wallet/account/summary/index.js
 delete mode 100644 src/js/components/wallet/index.js
 rename src/js/views/Device/{views/Account => }/components/Receive/Container.js (97%)
 rename src/js/views/Device/{views/Account => }/components/Receive/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/SelectedAccount/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Send/Container.js (97%)
 rename src/js/{components/wallet/account/send => views/Device/components/Send/components}/AdvancedForm.js (100%)
 rename src/js/{components/wallet/account/send => views/Device/components/Send/components}/CoinSelectOption.js (100%)
 rename src/js/{components/wallet/account/send => views/Device/components/Send/components}/FeeSelect.js (100%)
 rename src/js/{components/wallet/account/send => views/Device/components/Send/components}/PendingTransactions.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Send/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Sign/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Summary/Container.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Summary/components/Details/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Summary/components/Tokens/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Summary/index.js (100%)
 rename src/js/views/Device/{views/Account => }/components/Tabs/index.js (100%)
 delete mode 100644 src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js
 delete mode 100644 src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js
 delete mode 100644 src/js/views/Device/views/Account/components/Send/components/FeeSelect.js
 delete mode 100644 src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js

diff --git a/src/js/components/wallet/account/AccountTabs.js b/src/js/components/wallet/account/AccountTabs.js
deleted file mode 100644
index f8b85375..00000000
--- a/src/js/components/wallet/account/AccountTabs.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* @flow */
-
-
-import React, { Component } from 'react';
-import { NavLink } from 'react-router-dom';
-
-
-type Props = {
-    pathname: string;
-}
-type State = {
-    style: {
-        width: number,
-        left: number
-    };
-}
-
-class Indicator extends Component<Props, State> {
-    reposition: () => void;
-
-    state: State;
-
-    constructor(props: Props) {
-        super(props);
-
-        this.state = {
-            style: {
-                width: 0,
-                left: 0,
-            },
-        };
-
-        this.reposition = this.reposition.bind(this);
-    }
-
-    handleResize() {
-        this.reposition();
-    }
-
-    componentDidMount() {
-        this.reposition();
-        window.addEventListener('resize', this.reposition, false);
-    }
-
-    componentWillUnmount() {
-        window.removeEventListener('resize', this.reposition, false);
-    }
-
-    componentDidUpdate(newProps: Props) {
-        this.reposition();
-    }
-
-    reposition() {
-        const tabs = document.querySelector('.account-tabs');
-        if (!tabs) return;
-        const active = tabs.querySelector('.active');
-        if (!active) return;
-        const bounds = active.getBoundingClientRect();
-
-        const left = bounds.left - tabs.getBoundingClientRect().left;
-
-        if (this.state.style.left !== left) {
-            this.setState({
-                style: {
-                    width: bounds.width,
-                    left,
-                },
-            });
-        }
-    }
-
-    render() {
-        return (
-            <div className="indicator" style={this.state.style}>{ this.props.pathname }</div>
-        );
-    }
-}
-
-const AccountTabs = (props: any) => {
-    const urlParams = props.match.params;
-    const basePath = `/device/${urlParams.device}/network/${urlParams.network}/account/${urlParams.account}`;
-
-    return (
-        <div className="account-tabs">
-            {/* <NavLink to={ `${basePath}` }>
-                History
-            </NavLink> */}
-            <NavLink exact to={`${basePath}`}>
-                Summary
-            </NavLink>
-            <NavLink to={`${basePath}/send`}>
-                Send
-            </NavLink>
-            <NavLink to={`${basePath}/receive`}>
-                Receive
-            </NavLink>
-            {/* <NavLink to={ `${basePath}/signverify` }>
-                Sign &amp; Verify
-            </NavLink> */}
-            <Indicator pathname={props.match.pathname} />
-        </div>
-    );
-};
-
-export default AccountTabs;
\ No newline at end of file
diff --git a/src/js/components/wallet/account/SelectedAccount.js b/src/js/components/wallet/account/SelectedAccount.js
deleted file mode 100644
index 1fdd6c92..00000000
--- a/src/js/components/wallet/account/SelectedAccount.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/* @flow */
-
-
-import * as React from 'react';
-import { Notification } from 'components/common/Notification';
-
-import type {
-    State, TrezorDevice, Action, ThunkAction,
-} from 'flowtype';
-import type { Account } from 'reducers/AccountsReducer';
-import type { Discovery } from 'reducers/DiscoveryReducer';
-
-export type StateProps = {
-    className: string;
-    selectedAccount: $ElementType<State, 'selectedAccount'>,
-    wallet: $ElementType<State, 'wallet'>,
-    children?: React.Node
-}
-
-export type DispatchProps = {
-
-}
-
-export type Props = StateProps & DispatchProps;
-
-const SelectedAccount = (props: Props) => {
-    const device = props.wallet.selectedDevice;
-    if (!device || !device.state) {
-        return (<section><Notification className="info" title="Loading device..." /></section>);
-    }
-
-    const accountState = props.selectedAccount;
-
-    const {
-        account,
-        discovery,
-    } = accountState;
-
-    // account not found (yet). checking why...
-    if (!account) {
-        if (!discovery || discovery.waitingForDevice) {
-            if (device.connected) {
-                // case 1: device is connected but discovery not started yet (probably waiting for auth)
-                if (device.available) {
-                    return (
-                        <section>
-                            <Notification className="info" title="Loading accounts..." />
-                        </section>
-                    );
-                }
-                // case 2: device is unavailable (created with different passphrase settings) account cannot be accessed
-                return (
-                    <section>
-                        <Notification
-                            className="info"
-                            title={`Device ${device.instanceLabel} is unavailable`}
-                            message="Change passphrase settings to use this device"
-                        />
-                    </section>
-                );
-            }
-            // case 3: device is disconnected
-            return (
-                <section>
-                    <Notification
-                        className="info"
-                        title={`Device ${device.instanceLabel} is disconnected`}
-                        message="Connect device to load accounts"
-                    />
-                </section>
-            );
-        } if (discovery.waitingForBackend) {
-            // case 4: backend is not working
-            return (
-                <section>
-                    <Notification className="warning" title="Backend not working" />
-                </section>
-            );
-        } if (discovery.completed) {
-            // case 5: account not found and discovery is completed
-            return (
-                <section>
-                    <Notification className="warning" title="Account does not exist" />
-                </section>
-            );
-        }
-        // case 6: discovery is not completed yet
-        return (
-            <section>
-                <Notification className="info" title="Loading accounts..." />
-            </section>
-        );
-    }
-
-    let notification: ?React$Element<typeof Notification> = null;
-    if (!device.connected) {
-        notification = <Notification className="info" title={`Device ${device.instanceLabel} is disconnected`} />;
-    } else if (!device.available) {
-        notification = <Notification className="info" title={`Device ${device.instanceLabel} is unavailable`} message="Change passphrase settings to use this device" />;
-    }
-
-    if (discovery && !discovery.completed && !notification) {
-        notification = <Notification className="info" title="Loading accounts..." />;
-    }
-
-    return (
-        <section className={props.className}>
-            { notification }
-            { props.children }
-        </section>
-    );
-};
-
-export default SelectedAccount;
\ No newline at end of file
diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js
deleted file mode 100644
index 4873496c..00000000
--- a/src/js/components/wallet/account/receive/Receive.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/* @flow */
-import React, { Component } from 'react';
-import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
-
-import Tooltip from 'rc-tooltip';
-import { QRCode } from 'react-qr-svg';
-
-import { Notification } from 'components/common/Notification';
-import SelectedAccount from '../SelectedAccount';
-
-import type { Props } from './index';
-
-const Wrapper = styled.div``;
-const StyledH2 = styled(H2)`
-    padding: 20px 48px;
-`;
-
-const Receive = (props: Props) => {
-    const device = props.wallet.selectedDevice;
-    const {
-        account,
-        network,
-        discovery,
-    } = props.selectedAccount;
-
-    if (!device || !account || !discovery) return null;
-
-    const {
-        addressVerified,
-        addressUnverified,
-    } = props.receive;
-
-    let qrCode = null;
-    let address = `${account.address.substring(0, 20)}...`;
-    let className = 'address hidden';
-    let button = (
-        <button disabled={device.connected && !discovery.completed} onClick={event => props.showAddress(account.addressPath)}>
-            <span>Show full address</span>
-        </button>
-    );
-
-    if (addressVerified || addressUnverified) {
-        qrCode = (
-            <QRCode
-                className="qr"
-                bgColor="#FFFFFF"
-                fgColor="#000000"
-                level="Q"
-                style={{ width: 256 }}
-                value={account.address}
-            />
-        );
-        address = account.address;
-        className = addressUnverified ? 'address unverified' : 'address';
-
-        const tooltip = addressUnverified
-            ? (<div>Unverified address.<br />{ device.connected && device.available ? 'Show on TREZOR' : 'Connect your TREZOR to verify it.' }</div>)
-            : (<div>{ device.connected ? 'Show on TREZOR' : 'Connect your TREZOR to verify address.' }</div>);
-
-        button = (
-            <Tooltip
-                arrowContent={<div className="rc-tooltip-arrow-inner" />}
-                overlay={tooltip}
-                placement="bottomRight"
-            >
-                <button className="white" onClick={event => props.showAddress(account.addressPath)}>
-                    <span />
-                </button>
-            </Tooltip>
-        );
-    }
-
-    let ver = null;
-    if (props.modal.opened && props.modal.windowType === 'ButtonRequest_Address') {
-        className = 'address verifying';
-        address = account.address;
-        ver = (<div className="confirm">Confirm address on TREZOR</div>);
-        button = (<div className="confirm">{ account.network } account #{ (account.index + 1) }</div>);
-    }
-
-    return (
-        <Wrapper>
-            <StyledH2>Receive Ethereum or tokens</StyledH2>
-            <div className={className}>
-                { ver }
-                <div className="value">
-                    { address }
-                </div>
-                { button }
-            </div>
-            { qrCode }
-        </Wrapper>
-    );
-};
-
-export default (props: Props) => (
-    <SelectedAccount {...props}>
-        <Receive {...props} />
-    </SelectedAccount>
-);
\ No newline at end of file
diff --git a/src/js/components/wallet/account/receive/index.js b/src/js/components/wallet/account/receive/index.js
deleted file mode 100644
index 6285193f..00000000
--- a/src/js/components/wallet/account/receive/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* @flow */
-
-
-import React, { Component, PropTypes } from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-
-import { default as ReceiveActions } from 'actions/ReceiveActions';
-import * as TokenActions from 'actions/TokenActions';
-import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from 'flowtype';
-import Receive from './Receive';
-
-import type {
-    StateProps as BaseStateProps,
-    DispatchProps as BaseDispatchProps,
-} from '../SelectedAccount';
-
-type OwnProps = { }
-
-type StateProps = BaseStateProps & {
-    receive: $ElementType<State, 'receive'>,
-    modal: $ElementType<State, 'modal'>,
-}
-
-type DispatchProps = BaseDispatchProps & {
-    showAddress: typeof ReceiveActions.showAddress
-};
-
-export type Props = StateProps & BaseStateProps & DispatchProps & BaseDispatchProps;
-
-const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
-    className: 'receive',
-    selectedAccount: state.selectedAccount,
-    wallet: state.wallet,
-
-    receive: state.receive,
-    modal: state.modal,
-});
-
-const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
-    showAddress: bindActionCreators(ReceiveActions.showAddress, dispatch),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Receive);
\ No newline at end of file
diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
deleted file mode 100644
index 5d9ca9ce..00000000
--- a/src/js/components/wallet/account/send/SendForm.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/* @flow */
-
-import React, { Component } from 'react';
-import styled from 'styled-components';
-import Select from 'react-select';
-import { H2 } from 'components/common/Heading';
-import { findAccountTokens } from 'reducers/TokensReducer';
-import { calculate, validation } from 'actions/SendFormActions';
-import { findToken } from 'reducers/TokensReducer';
-import type { Token } from 'flowtype';
-import AdvancedForm from './AdvancedForm';
-import PendingTransactions from './PendingTransactions';
-import { FeeSelectValue, FeeSelectOption } from './FeeSelect';
-import SelectedAccount from '../SelectedAccount';
-
-
-import type { Props } from './index';
-
-export default class SendContainer extends Component<Props> {
-    componentWillReceiveProps(newProps: Props) {
-        calculate(this.props, newProps);
-        validation(newProps);
-
-        this.props.saveSessionStorage();
-    }
-
-    render() {
-        return (
-            <SelectedAccount {...this.props}>
-                <Send {...this.props} />
-            </SelectedAccount>
-        );
-    }
-}
-
-const StyledH2 = styled(H2)`
-    padding: 20px 48px;
-`;
-
-const Send = (props: Props) => {
-    const device = props.wallet.selectedDevice;
-    const {
-        account,
-        network,
-        discovery,
-        tokens,
-    } = props.selectedAccount;
-
-    if (!device || !account || !discovery || !network) return null;
-
-    const {
-        address,
-        amount,
-        setMax,
-        networkSymbol,
-        currency,
-        feeLevels,
-        selectedFeeLevel,
-        gasPriceNeedsUpdate,
-        total,
-        errors,
-        warnings,
-        infos,
-        advanced,
-        data,
-        sending,
-    } = props.sendForm;
-
-    const {
-        onAddressChange,
-        onAmountChange,
-        onSetMax,
-        onCurrencyChange,
-        onFeeLevelChange,
-        updateFeeLevels,
-        onSend,
-    } = props.sendFormActions;
-
-    const fiatRate = props.fiat.find(f => f.network === network);
-
-    const tokensSelectData = tokens.map(t => ({ value: t.symbol, label: t.symbol }));
-    tokensSelectData.unshift({ value: network.symbol, label: network.symbol });
-
-    const setMaxClassName: string = setMax ? 'set-max enabled' : 'set-max';
-
-    let updateFeeLevelsButton = null;
-    if (gasPriceNeedsUpdate) {
-        updateFeeLevelsButton = (
-            <span className="update-fee-levels">Recommended fees updated. <a onClick={updateFeeLevels}>Click here to use them</a></span>
-        );
-    }
-
-    let addressClassName: ?string;
-    if (errors.address) {
-        addressClassName = 'not-valid';
-    } else if (warnings.address) {
-        addressClassName = 'warning';
-    } else if (address.length > 0) {
-        addressClassName = 'valid';
-    }
-
-    let buttonDisabled: boolean = Object.keys(errors).length > 0 || total === '0' || amount.length === 0 || address.length === 0 || sending;
-    let buttonLabel: string = 'Send';
-    if (networkSymbol !== currency && amount.length > 0 && !errors.amount) {
-        buttonLabel += ` ${amount} ${currency.toUpperCase()}`;
-    } else if (networkSymbol === currency && total !== '0') {
-        buttonLabel += ` ${total} ${network.symbol}`;
-    }
-
-    if (!device.connected) {
-        buttonLabel = 'Device is not connected';
-        buttonDisabled = true;
-    } else if (!device.available) {
-        buttonLabel = 'Device is unavailable';
-        buttonDisabled = true;
-    } else if (!discovery.completed) {
-        buttonLabel = 'Loading accounts';
-        buttonDisabled = true;
-    }
-
-    return (
-        <section className="send-form">
-            <StyledH2>Send Ethereum or tokens</StyledH2>
-            <div className="row address-input">
-                <label>Address</label>
-                <input
-                    type="text"
-                    autoComplete="off"
-                    autoCorrect="off"
-                    autoCapitalize="off"
-                    spellCheck="false"
-                    value={address}
-                    className={addressClassName}
-                    onChange={event => onAddressChange(event.target.value)}
-                />
-                <span className="input-icon" />
-                { errors.address ? (<span className="error">{ errors.address }</span>) : null }
-                { warnings.address ? (<span className="warning">{ warnings.address }</span>) : null }
-                { infos.address ? (<span className="info">{ infos.address }</span>) : null }
-            </div>
-
-            <div className="row">
-                <label>Amount</label>
-                <div className="amount-input">
-                    <input
-                        type="text"
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        value={amount}
-                        className={errors.amount ? 'not-valid' : null}
-                        onChange={event => onAmountChange(event.target.value)}
-                    />
-
-                    <a className={setMaxClassName} onClick={onSetMax}>Set max</a>
-
-                    <Select
-                        name="currency"
-                        className="currency"
-                        searchable={false}
-                        clearable={false}
-                        multi={false}
-                        value={currency}
-                        disabled={tokensSelectData.length < 2}
-                        onChange={onCurrencyChange}
-                        options={tokensSelectData}
-                    />
-                </div>
-                { errors.amount ? (<span className="error">{ errors.amount }</span>) : null }
-                { warnings.amount ? (<span className="warning">{ warnings.amount }</span>) : null }
-            </div>
-
-            <div className="row">
-                <label>Fee{ updateFeeLevelsButton }</label>
-                <Select
-                    name="fee"
-                    className="fee"
-                    searchable={false}
-                    clearable={false}
-                    value={selectedFeeLevel}
-                    onChange={onFeeLevelChange}
-                    valueComponent={FeeSelectValue}
-                    optionComponent={FeeSelectOption}
-                    disabled={networkSymbol === currency && data.length > 0}
-                    optionClassName="fee-option"
-                    options={feeLevels}
-                />
-            </div>
-
-            <AdvancedForm
-                selectedAccount={props.selectedAccount}
-                sendForm={props.sendForm}
-                sendFormActions={props.sendFormActions}
-            >
-                <button disabled={buttonDisabled} onClick={event => onSend()}>{ buttonLabel }</button>
-            </AdvancedForm>
-
-            <PendingTransactions
-                pending={props.selectedAccount.pending}
-                tokens={props.selectedAccount.tokens}
-                network={network}
-            />
-
-        </section>
-    );
-};
diff --git a/src/js/components/wallet/account/send/index.js b/src/js/components/wallet/account/send/index.js
deleted file mode 100644
index c37f2556..00000000
--- a/src/js/components/wallet/account/send/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* @flow */
-
-
-import * as React from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-
-import { default as SendFormActions } from 'actions/SendFormActions';
-import * as SessionStorageActions from 'actions/SessionStorageActions';
-import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from 'flowtype';
-import SendForm from './SendForm';
-
-import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
-
-type OwnProps = { }
-
-export type StateProps = BaseStateProps & {
-    sendForm: $ElementType<State, 'sendForm'>,
-    fiat: $ElementType<State, 'fiat'>,
-    localStorage: $ElementType<State, 'localStorage'>,
-    children?: React.Node;
-}
-
-export type DispatchProps = BaseDispatchProps & {
-    sendFormActions: typeof SendFormActions,
-    saveSessionStorage: typeof SessionStorageActions.save
-}
-
-export type Props = StateProps & BaseStateProps & DispatchProps & BaseDispatchProps;
-
-const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
-    className: 'send-from',
-    selectedAccount: state.selectedAccount,
-    wallet: state.wallet,
-
-    sendForm: state.sendForm,
-    fiat: state.fiat,
-    localStorage: state.localStorage,
-});
-
-const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
-    sendFormActions: bindActionCreators(SendFormActions, dispatch),
-    saveSessionStorage: bindActionCreators(SessionStorageActions.save, dispatch),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendForm);
\ No newline at end of file
diff --git a/src/js/components/wallet/account/sign/SignVerify.js b/src/js/components/wallet/account/sign/SignVerify.js
deleted file mode 100644
index 566cfa69..00000000
--- a/src/js/components/wallet/account/sign/SignVerify.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { H2 } from 'components/common/Heading';
-import colors from 'config/colors';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: row;
-    background: ${colors.WHITE};
-    padding: 50px;
-`;
-
-const StyledH2 = styled(H2)`
-    padding-bottom: 10px;
-`;
-
-const Column = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-`;
-
-const Sign = styled(Column)``;
-
-const Verify = styled(Column)`
-    padding-left: 20px;
-`;
-
-const Label = styled.div`
-    color: ${colors.LABEL};
-    padding: 5px 0px;
-`;
-
-const Textarea = styled.textarea`
-    resize: vertical;
-    width: 100%;
-`;
-
-const Input = styled.input``;
-
-const SignVerify = () => (
-    <Wrapper>
-        <Sign>
-            <StyledH2>Sign message</StyledH2>
-            <Label>Message</Label>
-            <Textarea rows="4" maxLength="255" />
-            <Label>Address</Label>
-            <Input type="text" />
-            <Label>Signature</Label>
-            <Textarea rows="4" maxLength="255" readOnly="readonly" />
-        </Sign>
-        <Verify>
-            <StyledH2>Verify message</StyledH2>
-            <Label>Message</Label>
-            <Textarea rows="4" maxLength="255" />
-            <Label>Address</Label>
-            <Input type="text" />
-            <Label>Signature</Label>
-            <Textarea rows="4" maxLength="255" />
-        </Verify>
-    </Wrapper>
-);
-
-export default SignVerify;
\ No newline at end of file
diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
deleted file mode 100644
index 3add7a7b..00000000
--- a/src/js/components/wallet/account/summary/Summary.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/* @flow */
-import styled from 'styled-components';
-import React, { Component } from 'react';
-import { H2 } from 'components/common/Heading';
-import BigNumber from 'bignumber.js';
-import { Async as AsyncSelect } from 'react-select';
-import Tooltip from 'rc-tooltip';
-
-import { resolveAfter } from 'utils/promiseUtils';
-import { Notification } from 'components/common/Notification';
-import * as stateUtils from 'reducers/utils';
-import type { NetworkToken } from 'reducers/LocalStorageReducer';
-import SelectedAccount from '../SelectedAccount';
-import SummaryDetails from './SummaryDetails.js';
-import SummaryTokens from './SummaryTokens.js';
-
-import type { Props } from './index';
-
-const StyledH2 = styled(H2)`
-    padding: 20px 48px;
-`;
-
-const Summary = (props: Props) => {
-    const device = props.wallet.selectedDevice;
-    const {
-        account,
-        network,
-        tokens,
-        pending,
-    } = props.selectedAccount;
-
-    // flow
-    if (!device || !account || !network) return null;
-
-    const tokensTooltip = (
-        <div className="tooltip-wrapper">
-            Insert token name, symbol or address to be able to send it.
-        </div>
-    );
-    const explorerLink: string = `${network.explorer.address}${account.address}`;
-
-    const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);
-    const balance: string = new BigNumber(account.balance).minus(pendingAmount).toString(10);
-
-    return (
-        <div>
-            <StyledH2 className={`summary-header ${account.network}`}>
-                Account #{ parseInt(account.index) + 1 }
-                <a href={explorerLink} className="gray" target="_blank" rel="noreferrer noopener">See full transaction history</a>
-            </StyledH2>
-
-            <SummaryDetails
-                coin={network}
-                summary={props.summary}
-                balance={balance}
-                network={network.network}
-                fiat={props.fiat}
-                localStorage={props.localStorage}
-                onToggle={props.onDetailsToggle}
-            />
-
-            <StyledH2>
-                Tokens
-                <Tooltip
-                    arrowContent={<div className="rc-tooltip-arrow-inner" />}
-                    overlay={tokensTooltip}
-                    placement="top"
-                >
-                    <span className="what-is-it" />
-                </Tooltip>
-            </StyledH2>
-            {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 Lahod */}
-            {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 T01 */}
-            <div className="filter">
-                <AsyncSelect
-                    className="token-select"
-                    multi={false}
-                    autoload={false}
-                    ignoreCase
-                    backspaceRemoves
-                    value={null}
-                    onChange={token => props.addToken(token, account)}
-                    loadOptions={input => props.loadTokens(input, account.network)}
-                    filterOptions={
-                        (options: Array<NetworkToken>, search: string, values: Array<NetworkToken>) => options.map((o) => {
-                            const added = tokens.find(t => t.symbol === o.symbol);
-                            if (added) {
-                                return {
-                                    ...o,
-                                    name: `${o.name} (Already added)`,
-                                    disabled: true,
-                                };
-                            }
-                            return o;
-                        })
-                    }
-                    valueKey="symbol"
-                    labelKey="name"
-                    placeholder="Search for token"
-                    searchPromptText="Type token name or address"
-                    noResultsText="Token not found"
-                />
-
-            </div>
-
-            <SummaryTokens
-                pending={pending}
-                tokens={tokens}
-                removeToken={props.removeToken}
-            />
-
-        </div>
-    );
-};
-
-export default (props: Props) => (
-    <SelectedAccount {...props}>
-        <Summary {...props} />
-    </SelectedAccount>
-);
\ No newline at end of file
diff --git a/src/js/components/wallet/account/summary/SummaryDetails.js b/src/js/components/wallet/account/summary/SummaryDetails.js
deleted file mode 100644
index 77a7d9db..00000000
--- a/src/js/components/wallet/account/summary/SummaryDetails.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/* @flow */
-
-
-import React from 'react';
-import BigNumber from 'bignumber.js';
-
-import type { Coin } from 'reducers/LocalStorageReducer';
-import type { Props as BaseProps } from './index';
-
-type Props = {
-    // coin: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'coin'>,
-    coin: Coin,
-    summary: $ElementType<BaseProps, 'summary'>,
-    balance: string,
-    network: string,
-    fiat: $ElementType<BaseProps, 'fiat'>,
-    onToggle: $ElementType<BaseProps, 'onDetailsToggle'>
-}
-
-const SummaryDetails = (props: Props): ?React$Element<string> => {
-    if (!props.summary.details) {
-        return (
-            <div className="summary-details">
-                <div className="toggle" onClick={props.onToggle} />
-            </div>
-        );
-    }
-
-    const selectedCoin = props.coin;
-    const fiatRate = props.fiat.find(f => f.network === selectedCoin.network);
-
-    let balanceColumn = null;
-    let rateColumn = null;
-
-    if (fiatRate) {
-        const accountBalance = new BigNumber(props.balance);
-        const fiatValue = new BigNumber(fiatRate.value);
-        const fiat = accountBalance.times(fiatValue).toFixed(2);
-
-        balanceColumn = (
-            <div className="column">
-                <div className="label">Balance</div>
-                <div className="fiat-value">${ fiat }</div>
-                <div className="value">{ props.balance } { selectedCoin.symbol }</div>
-            </div>
-        );
-
-        rateColumn = (
-            <div className="column">
-                <div className="label">Rate</div>
-                <div className="fiat-value">${ fiatValue.toFixed(2) }</div>
-                <div className="value">1.00 { selectedCoin.symbol }</div>
-            </div>
-        );
-    } else {
-        balanceColumn = (
-            <div className="column">
-                <div className="label">Balance</div>
-                <div className="fiat-value">{ props.balance } { selectedCoin.symbol }</div>
-            </div>
-        );
-    }
-
-    return (
-        <div className="summary-details opened">
-            <div className="toggle" onClick={props.onToggle} />
-            <div className="content">
-                { balanceColumn }
-                { rateColumn }
-            </div>
-        </div>
-    );
-};
-
-export default SummaryDetails;
\ No newline at end of file
diff --git a/src/js/components/wallet/account/summary/SummaryTokens.js b/src/js/components/wallet/account/summary/SummaryTokens.js
deleted file mode 100644
index c6dc05c6..00000000
--- a/src/js/components/wallet/account/summary/SummaryTokens.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* @flow */
-
-
-import React from 'react';
-import ColorHash from 'color-hash';
-import ScaleText from 'react-scale-text';
-import * as stateUtils from 'reducers/utils';
-import BigNumber from 'bignumber.js';
-
-import type { Props as BaseProps } from './index';
-
-type Props = {
-    pending: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'pending'>,
-    tokens: $ElementType<BaseProps, 'tokens'>,
-    removeToken: $ElementType<BaseProps, 'removeToken'>
-}
-
-const SummaryTokens = (props: Props) => {
-    if (!props.tokens || props.tokens.length < 1) return null;
-
-    const bgColor = new ColorHash({ lightness: 0.7 });
-    const textColor = new ColorHash();
-
-    const tokens = props.tokens.map((token, index) => {
-        const iconColor = {
-            color: textColor.hex(token.name),
-            background: bgColor.hex(token.name),
-            borderColor: bgColor.hex(token.name),
-        };
-
-        const pendingAmount: BigNumber = stateUtils.getPendingAmount(props.pending, token.symbol, true);
-        const balance: string = new BigNumber(token.balance).minus(pendingAmount).toString(10);
-        return (
-            <div key={index} className="token">
-                <div className="icon" style={iconColor}>
-                    <div className="icon-inner">
-                        <ScaleText widthOnly><p>{ token.symbol }</p></ScaleText>
-                    </div>
-                </div>
-                <div className="name">{ token.name }</div>
-                <div className="balance">{ balance } { token.symbol }</div>
-                <button className="transparent" onClick={event => props.removeToken(token)} />
-            </div>
-        );
-    });
-
-    return (
-        <div>
-            { tokens }
-        </div>
-    );
-};
-
-export default SummaryTokens;
\ No newline at end of file
diff --git a/src/js/components/wallet/account/summary/index.js b/src/js/components/wallet/account/summary/index.js
deleted file mode 100644
index 02cce0e7..00000000
--- a/src/js/components/wallet/account/summary/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* @flow */
-
-
-import React, { Component, PropTypes } from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-
-import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import * as SummaryActions from 'actions/SummaryActions';
-import * as TokenActions from 'actions/TokenActions';
-
-import type { State, Dispatch } from 'flowtype';
-import Summary from './Summary';
-import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
-
-type OwnProps = { }
-
-type StateProps = BaseStateProps & {
-    tokens: $ElementType<State, 'tokens'>,
-    summary: $ElementType<State, 'summary'>,
-    fiat: $ElementType<State, 'fiat'>,
-    localStorage: $ElementType<State, 'localStorage'>,
-};
-
-type DispatchProps = BaseDispatchProps & {
-    onDetailsToggle: typeof SummaryActions.onDetailsToggle,
-    addToken: typeof TokenActions.add,
-    loadTokens: typeof TokenActions.load,
-    removeToken: typeof TokenActions.remove,
-}
-
-export type Props = StateProps & BaseStateProps & DispatchProps & BaseDispatchProps;
-
-const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
-    className: 'summary',
-    selectedAccount: state.selectedAccount,
-    wallet: state.wallet,
-
-    tokens: state.tokens,
-    summary: state.summary,
-    fiat: state.fiat,
-    localStorage: state.localStorage,
-});
-
-const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
-    onDetailsToggle: bindActionCreators(SummaryActions.onDetailsToggle, dispatch),
-    addToken: bindActionCreators(TokenActions.add, dispatch),
-    loadTokens: bindActionCreators(TokenActions.load, dispatch),
-    removeToken: bindActionCreators(TokenActions.remove, dispatch),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Summary);
\ No newline at end of file
diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js
deleted file mode 100644
index 93a7c73c..00000000
--- a/src/js/components/wallet/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* @flow */
-
-import * as React from 'react';
-import { connect } from 'react-redux';
-import { Route, withRouter } from 'react-router-dom';
-
-import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
-import type { State, Dispatch } from 'flowtype';
-import Header from '../common/Header';
-import Footer from '../common/Footer';
-import AccountTabs from './account/AccountTabs';
-import DeviceSettingsTabs from './pages/DeviceSettingsTabs';
-// import AsideContainer from './aside';
-import LeftNavigation from 'views/Device/components/LeftNavigation/Container';
-import ModalContainer from '../modal';
-import Notifications from '../common/Notification';
-import Log from '../common/Log';
-
-type WalletContainerProps = {
-    wallet: $ElementType<State, 'wallet'>,
-    children?: React.Node
-}
-
-type ContentProps = {
-    children?: React.Node
-}
-
-const Wallet = (props: WalletContainerProps) => (
-    <div className="app">
-        <Header />
-        {/* <div>{ props.wallet.online ? "ONLINE" : "OFFLINE" }</div> */}
-        <main>
-            <LeftNavigation />
-            <article>
-                <nav>
-                    <Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
-                    <Route path="/device/:device/device-settings" component={DeviceSettingsTabs} />
-                </nav>
-                <Notifications />
-                <Log />
-                { props.children }
-                <Footer />
-            </article>
-        </main>
-        <ModalContainer />
-    </div>
-);
-
-const mapStateToProps: MapStateToProps<State, {}, WalletContainerProps> = (state: State, own: {}): WalletContainerProps => ({
-    wallet: state.wallet,
-});
-
-export default withRouter(
-    connect(mapStateToProps, null)(Wallet),
-);
diff --git a/src/js/support/ErrorBoundary.js b/src/js/support/ErrorBoundary.js
index f47d2581..38624521 100644
--- a/src/js/support/ErrorBoundary.js
+++ b/src/js/support/ErrorBoundary.js
@@ -9,6 +9,7 @@ class ErrorBoundary extends Component {
     componentDidCatch(error, info) {
         // Display fallback UI
         this.setState({ hasError: true });
+        console.error('error', error);
         // You can also log the error to an error reporting service
         // logErrorToMyService(error, info);
     }
diff --git a/src/js/views/Device/views/Account/components/Receive/Container.js b/src/js/views/Device/components/Receive/Container.js
similarity index 97%
rename from src/js/views/Device/views/Account/components/Receive/Container.js
rename to src/js/views/Device/components/Receive/Container.js
index 6285193f..002d8a8c 100644
--- a/src/js/views/Device/views/Account/components/Receive/Container.js
+++ b/src/js/views/Device/components/Receive/Container.js
@@ -9,7 +9,7 @@ import { default as ReceiveActions } from 'actions/ReceiveActions';
 import * as TokenActions from 'actions/TokenActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
-import Receive from './Receive';
+import Receive from './index';
 
 import type {
     StateProps as BaseStateProps,
diff --git a/src/js/views/Device/views/Account/components/Receive/index.js b/src/js/views/Device/components/Receive/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Receive/index.js
rename to src/js/views/Device/components/Receive/index.js
diff --git a/src/js/views/Device/views/Account/components/SelectedAccount/index.js b/src/js/views/Device/components/SelectedAccount/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/SelectedAccount/index.js
rename to src/js/views/Device/components/SelectedAccount/index.js
diff --git a/src/js/views/Device/views/Account/components/Send/Container.js b/src/js/views/Device/components/Send/Container.js
similarity index 97%
rename from src/js/views/Device/views/Account/components/Send/Container.js
rename to src/js/views/Device/components/Send/Container.js
index c37f2556..8b4a1a10 100644
--- a/src/js/views/Device/views/Account/components/Send/Container.js
+++ b/src/js/views/Device/components/Send/Container.js
@@ -9,7 +9,7 @@ import { default as SendFormActions } from 'actions/SendFormActions';
 import * as SessionStorageActions from 'actions/SessionStorageActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
-import SendForm from './SendForm';
+import SendForm from './index';
 
 import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount';
 
diff --git a/src/js/components/wallet/account/send/AdvancedForm.js b/src/js/views/Device/components/Send/components/AdvancedForm.js
similarity index 100%
rename from src/js/components/wallet/account/send/AdvancedForm.js
rename to src/js/views/Device/components/Send/components/AdvancedForm.js
diff --git a/src/js/components/wallet/account/send/CoinSelectOption.js b/src/js/views/Device/components/Send/components/CoinSelectOption.js
similarity index 100%
rename from src/js/components/wallet/account/send/CoinSelectOption.js
rename to src/js/views/Device/components/Send/components/CoinSelectOption.js
diff --git a/src/js/components/wallet/account/send/FeeSelect.js b/src/js/views/Device/components/Send/components/FeeSelect.js
similarity index 100%
rename from src/js/components/wallet/account/send/FeeSelect.js
rename to src/js/views/Device/components/Send/components/FeeSelect.js
diff --git a/src/js/components/wallet/account/send/PendingTransactions.js b/src/js/views/Device/components/Send/components/PendingTransactions.js
similarity index 100%
rename from src/js/components/wallet/account/send/PendingTransactions.js
rename to src/js/views/Device/components/Send/components/PendingTransactions.js
diff --git a/src/js/views/Device/views/Account/components/Send/index.js b/src/js/views/Device/components/Send/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Send/index.js
rename to src/js/views/Device/components/Send/index.js
diff --git a/src/js/views/Device/views/Account/components/Sign/index.js b/src/js/views/Device/components/Sign/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Sign/index.js
rename to src/js/views/Device/components/Sign/index.js
diff --git a/src/js/views/Device/views/Account/components/Summary/Container.js b/src/js/views/Device/components/Summary/Container.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Summary/Container.js
rename to src/js/views/Device/components/Summary/Container.js
diff --git a/src/js/views/Device/views/Account/components/Summary/components/Details/index.js b/src/js/views/Device/components/Summary/components/Details/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Summary/components/Details/index.js
rename to src/js/views/Device/components/Summary/components/Details/index.js
diff --git a/src/js/views/Device/views/Account/components/Summary/components/Tokens/index.js b/src/js/views/Device/components/Summary/components/Tokens/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Summary/components/Tokens/index.js
rename to src/js/views/Device/components/Summary/components/Tokens/index.js
diff --git a/src/js/views/Device/views/Account/components/Summary/index.js b/src/js/views/Device/components/Summary/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Summary/index.js
rename to src/js/views/Device/components/Summary/index.js
diff --git a/src/js/views/Device/views/Account/components/Tabs/index.js b/src/js/views/Device/components/Tabs/index.js
similarity index 100%
rename from src/js/views/Device/views/Account/components/Tabs/index.js
rename to src/js/views/Device/components/Tabs/index.js
diff --git a/src/js/views/Device/index.js b/src/js/views/Device/index.js
index e69de29b..c5712842 100644
--- a/src/js/views/Device/index.js
+++ b/src/js/views/Device/index.js
@@ -0,0 +1,56 @@
+/* @flow */
+
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { Route, withRouter } from 'react-router-dom';
+
+import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
+import type { State, Dispatch } from 'flowtype';
+
+import Header from 'components/common/Header';
+import Footer from 'components/common/Footer';
+import DeviceSettingsTabs from 'components/wallet/pages/DeviceSettingsTabs';
+import ModalContainer from 'components/modal';
+import Notifications from 'components/common/Notification';
+import Log from 'components/common/Log';
+
+import LeftNavigation from './components/LeftNavigation/Container';
+import AccountTabs from './components/Tabs';
+
+type WalletContainerProps = {
+    wallet: $ElementType<State, 'wallet'>,
+    children?: React.Node
+}
+
+type ContentProps = {
+    children?: React.Node
+}
+
+const Wallet = (props: WalletContainerProps) => (
+    <div className="app">
+        <Header />
+        {/* <div>{ props.wallet.online ? "ONLINE" : "OFFLINE" }</div> */}
+        <main>
+            <LeftNavigation />
+            <article>
+                <nav>
+                    <Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
+                    <Route path="/device/:device/device-settings" component={DeviceSettingsTabs} />
+                </nav>
+                <Notifications />
+                <Log />
+                { props.children }
+                <Footer />
+            </article>
+        </main>
+        <ModalContainer />
+    </div>
+);
+
+const mapStateToProps: MapStateToProps<State, {}, WalletContainerProps> = (state: State, own: {}): WalletContainerProps => ({
+    wallet: state.wallet,
+});
+
+export default withRouter(
+    connect(mapStateToProps, null)(Wallet),
+);
diff --git a/src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js b/src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js
deleted file mode 100644
index 978f9268..00000000
--- a/src/js/views/Device/views/Account/components/Send/components/AdvancedForm.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/* @flow */
-
-
-import React from 'react';
-import Tooltip from 'rc-tooltip';
-import type { Props as BaseProps } from './index';
-
-type Props = {
-    selectedAccount: $ElementType<BaseProps, 'selectedAccount'>,
-    sendForm: $ElementType<BaseProps, 'sendForm'>,
-    sendFormActions: $ElementType<BaseProps, 'sendFormActions'>,
-    children?: $ElementType<BaseProps, 'children'>,
-};
-
-const AdvancedForm = (props: Props) => {
-    const {
-        account,
-        network,
-    } = props.selectedAccount;
-
-    const {
-        networkSymbol,
-        currency,
-        gasPrice,
-        gasLimit,
-        recommendedGasPrice,
-        calculatingGasLimit,
-        nonce,
-        data,
-        errors,
-        warnings,
-        infos,
-        advanced,
-    } = props.sendForm;
-
-    const {
-        toggleAdvanced,
-        onGasPriceChange,
-        onGasLimitChange,
-        onNonceChange,
-        onDataChange,
-    } = props.sendFormActions;
-
-    if (!advanced) {
-        return (
-            <div className="advanced-container">
-                <a className="advanced" onClick={toggleAdvanced}>Advanced settings</a>
-                { props.children }
-            </div>
-        );
-    }
-
-    const nonceTooltip = (
-        <div className="tooltip-wrapper">
-            TODO<br />
-        </div>
-    );
-
-    let gasLimitTooltipCurrency: string;
-    let gasLimitTooltipValue: string;
-    if (networkSymbol !== currency) {
-        gasLimitTooltipCurrency = 'tokens';
-        gasLimitTooltipValue = network.defaultGasLimitTokens;
-    } else {
-        gasLimitTooltipCurrency = networkSymbol;
-        gasLimitTooltipValue = network.defaultGasLimit;
-    }
-
-    const gasLimitTooltip = (
-        <div className="tooltip-wrapper">
-            Gas limit is the amount of gas to send with your transaction.<br />
-            <span>TX fee = gas price * gas limit</span> &amp; is paid to miners for including your TX in a block.<br />
-            Increasing this number will not get your TX mined faster.<br />
-            Default value for sending { gasLimitTooltipCurrency } is <span>{ gasLimitTooltipValue }</span>
-        </div>
-    );
-
-    const gasPriceTooltip = (
-        <div className="tooltip-wrapper">
-            Gas Price is the amount you pay per unit of gas.<br />
-            <span>TX fee = gas price * gas limit</span> &amp; is paid to miners for including your TX in a block.<br />
-            Higher the gas price = faster transaction, but more expensive. Recommended is <span>{ recommendedGasPrice } GWEI.</span><br />
-            <a className="green" href="https://myetherwallet.github.io/knowledge-base/gas/what-is-gas-ethereum.html" target="_blank" rel="noreferrer noopener">Read more</a>
-        </div>
-    );
-
-    const dataTooltip = (
-        <div className="tooltip-wrapper">
-            Data is usually used when you send transactions to contracts.
-        </div>
-    );
-
-
-    return (
-        <div className="advanced-container opened">
-            <a className="advanced" onClick={toggleAdvanced}>Advanced settings</a>
-            <div className="row gas-row">
-                {/* <div className="column nonce">
-                    <label>
-                        Nonce
-                        <Tooltip
-                            arrowContent={<div className="rc-tooltip-arrow-inner"></div>}
-                            overlay={ nonceTooltip }
-                            placement="top">
-                            <span className="what-is-it"></span>
-                        </Tooltip>
-                    </label>
-                    <input
-                        type="text"
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        value={ nonce }
-                        onChange={ event => onNonceChange(event.target.value) } />
-                    { errors.nonce ? (<span className="error">{ errors.nonce }</span>) : null }
-                    { warnings.nonce ? (<span className="warning">{ warnings.nonce }</span>) : null }
-                </div> */}
-                <div className="column">
-                    <label>
-                        Gas limit
-                        <Tooltip
-                            arrowContent={<div className="rc-tooltip-arrow-inner" />}
-                            overlay={gasLimitTooltip}
-                            placement="top"
-                        >
-                            <span className="what-is-it" />
-                        </Tooltip>
-                    </label>
-                    <input
-                        type="text"
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        value={gasLimit}
-                        disabled={networkSymbol === currency && data.length > 0}
-                        onChange={event => onGasLimitChange(event.target.value)}
-                    />
-                    { errors.gasLimit ? (<span className="error">{ errors.gasLimit }</span>) : null }
-                    { warnings.gasLimit ? (<span className="warning">{ warnings.gasLimit }</span>) : null }
-                    { calculatingGasLimit ? (<span className="info">Calculating...</span>) : null }
-                </div>
-                <div className="column">
-                    <label>
-                        Gas price
-                        <Tooltip
-                            arrowContent={<div className="rc-tooltip-arrow-inner" />}
-                            overlay={gasPriceTooltip}
-                            placement="top"
-                        >
-                            <span className="what-is-it" />
-                        </Tooltip>
-                    </label>
-                    <input
-                        type="text"
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        value={gasPrice}
-                        onChange={event => onGasPriceChange(event.target.value)}
-                    />
-                    { errors.gasPrice ? (<span className="error">{ errors.gasPrice }</span>) : null }
-                </div>
-            </div>
-
-            <div className="row">
-                <label>
-                    Data
-                    <Tooltip
-                        arrowContent={<div className="rc-tooltip-arrow-inner" />}
-                        overlay={dataTooltip}
-                        placement="top"
-                    >
-                        <span className="what-is-it" />
-                    </Tooltip>
-                </label>
-                <textarea disabled={networkSymbol !== currency} value={networkSymbol !== currency ? '' : data} onChange={event => onDataChange(event.target.value)} />
-                { errors.data ? (<span className="error">{ errors.data }</span>) : null }
-            </div>
-
-            <div className="row">
-                { props.children }
-            </div>
-
-        </div>
-    );
-};
-
-export default AdvancedForm;
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js b/src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js
deleted file mode 100644
index 075688da..00000000
--- a/src/js/views/Device/views/Account/components/Send/components/CoinSelectOption.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* @flow */
-
-
-import * as React from 'react';
-
-type Props = {
-    children: React.Node,
-    className: string,
-    isDisabled: boolean,
-    isFocused: boolean,
-    isSelected: boolean,
-    onFocus: Function,
-    onSelect: Function,
-    option: any,
-}
-
-export default class CoinSelectOption extends React.Component<Props> {
-    constructor(props: Props) {
-        super(props);
-    }
-
-    handleMouseDown(event: MouseEvent) {
-        event.preventDefault();
-        event.stopPropagation();
-        this.props.onSelect(this.props.option, event);
-    }
-
-    handleMouseEnter(event: MouseEvent) {
-        this.props.onFocus(this.props.option, event);
-    }
-
-    handleMouseMove(event: MouseEvent) {
-        if (this.props.isFocused) return;
-        this.props.onFocus(this.props.option, event);
-    }
-
-    render() {
-        const css = `${this.props.className} ${this.props.option.value}`;
-        return (
-            <div
-                className={css}
-                onMouseDown={this.handleMouseDown.bind(this)}
-                onMouseEnter={this.handleMouseEnter.bind(this)}
-                onMouseMove={this.handleMouseMove.bind(this)}
-                title={this.props.option.label}
-            >
-                <span>{ this.props.children }</span>
-            </div>
-        );
-    }
-}
\ No newline at end of file
diff --git a/src/js/views/Device/views/Account/components/Send/components/FeeSelect.js b/src/js/views/Device/views/Account/components/Send/components/FeeSelect.js
deleted file mode 100644
index 2974970a..00000000
--- a/src/js/views/Device/views/Account/components/Send/components/FeeSelect.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/* @flow */
-
-
-import * as React from 'react';
-import PropTypes from 'prop-types';
-
-
-export const FeeSelectValue = (props: any): any => (
-    <div>
-        <div className="Select-value fee-option">
-            <span className="fee-value">{ props.value.value }</span>
-            <span className="fee-label">{ props.value.label }</span>
-        </div>
-    </div>
-);
-
-type Props = {
-    children: React.Node,
-    className: string,
-    isDisabled: boolean,
-    isFocused: boolean,
-    isSelected: boolean,
-    onFocus: Function,
-    onSelect: Function,
-    option: any,
-}
-
-export class FeeSelectOption extends React.Component<Props> {
-    constructor(props: Props) {
-        super(props);
-    }
-
-    handleMouseDown(event: MouseEvent) {
-        event.preventDefault();
-        event.stopPropagation();
-        this.props.onSelect(this.props.option, event);
-    }
-
-    handleMouseEnter(event: MouseEvent) {
-        this.props.onFocus(this.props.option, event);
-    }
-
-    handleMouseMove(event: MouseEvent) {
-        if (this.props.isFocused) return;
-        this.props.onFocus(this.props.option, event);
-    }
-
-    render() {
-        return (
-            <div
-                className={this.props.className}
-                onMouseDown={this.handleMouseDown.bind(this)}
-                onMouseEnter={this.handleMouseEnter.bind(this)}
-                onMouseMove={this.handleMouseMove.bind(this)}
-            >
-                <span className="fee-value">{ this.props.option.value }</span>
-                <span className="fee-label">{ this.props.option.label }</span>
-            </div>
-        );
-    }
-}
diff --git a/src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js b/src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js
deleted file mode 100644
index e7783bdd..00000000
--- a/src/js/views/Device/views/Account/components/Send/components/PendingTransactions.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/* @flow */
-
-
-import React from 'react';
-import ColorHash from 'color-hash';
-import { H2 } from 'components/common/Heading';
-import ScaleText from 'react-scale-text';
-
-import { findAccountTokens } from 'reducers/TokensReducer';
-
-import type { Coin } from 'reducers/LocalStorageReducer';
-import type { Token } from 'reducers/TokensReducer';
-import type { Props as BaseProps } from './index';
-
-type Props = {
-    pending: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'pending'>,
-    tokens: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'tokens'>,
-    network: Coin
-}
-
-type Style = {
-    +color: string,
-    +background: string,
-    +borderColor: string
-}
-
-const PendingTransactions = (props: Props) => {
-    const pending = props.pending.filter(tx => !tx.rejected);
-    if (pending.length < 1) return null;
-
-    const tokens: Array<Token> = props.tokens;
-
-    const bgColorFactory = new ColorHash({ lightness: 0.7 });
-    const textColorFactory = new ColorHash();
-
-    const pendingTxs: React$Element<string> = pending.map((tx, i) => {
-        let iconColor: Style;
-        let symbol: string;
-        let name: string;
-        const isSmartContractTx: boolean = tx.currency !== props.network.symbol;
-        if (isSmartContractTx) {
-            const token: ?Token = tokens.find(t => t.symbol === tx.currency);
-            if (!token) {
-                iconColor = {
-                    color: '#ffffff',
-                    background: '#000000',
-                    borderColor: '#000000',
-                };
-                symbol = 'Unknown';
-                name = 'Unknown';
-            } else {
-                const bgColor: string = bgColorFactory.hex(token.name);
-                iconColor = {
-                    color: textColorFactory.hex(token.name),
-                    background: bgColor,
-                    borderColor: bgColor,
-                };
-                symbol = token.symbol.toUpperCase();
-                name = token.name;
-            }
-        } else {
-            iconColor = {
-                color: textColorFactory.hex(tx.network),
-                background: bgColorFactory.hex(tx.network),
-                borderColor: bgColorFactory.hex(tx.network),
-            };
-            symbol = props.network.symbol;
-            name = props.network.name;
-        }
-
-        return (
-            <div key={i} className="tx">
-                <div className="icon" style={iconColor}>
-                    <div className="icon-inner">
-                        <ScaleText widthOnly><p>{ symbol }</p></ScaleText>
-                    </div>
-                </div>
-                <div className="name">
-                    <a href={`${props.network.explorer.tx}${tx.id}`} target="_blank" rel="noreferrer noopener">{ name }</a>
-                </div>
-                <div className="amount">{ isSmartContractTx ? tx.amount : tx.total } { symbol }</div>
-            </div>
-        );
-    });
-
-
-    return (
-        <div className="pending-transactions">
-            <H2>Pending transactions</H2>
-            { pendingTxs }
-        </div>
-    );
-};
-
-export default PendingTransactions;
\ No newline at end of file
diff --git a/src/js/views/index.js b/src/js/views/index.js
index eb3e63a8..2dbaf3e7 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -6,20 +6,23 @@ import { ConnectedRouter } from 'react-router-redux';
 
 import ErrorBoundary from 'support/ErrorBoundary';
 
-import WalletContainer from 'components/wallet';
+import WalletContainer from 'views/Device';
 import BootloaderContainer from 'components/wallet/pages/Bootloader';
 import InitializeContainer from 'components/wallet/pages/Initialize';
 import AcquireContainer from 'components/wallet/pages/Acquire';
 import UnreadableDeviceContainer from 'components/wallet/pages/UnreadableDevice';
 
 import DashboardContainer from 'components/wallet/pages/Dashboard';
-import SummaryContainer from 'components/wallet/account/summary';
-import SendFormContainer from 'components/wallet/account/send';
-import ReceiveContainer from 'components/wallet/account/receive';
-import SignVerifyContainer from 'components/wallet/account/sign/SignVerify';
+
 import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
 import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
 import LandingContainer from 'views/Landing/Container';
+
+import SignVerifyContainer from './Device/components/Sign';
+import ReceiveContainer from './Device/components/Receive/Container';
+import SendFormContainer from './Device/components/Send/Container';
+import SummaryContainer from './Device/components/Summary/Container';
+
 import store, { history } from '../store';
 
 const App = () => (
@@ -30,8 +33,8 @@ const App = () => (
                 <Route exact path="/bridge" component={LandingContainer} />
                 <Route exact path="/import" component={LandingContainer} />
                 <Route>
-                    <WalletContainer>
-                        <ErrorBoundary>
+                    <ErrorBoundary>
+                        <WalletContainer>
                             <Route exact path="/settings" component={WalletSettingsContainer} />
                             <Route exact path="/device/:device/" component={DashboardContainer} />
                             <Route exact path="/device/:device/network/:network" component={DashboardContainer} />
@@ -45,8 +48,8 @@ const App = () => (
                             <Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} />
                             <Route path="/device/:device/network/:network/account/:account/receive" component={ReceiveContainer} />
                             <Route path="/device/:device/network/:network/account/:account/signverify" component={SignVerifyContainer} />
-                        </ErrorBoundary>
-                    </WalletContainer>
+                        </WalletContainer>
+                    </ErrorBoundary>
                 </Route>
             </Switch>
         </ConnectedRouter>

From f9a6bed330af4052177e938307146bc5c3175534 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 16:02:23 +0200
Subject: [PATCH 066/103] device to wallet

---
 src/js/views/{Device => Wallet}/Container.js           |  0
 .../components/LeftNavigation/Container.js             |  0
 .../components/LeftNavigation/Divider/index.js         |  0
 .../components/LeftNavigation/Row/index.js             |  0
 .../LeftNavigation/Selection}/AccountSelection.js      |  0
 .../LeftNavigation/Selection}/CoinSelection.js         |  0
 .../LeftNavigation/Selection}/DeviceSelection.js       |  0
 .../components/LeftNavigation/Selection/index.js       |  0
 .../components/LeftNavigation/StickyContainer/index.js |  0
 .../components/LeftNavigation/common.js                |  0
 .../components/LeftNavigation/index.js                 |  0
 .../{Device => Wallet}/components/Receive/Container.js |  0
 .../{Device => Wallet}/components/Receive/index.js     |  0
 .../components/SelectedAccount/index.js                |  0
 .../{Device => Wallet}/components/Send/Container.js    |  0
 .../components/Send/components/AdvancedForm.js         |  0
 .../components/Send/components/CoinSelectOption.js     |  0
 .../components/Send/components/FeeSelect.js            |  0
 .../components/Send/components/PendingTransactions.js  |  0
 .../views/{Device => Wallet}/components/Send/index.js  |  0
 .../views/{Device => Wallet}/components/Sign/index.js  |  0
 .../{Device => Wallet}/components/Summary/Container.js |  0
 .../components/Summary/components/Details/index.js     |  0
 .../components/Summary/components/Tokens/index.js      |  0
 .../{Device => Wallet}/components/Summary/index.js     |  0
 .../views/{Device => Wallet}/components/Tabs/index.js  |  0
 src/js/views/{Device => Wallet}/index.js               |  0
 src/js/views/index.js                                  | 10 +++++-----
 28 files changed, 5 insertions(+), 5 deletions(-)
 rename src/js/views/{Device => Wallet}/Container.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/Container.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/Divider/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/Row/index.js (100%)
 rename src/js/views/{Device/components/LeftNavigation/selection => Wallet/components/LeftNavigation/Selection}/AccountSelection.js (100%)
 rename src/js/views/{Device/components/LeftNavigation/selection => Wallet/components/LeftNavigation/Selection}/CoinSelection.js (100%)
 rename src/js/views/{Device/components/LeftNavigation/selection => Wallet/components/LeftNavigation/Selection}/DeviceSelection.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/Selection/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/StickyContainer/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/common.js (100%)
 rename src/js/views/{Device => Wallet}/components/LeftNavigation/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Receive/Container.js (100%)
 rename src/js/views/{Device => Wallet}/components/Receive/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/SelectedAccount/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Send/Container.js (100%)
 rename src/js/views/{Device => Wallet}/components/Send/components/AdvancedForm.js (100%)
 rename src/js/views/{Device => Wallet}/components/Send/components/CoinSelectOption.js (100%)
 rename src/js/views/{Device => Wallet}/components/Send/components/FeeSelect.js (100%)
 rename src/js/views/{Device => Wallet}/components/Send/components/PendingTransactions.js (100%)
 rename src/js/views/{Device => Wallet}/components/Send/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Sign/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Summary/Container.js (100%)
 rename src/js/views/{Device => Wallet}/components/Summary/components/Details/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Summary/components/Tokens/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Summary/index.js (100%)
 rename src/js/views/{Device => Wallet}/components/Tabs/index.js (100%)
 rename src/js/views/{Device => Wallet}/index.js (100%)

diff --git a/src/js/views/Device/Container.js b/src/js/views/Wallet/Container.js
similarity index 100%
rename from src/js/views/Device/Container.js
rename to src/js/views/Wallet/Container.js
diff --git a/src/js/views/Device/components/LeftNavigation/Container.js b/src/js/views/Wallet/components/LeftNavigation/Container.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/Container.js
rename to src/js/views/Wallet/components/LeftNavigation/Container.js
diff --git a/src/js/views/Device/components/LeftNavigation/Divider/index.js b/src/js/views/Wallet/components/LeftNavigation/Divider/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/Divider/index.js
rename to src/js/views/Wallet/components/LeftNavigation/Divider/index.js
diff --git a/src/js/views/Device/components/LeftNavigation/Row/index.js b/src/js/views/Wallet/components/LeftNavigation/Row/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/Row/index.js
rename to src/js/views/Wallet/components/LeftNavigation/Row/index.js
diff --git a/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
rename to src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
diff --git a/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
rename to src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
diff --git a/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/DeviceSelection.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
rename to src/js/views/Wallet/components/LeftNavigation/Selection/DeviceSelection.js
diff --git a/src/js/views/Device/components/LeftNavigation/Selection/index.js b/src/js/views/Wallet/components/LeftNavigation/Selection/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/Selection/index.js
rename to src/js/views/Wallet/components/LeftNavigation/Selection/index.js
diff --git a/src/js/views/Device/components/LeftNavigation/StickyContainer/index.js b/src/js/views/Wallet/components/LeftNavigation/StickyContainer/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/StickyContainer/index.js
rename to src/js/views/Wallet/components/LeftNavigation/StickyContainer/index.js
diff --git a/src/js/views/Device/components/LeftNavigation/common.js b/src/js/views/Wallet/components/LeftNavigation/common.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/common.js
rename to src/js/views/Wallet/components/LeftNavigation/common.js
diff --git a/src/js/views/Device/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
similarity index 100%
rename from src/js/views/Device/components/LeftNavigation/index.js
rename to src/js/views/Wallet/components/LeftNavigation/index.js
diff --git a/src/js/views/Device/components/Receive/Container.js b/src/js/views/Wallet/components/Receive/Container.js
similarity index 100%
rename from src/js/views/Device/components/Receive/Container.js
rename to src/js/views/Wallet/components/Receive/Container.js
diff --git a/src/js/views/Device/components/Receive/index.js b/src/js/views/Wallet/components/Receive/index.js
similarity index 100%
rename from src/js/views/Device/components/Receive/index.js
rename to src/js/views/Wallet/components/Receive/index.js
diff --git a/src/js/views/Device/components/SelectedAccount/index.js b/src/js/views/Wallet/components/SelectedAccount/index.js
similarity index 100%
rename from src/js/views/Device/components/SelectedAccount/index.js
rename to src/js/views/Wallet/components/SelectedAccount/index.js
diff --git a/src/js/views/Device/components/Send/Container.js b/src/js/views/Wallet/components/Send/Container.js
similarity index 100%
rename from src/js/views/Device/components/Send/Container.js
rename to src/js/views/Wallet/components/Send/Container.js
diff --git a/src/js/views/Device/components/Send/components/AdvancedForm.js b/src/js/views/Wallet/components/Send/components/AdvancedForm.js
similarity index 100%
rename from src/js/views/Device/components/Send/components/AdvancedForm.js
rename to src/js/views/Wallet/components/Send/components/AdvancedForm.js
diff --git a/src/js/views/Device/components/Send/components/CoinSelectOption.js b/src/js/views/Wallet/components/Send/components/CoinSelectOption.js
similarity index 100%
rename from src/js/views/Device/components/Send/components/CoinSelectOption.js
rename to src/js/views/Wallet/components/Send/components/CoinSelectOption.js
diff --git a/src/js/views/Device/components/Send/components/FeeSelect.js b/src/js/views/Wallet/components/Send/components/FeeSelect.js
similarity index 100%
rename from src/js/views/Device/components/Send/components/FeeSelect.js
rename to src/js/views/Wallet/components/Send/components/FeeSelect.js
diff --git a/src/js/views/Device/components/Send/components/PendingTransactions.js b/src/js/views/Wallet/components/Send/components/PendingTransactions.js
similarity index 100%
rename from src/js/views/Device/components/Send/components/PendingTransactions.js
rename to src/js/views/Wallet/components/Send/components/PendingTransactions.js
diff --git a/src/js/views/Device/components/Send/index.js b/src/js/views/Wallet/components/Send/index.js
similarity index 100%
rename from src/js/views/Device/components/Send/index.js
rename to src/js/views/Wallet/components/Send/index.js
diff --git a/src/js/views/Device/components/Sign/index.js b/src/js/views/Wallet/components/Sign/index.js
similarity index 100%
rename from src/js/views/Device/components/Sign/index.js
rename to src/js/views/Wallet/components/Sign/index.js
diff --git a/src/js/views/Device/components/Summary/Container.js b/src/js/views/Wallet/components/Summary/Container.js
similarity index 100%
rename from src/js/views/Device/components/Summary/Container.js
rename to src/js/views/Wallet/components/Summary/Container.js
diff --git a/src/js/views/Device/components/Summary/components/Details/index.js b/src/js/views/Wallet/components/Summary/components/Details/index.js
similarity index 100%
rename from src/js/views/Device/components/Summary/components/Details/index.js
rename to src/js/views/Wallet/components/Summary/components/Details/index.js
diff --git a/src/js/views/Device/components/Summary/components/Tokens/index.js b/src/js/views/Wallet/components/Summary/components/Tokens/index.js
similarity index 100%
rename from src/js/views/Device/components/Summary/components/Tokens/index.js
rename to src/js/views/Wallet/components/Summary/components/Tokens/index.js
diff --git a/src/js/views/Device/components/Summary/index.js b/src/js/views/Wallet/components/Summary/index.js
similarity index 100%
rename from src/js/views/Device/components/Summary/index.js
rename to src/js/views/Wallet/components/Summary/index.js
diff --git a/src/js/views/Device/components/Tabs/index.js b/src/js/views/Wallet/components/Tabs/index.js
similarity index 100%
rename from src/js/views/Device/components/Tabs/index.js
rename to src/js/views/Wallet/components/Tabs/index.js
diff --git a/src/js/views/Device/index.js b/src/js/views/Wallet/index.js
similarity index 100%
rename from src/js/views/Device/index.js
rename to src/js/views/Wallet/index.js
diff --git a/src/js/views/index.js b/src/js/views/index.js
index 2dbaf3e7..087754bc 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -6,7 +6,7 @@ import { ConnectedRouter } from 'react-router-redux';
 
 import ErrorBoundary from 'support/ErrorBoundary';
 
-import WalletContainer from 'views/Device';
+import WalletContainer from 'views/Wallet';
 import BootloaderContainer from 'components/wallet/pages/Bootloader';
 import InitializeContainer from 'components/wallet/pages/Initialize';
 import AcquireContainer from 'components/wallet/pages/Acquire';
@@ -18,10 +18,10 @@ import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
 import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
 import LandingContainer from 'views/Landing/Container';
 
-import SignVerifyContainer from './Device/components/Sign';
-import ReceiveContainer from './Device/components/Receive/Container';
-import SendFormContainer from './Device/components/Send/Container';
-import SummaryContainer from './Device/components/Summary/Container';
+import SignVerifyContainer from './Wallet/components/Sign';
+import ReceiveContainer from './Wallet/components/Receive/Container';
+import SendFormContainer from './Wallet/components/Send/Container';
+import SummaryContainer from './Wallet/components/Summary/Container';
 
 import store, { history } from '../store';
 

From bf452ae054fd81136fc611af011e8f7b5fd574b6 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 16:09:56 +0200
Subject: [PATCH 067/103] Common components refactored

---
 .../components/{common/Button.js => Button/index.js}   |  0
 .../components/{common/Footer.js => Footer/index.js}   |  0
 .../components/{common/Header.js => Header/index.js}   |  0
 .../components/{common/Heading.js => Heading/index.js} |  0
 src/js/components/{common/Icon.js => Icon/index.js}    |  0
 .../{common/LoaderCircle.js => LoaderCircle/index.js}  |  0
 src/js/components/{common/Log.js => Log/index.js}      |  2 +-
 .../{common/Notification.js => Notification/index.js}  |  4 ++--
 src/js/components/modal/RememberDevice.js              |  2 +-
 src/js/components/wallet/pages/Acquire.js              |  2 +-
 src/js/components/wallet/pages/Bootloader.js           |  2 +-
 src/js/components/wallet/pages/Dashboard.js            |  2 +-
 src/js/components/wallet/pages/DeviceSettings.js       |  6 +++---
 src/js/components/wallet/pages/Initialize.js           |  2 +-
 src/js/components/wallet/pages/UnreadableDevice.js     |  2 +-
 src/js/views/Landing/components/ConnectDevice.js       |  2 +-
 src/js/views/Landing/components/Preloader.js           |  2 +-
 src/js/views/Landing/index.js                          | 10 +++++-----
 .../LeftNavigation/Selection/AccountSelection.js       |  2 +-
 .../LeftNavigation/Selection/CoinSelection.js          |  6 ++----
 src/js/views/Wallet/components/Receive/index.js        |  4 ++--
 .../views/Wallet/components/SelectedAccount/index.js   |  2 +-
 .../components/Send/components/PendingTransactions.js  |  2 +-
 src/js/views/Wallet/components/Send/index.js           |  2 +-
 src/js/views/Wallet/components/Sign/index.js           |  2 +-
 src/js/views/Wallet/components/Summary/index.js        |  4 ++--
 src/js/views/Wallet/index.js                           |  8 ++++----
 27 files changed, 34 insertions(+), 36 deletions(-)
 rename src/js/components/{common/Button.js => Button/index.js} (100%)
 rename src/js/components/{common/Footer.js => Footer/index.js} (100%)
 rename src/js/components/{common/Header.js => Header/index.js} (100%)
 rename src/js/components/{common/Heading.js => Heading/index.js} (100%)
 rename src/js/components/{common/Icon.js => Icon/index.js} (100%)
 rename src/js/components/{common/LoaderCircle.js => LoaderCircle/index.js} (100%)
 rename src/js/components/{common/Log.js => Log/index.js} (94%)
 rename src/js/components/{common/Notification.js => Notification/index.js} (96%)

diff --git a/src/js/components/common/Button.js b/src/js/components/Button/index.js
similarity index 100%
rename from src/js/components/common/Button.js
rename to src/js/components/Button/index.js
diff --git a/src/js/components/common/Footer.js b/src/js/components/Footer/index.js
similarity index 100%
rename from src/js/components/common/Footer.js
rename to src/js/components/Footer/index.js
diff --git a/src/js/components/common/Header.js b/src/js/components/Header/index.js
similarity index 100%
rename from src/js/components/common/Header.js
rename to src/js/components/Header/index.js
diff --git a/src/js/components/common/Heading.js b/src/js/components/Heading/index.js
similarity index 100%
rename from src/js/components/common/Heading.js
rename to src/js/components/Heading/index.js
diff --git a/src/js/components/common/Icon.js b/src/js/components/Icon/index.js
similarity index 100%
rename from src/js/components/common/Icon.js
rename to src/js/components/Icon/index.js
diff --git a/src/js/components/common/LoaderCircle.js b/src/js/components/LoaderCircle/index.js
similarity index 100%
rename from src/js/components/common/LoaderCircle.js
rename to src/js/components/LoaderCircle/index.js
diff --git a/src/js/components/common/Log.js b/src/js/components/Log/index.js
similarity index 94%
rename from src/js/components/common/Log.js
rename to src/js/components/Log/index.js
index 910730d4..76705020 100644
--- a/src/js/components/common/Log.js
+++ b/src/js/components/Log/index.js
@@ -4,7 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import * as LogActions from 'actions/LogActions';
 import type { State, Dispatch } from 'flowtype';
diff --git a/src/js/components/common/Notification.js b/src/js/components/Notification/index.js
similarity index 96%
rename from src/js/components/common/Notification.js
rename to src/js/components/Notification/index.js
index 622d4e7d..e8cabff1 100644
--- a/src/js/components/common/Notification.js
+++ b/src/js/components/Notification/index.js
@@ -2,14 +2,14 @@
 
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as NOTIFICATION from 'actions/constants/notification';
 import * as NotificationActions from 'actions/NotificationActions';
 import type { Action, State, Dispatch } from 'flowtype';
-import Loader from './LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 type Props = {
     notifications: $ElementType<State, 'notifications'>,
diff --git a/src/js/components/modal/RememberDevice.js b/src/js/components/modal/RememberDevice.js
index cc889720..e53ae213 100644
--- a/src/js/components/modal/RememberDevice.js
+++ b/src/js/components/modal/RememberDevice.js
@@ -2,7 +2,7 @@
 
 
 import React, { Component } from 'react';
-import Loader from '../common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 import type { Props } from './index';
 
diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js
index dd0a28ae..bd5f8a90 100644
--- a/src/js/components/wallet/pages/Acquire.js
+++ b/src/js/components/wallet/pages/Acquire.js
@@ -2,7 +2,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
 import type { State, Dispatch } from 'flowtype';
diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/components/wallet/pages/Bootloader.js
index 77457187..e7a0f1f1 100644
--- a/src/js/components/wallet/pages/Bootloader.js
+++ b/src/js/components/wallet/pages/Bootloader.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/components/wallet/pages/Dashboard.js
index d526dbaf..1c59f343 100644
--- a/src/js/components/wallet/pages/Dashboard.js
+++ b/src/js/components/wallet/pages/Dashboard.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
 
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import DashboardImg from 'images/dashboard.png';
 
 const Wrapper = styled.div`
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index 2a9817e3..81f3ca3c 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
-import Icon from 'components/common/Icon';
+import { H2 } from 'components/Heading';
+import Icon from 'components/Icon';
 import colors from 'config/colors';
-import Button from 'components/common/Button';
+import Button from 'components/Button';
 import ICONS from 'config/icons';
 import { connect } from 'react-redux';
 
diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/components/wallet/pages/Initialize.js
index 3bca865c..47ec5d8b 100644
--- a/src/js/components/wallet/pages/Initialize.js
+++ b/src/js/components/wallet/pages/Initialize.js
@@ -1,5 +1,5 @@
 /* @flow */
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/components/wallet/pages/UnreadableDevice.js
index a76279f4..26f03952 100644
--- a/src/js/components/wallet/pages/UnreadableDevice.js
+++ b/src/js/components/wallet/pages/UnreadableDevice.js
@@ -4,7 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
 import type { State, Dispatch } from 'flowtype';
diff --git a/src/js/views/Landing/components/ConnectDevice.js b/src/js/views/Landing/components/ConnectDevice.js
index 71d22c2e..fc007576 100644
--- a/src/js/views/Landing/components/ConnectDevice.js
+++ b/src/js/views/Landing/components/ConnectDevice.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import type { State, TrezorDevice } from 'flowtype';
 
diff --git a/src/js/views/Landing/components/Preloader.js b/src/js/views/Landing/components/Preloader.js
index f7d41e7f..3eee746d 100644
--- a/src/js/views/Landing/components/Preloader.js
+++ b/src/js/views/Landing/components/Preloader.js
@@ -2,7 +2,7 @@
 
 
 import React from 'react';
-import Loader from 'components/common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 export default (props: {}): React$Element<string> => (
     <section className="landing">
diff --git a/src/js/views/Landing/index.js b/src/js/views/Landing/index.js
index 6366419e..2b09328d 100644
--- a/src/js/views/Landing/index.js
+++ b/src/js/views/Landing/index.js
@@ -1,11 +1,11 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
-import Header from 'components/common/Header';
-import Footer from 'components/common/Footer';
-import Log from 'components/common/Log';
-import Notifications, { Notification } from 'components/common/Notification';
+import { H2 } from 'components/Heading';
+import Header from 'components/Header';
+import Footer from 'components/Footer';
+import Log from 'components/Log';
+import Notifications, { Notification } from 'components/Notification';
 
 import Preloader from './components/Preloader';
 import ConnectDevice from './components/ConnectDevice';
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
index c43ee67a..a90eb436 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
+++ b/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
@@ -7,7 +7,7 @@ import BigNumber from 'bignumber.js';
 
 import { findDeviceAccounts } from 'reducers/AccountsReducer';
 import * as stateUtils from 'reducers/utils';
-import Loader from 'components/common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
 import colors from 'config/colors';
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
index c3cafddb..d98f72e5 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
+++ b/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
@@ -1,15 +1,13 @@
 /* @flow */
 import coins from 'constants/coins';
 import colors from 'config/colors';
-import { FONT_SIZE } from 'config/variables';
-import Icon from 'components/common/Icon';
+import { FONT_SIZE, ICON_SIZE } from 'config/variables';
+import Icon from 'components/Icon';
 import ICONS from 'config/icons';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import styled from 'styled-components';
-
-import { ICON_SIZE } from 'config/variables';
 import { coinProp } from '../common';
 import Divider from '../Divider';
 import Row from '../Row';
diff --git a/src/js/views/Wallet/components/Receive/index.js b/src/js/views/Wallet/components/Receive/index.js
index 4873496c..13a8a9e8 100644
--- a/src/js/views/Wallet/components/Receive/index.js
+++ b/src/js/views/Wallet/components/Receive/index.js
@@ -1,12 +1,12 @@
 /* @flow */
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import Tooltip from 'rc-tooltip';
 import { QRCode } from 'react-qr-svg';
 
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import SelectedAccount from '../SelectedAccount';
 
 import type { Props } from './index';
diff --git a/src/js/views/Wallet/components/SelectedAccount/index.js b/src/js/views/Wallet/components/SelectedAccount/index.js
index 1fdd6c92..49ff21c2 100644
--- a/src/js/views/Wallet/components/SelectedAccount/index.js
+++ b/src/js/views/Wallet/components/SelectedAccount/index.js
@@ -2,7 +2,7 @@
 
 
 import * as React from 'react';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 
 import type {
     State, TrezorDevice, Action, ThunkAction,
diff --git a/src/js/views/Wallet/components/Send/components/PendingTransactions.js b/src/js/views/Wallet/components/Send/components/PendingTransactions.js
index e7783bdd..6f23da7e 100644
--- a/src/js/views/Wallet/components/Send/components/PendingTransactions.js
+++ b/src/js/views/Wallet/components/Send/components/PendingTransactions.js
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import ColorHash from 'color-hash';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import ScaleText from 'react-scale-text';
 
 import { findAccountTokens } from 'reducers/TokensReducer';
diff --git a/src/js/views/Wallet/components/Send/index.js b/src/js/views/Wallet/components/Send/index.js
index f2f028a4..f9caeefe 100644
--- a/src/js/views/Wallet/components/Send/index.js
+++ b/src/js/views/Wallet/components/Send/index.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import Select from 'react-select';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { calculate, validation } from 'actions/SendFormActions';
 import type { Token } from 'flowtype';
 import AdvancedForm from './components/AdvancedForm';
diff --git a/src/js/views/Wallet/components/Sign/index.js b/src/js/views/Wallet/components/Sign/index.js
index 566cfa69..53a8fe78 100644
--- a/src/js/views/Wallet/components/Sign/index.js
+++ b/src/js/views/Wallet/components/Sign/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import colors from 'config/colors';
 
 const Wrapper = styled.div`
diff --git a/src/js/views/Wallet/components/Summary/index.js b/src/js/views/Wallet/components/Summary/index.js
index 4ce20314..c64dc3c0 100644
--- a/src/js/views/Wallet/components/Summary/index.js
+++ b/src/js/views/Wallet/components/Summary/index.js
@@ -1,13 +1,13 @@
 /* @flow */
 import styled from 'styled-components';
 import React, { Component } from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import BigNumber from 'bignumber.js';
 import { Async as AsyncSelect } from 'react-select';
 import Tooltip from 'rc-tooltip';
 
 import { resolveAfter } from 'utils/promiseUtils';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as stateUtils from 'reducers/utils';
 import type { NetworkToken } from 'reducers/LocalStorageReducer';
 import SelectedAccount from '../SelectedAccount';
diff --git a/src/js/views/Wallet/index.js b/src/js/views/Wallet/index.js
index c5712842..e4417966 100644
--- a/src/js/views/Wallet/index.js
+++ b/src/js/views/Wallet/index.js
@@ -7,12 +7,12 @@ import { Route, withRouter } from 'react-router-dom';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
-import Header from 'components/common/Header';
-import Footer from 'components/common/Footer';
+import Header from 'components/Header';
+import Footer from 'components/Footer';
 import DeviceSettingsTabs from 'components/wallet/pages/DeviceSettingsTabs';
 import ModalContainer from 'components/modal';
-import Notifications from 'components/common/Notification';
-import Log from 'components/common/Log';
+import Notifications from 'components/Notification';
+import Log from 'components/Log';
 
 import LeftNavigation from './components/LeftNavigation/Container';
 import AccountTabs from './components/Tabs';

From 65479c86085d024f86d8e242371d26f1d592a05b Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 16:12:18 +0200
Subject: [PATCH 068/103] Config flow to recognise babel aliases

---
 .flowconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.flowconfig b/.flowconfig
index 59ad41d9..faae2174 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -30,4 +30,14 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue
 esproposal.decorators=ignore
 module.name_mapper='.*\(.less\)' -> 'CSSModule'
 module.name_mapper='^\(~/\)' -> '<PROJECT_ROOT>/src/'
+module.name_mapper='^universal' -> '<PROJECT_ROOT>/src/'
+module.name_mapper='^config' -> '<PROJECT_ROOT>/src/js/config'
+module.name_mapper='^constants' -> '<PROJECT_ROOT>/src/js/constants'
+module.name_mapper='^components' -> '<PROJECT_ROOT>/src/js/components'
+module.name_mapper='^actions' -> '<PROJECT_ROOT>/src/js/actions'
+module.name_mapper='^reducers' -> '<PROJECT_ROOT>/src/js/reducers'
+module.name_mapper='^support' -> '<PROJECT_ROOT>/src/js/support'
+module.name_mapper='^utils' -> '<PROJECT_ROOT>/src/js/utils'
+module.name_mapper='^services' -> '<PROJECT_ROOT>/src/js/services'
+module.name_mapper='^views' -> '<PROJECT_ROOT>/src/js/views'
 module.system=haste

From 87d485cf828d587d598627119dcdcf2a0245607b Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 16:12:32 +0200
Subject: [PATCH 069/103] Cleanup & eslint error fixes

---
 .../components/LeftNavigation/Container.js    | 27 ++-------------
 .../components/LeftNavigation/Row/index.js    |  1 -
 .../components/LeftNavigation/common.js       | 34 +++++++++++++++----
 .../selection/AccountSelection.js             | 24 ++++++-------
 .../LeftNavigation/selection/CoinSelection.js | 16 ++++-----
 .../selection/DeviceSelection.js              | 10 +++---
 6 files changed, 50 insertions(+), 62 deletions(-)

diff --git a/src/js/views/Device/components/LeftNavigation/Container.js b/src/js/views/Device/components/LeftNavigation/Container.js
index c22d2b19..7a5fa81a 100644
--- a/src/js/views/Device/components/LeftNavigation/Container.js
+++ b/src/js/views/Device/components/LeftNavigation/Container.js
@@ -8,35 +8,14 @@ import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
+import type { StateProps, DispatchProps } from './common';
+
 import LeftNavigation from './index';
 
 type OwnProps = {
 
 }
 
-type StateProps = {
-    connect: $ElementType<State, 'connect'>,
-    accounts: $ElementType<State, 'accounts'>,
-    router: $ElementType<State, 'router'>,
-    deviceDropdownOpened: boolean,
-    fiat: $ElementType<State, 'fiat'>,
-    localStorage: $ElementType<State, 'localStorage'>,
-    discovery: $ElementType<State, 'discovery'>,
-    wallet: $ElementType<State, 'wallet'>,
-    devices: $ElementType<State, 'devices'>,
-    pending: $ElementType<State, 'pending'>,
-}
-
-type DispatchProps = {
-    toggleDeviceDropdown: typeof toggleDeviceDropdown,
-    addAccount: typeof TrezorConnectActions.addAccount,
-    acquireDevice: typeof TrezorConnectActions.acquire,
-    forgetDevice: typeof TrezorConnectActions.forget,
-    duplicateDevice: typeof TrezorConnectActions.duplicateDevice,
-    gotoDeviceSettings: typeof TrezorConnectActions.gotoDeviceSettings,
-    onSelectDevice: typeof TrezorConnectActions.onSelectDevice,
-}
-
 const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State, own: OwnProps): StateProps => ({
     connect: state.connect,
     accounts: state.accounts,
@@ -63,4 +42,4 @@ const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps>
 
 export default withRouter(
     connect(mapStateToProps, mapDispatchToProps)(LeftNavigation),
-);
\ No newline at end of file
+);
diff --git a/src/js/views/Device/components/LeftNavigation/Row/index.js b/src/js/views/Device/components/LeftNavigation/Row/index.js
index 6436531f..de5f8209 100644
--- a/src/js/views/Device/components/LeftNavigation/Row/index.js
+++ b/src/js/views/Device/components/LeftNavigation/Row/index.js
@@ -2,7 +2,6 @@ import styled, { css } from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import colors from 'config/colors';
 import { TRANSITION_TIME } from 'config/variables';
 
 const Wrapper = styled.div`
diff --git a/src/js/views/Device/components/LeftNavigation/common.js b/src/js/views/Device/components/LeftNavigation/common.js
index b8d60525..4a5a8f72 100644
--- a/src/js/views/Device/components/LeftNavigation/common.js
+++ b/src/js/views/Device/components/LeftNavigation/common.js
@@ -1,8 +1,28 @@
-import PropTypes from 'prop-types';
+/* @flow */
+import * as TrezorConnectActions from 'actions/TrezorConnectActions';
+import { toggleDeviceDropdown } from 'actions/WalletActions';
 
-export const coinProp = {
-    coin: PropTypes.shape({
-        img: PropTypes.string.isRequired,
-        name: PropTypes.string.isRequired,
-    }).isRequired,
-};
+export type StateProps = {
+    connect: $ElementType<State, 'connect'>,
+    accounts: $ElementType<State, 'accounts'>,
+    router: $ElementType<State, 'router'>,
+    deviceDropdownOpened: boolean,
+    fiat: $ElementType<State, 'fiat'>,
+    localStorage: $ElementType<State, 'localStorage'>,
+    discovery: $ElementType<State, 'discovery'>,
+    wallet: $ElementType<State, 'wallet'>,
+    devices: $ElementType<State, 'devices'>,
+    pending: $ElementType<State, 'pending'>,
+}
+
+export type DispatchProps = {
+    toggleDeviceDropdown: typeof toggleDeviceDropdown,
+    addAccount: typeof TrezorConnectActions.addAccount,
+    acquireDevice: typeof TrezorConnectActions.acquire,
+    forgetDevice: typeof TrezorConnectActions.forget,
+    duplicateDevice: typeof TrezorConnectActions.duplicateDevice,
+    gotoDeviceSettings: typeof TrezorConnectActions.gotoDeviceSettings,
+    onSelectDevice: typeof TrezorConnectActions.onSelectDevice,
+}
+
+export type Props = StateProps & DispatchProps;
\ No newline at end of file
diff --git a/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js b/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
index c43ee67a..d9243213 100644
--- a/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
+++ b/src/js/views/Device/components/LeftNavigation/selection/AccountSelection.js
@@ -1,26 +1,22 @@
 /* @flow */
-
-
-import React, { PureComponent } from 'react';
-import { Link, NavLink } from 'react-router-dom';
 import BigNumber from 'bignumber.js';
-
-import { findDeviceAccounts } from 'reducers/AccountsReducer';
-import * as stateUtils from 'reducers/utils';
+import colors from 'config/colors';
 import Loader from 'components/common/LoaderCircle';
+import PropTypes from 'prop-types';
+import React from 'react';
+import styled, { css } from 'styled-components';
+import * as stateUtils from 'reducers/utils';
 import Tooltip from 'rc-tooltip';
 
-import colors from 'config/colors';
+import { NavLink } from 'react-router-dom';
+import { findDeviceAccounts } from 'reducers/AccountsReducer';
 import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
-import styled, { css } from 'styled-components';
-import Row from '../Row';
-import PropTypes from 'prop-types';
 
-//import AsideRowAccount from './row/account/AsideRowAccount';
-
-import type { TrezorDevice, Accounts } from 'flowtype';
+import type { Accounts } from 'flowtype';
 import type { Props } from './index';
 
+import Row from '../Row';
+
 const RowAccountWrapper = styled.div`
     height: 64px;
 
diff --git a/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js b/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
index c3cafddb..b86466c9 100644
--- a/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
+++ b/src/js/views/Device/components/LeftNavigation/selection/CoinSelection.js
@@ -1,7 +1,6 @@
 /* @flow */
 import coins from 'constants/coins';
 import colors from 'config/colors';
-import { FONT_SIZE } from 'config/variables';
 import Icon from 'components/common/Icon';
 import ICONS from 'config/icons';
 import { NavLink } from 'react-router-dom';
@@ -9,15 +8,11 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import styled from 'styled-components';
 
-import { ICON_SIZE } from 'config/variables';
-import { coinProp } from '../common';
+import { FONT_SIZE, ICON_SIZE } from 'config/variables';
+
 import Divider from '../Divider';
 import Row from '../Row';
 
-import type { TrezorDevice } from 'flowtype';
-import type { Props } from './index';
-
-
 const CoinNameWrapper = styled.div`
     display: flex;
     align-items: center;
@@ -43,7 +38,6 @@ const CoinName = ({
         <p>{text}</p>
     </CoinNameWrapper>
 );
-
 CoinName.propTypes = {
     coinImg: PropTypes.string.isRequired,
     text: PropTypes.string.isRequired,
@@ -77,9 +71,11 @@ const RowCoin = ({
         </Row>
     </RowCoinWrapper>
 );
-
 RowCoin.propTypes = {
-    ...coinProp,
+    coin: PropTypes.shape({
+        img: PropTypes.string.isRequired,
+        name: PropTypes.string.isRequired,
+    }).isRequired,
     icon: PropTypes.shape({
         type: PropTypes.string.isRequired,
         color: PropTypes.string.isRequired,
diff --git a/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js b/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
index 276da1bc..06c60079 100644
--- a/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
+++ b/src/js/views/Device/components/LeftNavigation/selection/DeviceSelection.js
@@ -1,14 +1,12 @@
 /* @flow */
-
-
 import React, { Component } from 'react';
-import Select from 'react-select';
 import TrezorConnect from 'trezor-connect';
 
-import AsideDivider from '../Divider';
-
 import type { TrezorDevice } from 'flowtype';
-import type { Props } from './index';
+
+import type { Props } from '../common';
+
+import AsideDivider from '../Divider';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;

From 113b2535e0a5ebd7d1c78abc929f8befe3761fdf Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 16:26:44 +0200
Subject: [PATCH 070/103] Rename 'Selection' components to 'Menu' in
 'LeftNavigation'

---
 .../AccountMenu/index.js}                     | 36 +++++++-------
 .../CoinMenu/index.js}                        | 48 +++++++++----------
 .../DeviceMenu/index.js}                      |  0
 .../LeftNavigation/NavigationMenu/index.js    |  4 ++
 .../LeftNavigation/Selection/index.js         |  4 --
 .../Wallet/components/LeftNavigation/index.js | 14 +++---
 6 files changed, 53 insertions(+), 53 deletions(-)
 rename src/js/views/Wallet/components/LeftNavigation/{Selection/AccountSelection.js => NavigationMenu/AccountMenu/index.js} (91%)
 rename src/js/views/Wallet/components/LeftNavigation/{Selection/CoinSelection.js => NavigationMenu/CoinMenu/index.js} (86%)
 rename src/js/views/Wallet/components/LeftNavigation/{Selection/DeviceSelection.js => NavigationMenu/DeviceMenu/index.js} (100%)
 create mode 100644 src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js
 delete mode 100644 src/js/views/Wallet/components/LeftNavigation/Selection/index.js

diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
similarity index 91%
rename from src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
rename to src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
index eecbff04..611ff1fd 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
@@ -45,22 +45,22 @@ const RowAccountWrapper = styled.div`
 const RowAccount = ({
     accountIndex, balance, url, isSelected = false,
 }) => (
-    <NavLink to={url}>
-        <RowAccountWrapper
-            to={url}
-            isSelected={isSelected}
-        >
-            <Row column>
-                Account #{accountIndex + 1}
-                {balance ? (
-                    <span>{balance}</span>
-                ) : (
-                    <span>Loading...</span>
-                )}
-            </Row>
-        </RowAccountWrapper>
-    </NavLink>
-);
+        <NavLink to={url}>
+            <RowAccountWrapper
+                to={url}
+                isSelected={isSelected}
+            >
+                <Row column>
+                    Account #{accountIndex + 1}
+                    {balance ? (
+                        <span>{balance}</span>
+                    ) : (
+                            <span>Loading...</span>
+                        )}
+                </Row>
+            </RowAccountWrapper>
+        </NavLink>
+    );
 RowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
     url: PropTypes.string.isRequired,
@@ -68,7 +68,7 @@ RowAccount.propTypes = {
     isSelected: PropTypes.bool,
 };
 
-const AccountSelection = (props: Props): ?React$Element<string> => {
+const AccountMenu = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
     if (!selected) return null;
 
@@ -204,4 +204,4 @@ const AccountSelection = (props: Props): ?React$Element<string> => {
     );
 };
 
-export default AccountSelection;
+export default AccountMenu;
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
similarity index 86%
rename from src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
rename to src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
index 3379af09..b3b36c7a 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
@@ -31,13 +31,13 @@ const Logo = styled.div`
 const CoinName = ({
     coinImg, text,
 }) => (
-    <CoinNameWrapper>
-        <Logo
-            coinImg={coinImg}
-        />
-        <p>{text}</p>
-    </CoinNameWrapper>
-);
+        <CoinNameWrapper>
+            <Logo
+                coinImg={coinImg}
+            />
+            <p>{text}</p>
+        </CoinNameWrapper>
+    );
 CoinName.propTypes = {
     coinImg: PropTypes.string.isRequired,
     text: PropTypes.string.isRequired,
@@ -56,21 +56,21 @@ const RowCoinWrapper = styled.div`
 const RowCoin = ({
     coin, icon,
 }) => (
-    <RowCoinWrapper>
-        <Row>
-            <CoinName
-                coinImg={coin.img}
-                text={coin.name}
-            />
-            {icon && (
-                <Icon
-                    icon={icon.type}
-                    color={icon.color}
+        <RowCoinWrapper>
+            <Row>
+                <CoinName
+                    coinImg={coin.img}
+                    text={coin.name}
                 />
-            )}
-        </Row>
-    </RowCoinWrapper>
-);
+                {icon && (
+                    <Icon
+                        icon={icon.type}
+                        color={icon.color}
+                    />
+                )}
+            </Row>
+        </RowCoinWrapper>
+    );
 RowCoin.propTypes = {
     coin: PropTypes.shape({
         img: PropTypes.string.isRequired,
@@ -83,7 +83,7 @@ RowCoin.propTypes = {
 };
 
 
-class CoinSelection extends Component {
+class CoinMenu extends Component {
     getBaseUrl() {
         const { selectedDevice } = this.props.wallet;
         let baseUrl = '';
@@ -147,11 +147,11 @@ class CoinSelection extends Component {
     }
 }
 
-CoinSelection.propTypes = {
+CoinMenu.propTypes = {
     config: PropTypes.object,
     wallet: PropTypes.object,
     selectedDevice: PropTypes.object,
     localStorage: PropTypes.object,
 };
 
-export default CoinSelection;
+export default CoinMenu;
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/DeviceSelection.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
similarity index 100%
rename from src/js/views/Wallet/components/LeftNavigation/Selection/DeviceSelection.js
rename to src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js
new file mode 100644
index 00000000..aab425a4
--- /dev/null
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js
@@ -0,0 +1,4 @@
+export { default as AccountMenu } from './AccountMenu';
+export { default as CoinMenu } from './CoinMenu';
+export { DeviceSelect } from './DeviceMenu';
+export { DeviceDropdown } from './DeviceMenu';
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/index.js b/src/js/views/Wallet/components/LeftNavigation/Selection/index.js
deleted file mode 100644
index 2d5ec492..00000000
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as AccountSelection } from './AccountSelection';
-export { default as CoinSelection } from './CoinSelection';
-export { DeviceSelect } from './DeviceSelection';
-export { DeviceDropdown } from './DeviceSelection';
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 6554e706..8476eefe 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -5,11 +5,11 @@ import styled from 'styled-components';
 
 import type { TrezorDevice } from 'flowtype';
 import {
-    AccountSelection,
-    CoinSelection,
+    AccountMenu,
+    CoinMenu,
     DeviceSelect,
     DeviceDropdown,
-} from './Selection';
+} from './Menu';
 import StickyContainer from './StickyContainer';
 
 import type { Props } from './index';
@@ -72,7 +72,7 @@ const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | st
         animationType = 'slide-left';
         // menu = (
         //     <TransitionMenu animationType="slide-left">
-        //         <AccountSelection {...props} />
+        //         <AccountMenu {...props} />
         //     </TransitionMenu>
         // );
     } else if (selected.features && !selected.features.bootloader_mode && selected.features.initialized) {
@@ -81,7 +81,7 @@ const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | st
         animationType = 'slide-right';
         // menu = (
         //     <TransitionMenu animationType="slide-right">
-        //         <CoinSelection {...props} />
+        //         <CoinMenu {...props} />
         //     </TransitionMenu>
         // );
     }
@@ -97,8 +97,8 @@ const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | st
                 <TransitionMenu
                     animationType={animationType}
                 >
-                    {animationType === 'slide-left' && <AccountSelection key="accounts" {...props} />}
-                    {animationType === 'slide-right' && <CoinSelection key="coins" {...props} />}
+                    {animationType === 'slide-left' && <AccountMenu key="accounts" {...props} />}
+                    {animationType === 'slide-right' && <CoinMenu key="coins" {...props} />}
                 </TransitionMenu>
             )}
 

From 5b773041ef5ea6328941d82fda008dacdc14401a Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 16:29:14 +0200
Subject: [PATCH 071/103] common page refactored to new structure

---
 .../Wallet/views/Acquire/index.js}            |  0
 .../Wallet/views/Bootloader/index.js}         |  0
 .../Wallet/views/Dashboard/index.js}          |  0
 .../Wallet/views/DeviceSettings/index.js}     |  2 +-
 .../Wallet/views/DeviceSettingsTabs/index.js} |  0
 .../Wallet/views/Initialize/index.js}         |  0
 .../Wallet/views/UnreadableDevice/index.js}   |  0
 .../Wallet/views/WalletSettings/index.js}     |  2 +-
 src/js/views/index.js                         | 37 +++++++++----------
 9 files changed, 20 insertions(+), 21 deletions(-)
 rename src/js/{components/wallet/pages/Acquire.js => views/Wallet/views/Acquire/index.js} (100%)
 rename src/js/{components/wallet/pages/Bootloader.js => views/Wallet/views/Bootloader/index.js} (100%)
 rename src/js/{components/wallet/pages/Dashboard.js => views/Wallet/views/Dashboard/index.js} (100%)
 rename src/js/{components/wallet/pages/DeviceSettings.js => views/Wallet/views/DeviceSettings/index.js} (96%)
 rename src/js/{components/wallet/pages/DeviceSettingsTabs.js => views/Wallet/views/DeviceSettingsTabs/index.js} (100%)
 rename src/js/{components/wallet/pages/Initialize.js => views/Wallet/views/Initialize/index.js} (100%)
 rename src/js/{components/wallet/pages/UnreadableDevice.js => views/Wallet/views/UnreadableDevice/index.js} (100%)
 rename src/js/{components/wallet/pages/WalletSettings.js => views/Wallet/views/WalletSettings/index.js} (87%)

diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/views/Wallet/views/Acquire/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Acquire.js
rename to src/js/views/Wallet/views/Acquire/index.js
diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/views/Wallet/views/Bootloader/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Bootloader.js
rename to src/js/views/Wallet/views/Bootloader/index.js
diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/views/Wallet/views/Dashboard/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Dashboard.js
rename to src/js/views/Wallet/views/Dashboard/index.js
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/views/Wallet/views/DeviceSettings/index.js
similarity index 96%
rename from src/js/components/wallet/pages/DeviceSettings.js
rename to src/js/views/Wallet/views/DeviceSettings/index.js
index 81f3ca3c..b51a505e 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/views/Wallet/views/DeviceSettings/index.js
@@ -29,7 +29,7 @@ const Row = styled.div`
     padding-bottom: 98px;
 `;
 
-export const DeviceSettings = () => (
+const DeviceSettings = () => (
     <Section>
         <Row>
             <Icon
diff --git a/src/js/components/wallet/pages/DeviceSettingsTabs.js b/src/js/views/Wallet/views/DeviceSettingsTabs/index.js
similarity index 100%
rename from src/js/components/wallet/pages/DeviceSettingsTabs.js
rename to src/js/views/Wallet/views/DeviceSettingsTabs/index.js
diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/views/Wallet/views/Initialize/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Initialize.js
rename to src/js/views/Wallet/views/Initialize/index.js
diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/views/Wallet/views/UnreadableDevice/index.js
similarity index 100%
rename from src/js/components/wallet/pages/UnreadableDevice.js
rename to src/js/views/Wallet/views/UnreadableDevice/index.js
diff --git a/src/js/components/wallet/pages/WalletSettings.js b/src/js/views/Wallet/views/WalletSettings/index.js
similarity index 87%
rename from src/js/components/wallet/pages/WalletSettings.js
rename to src/js/views/Wallet/views/WalletSettings/index.js
index ee400dcc..aeda12a9 100644
--- a/src/js/components/wallet/pages/WalletSettings.js
+++ b/src/js/views/Wallet/views/WalletSettings/index.js
@@ -5,7 +5,7 @@ import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-export const WalletSettings = () => (
+const WalletSettings = () => (
     <section className="settings">
             Wallet settings
     </section>
diff --git a/src/js/views/index.js b/src/js/views/index.js
index 087754bc..279e2f65 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -5,19 +5,18 @@ import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
 
 import ErrorBoundary from 'support/ErrorBoundary';
-
-import WalletContainer from 'views/Wallet';
-import BootloaderContainer from 'components/wallet/pages/Bootloader';
-import InitializeContainer from 'components/wallet/pages/Initialize';
-import AcquireContainer from 'components/wallet/pages/Acquire';
-import UnreadableDeviceContainer from 'components/wallet/pages/UnreadableDevice';
-
-import DashboardContainer from 'components/wallet/pages/Dashboard';
-
-import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
-import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
 import LandingContainer from 'views/Landing/Container';
 
+// wallet views
+import WalletContainer from 'views/Wallet';
+import WalletDashboard from 'views/Wallet/views/Dashboard';
+import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings';
+import WalletSettings from 'views/Wallet/views/WalletSettings';
+import WalletBootloader from 'views/Wallet/views/Bootloader';
+import WalletInitialize from 'views/Wallet/views/Initialize';
+import WalletAcquire from 'views/Wallet/views/Acquire';
+import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice';
+
 import SignVerifyContainer from './Wallet/components/Sign';
 import ReceiveContainer from './Wallet/components/Receive/Container';
 import SendFormContainer from './Wallet/components/Send/Container';
@@ -35,14 +34,14 @@ const App = () => (
                 <Route>
                     <ErrorBoundary>
                         <WalletContainer>
-                            <Route exact path="/settings" component={WalletSettingsContainer} />
-                            <Route exact path="/device/:device/" component={DashboardContainer} />
-                            <Route exact path="/device/:device/network/:network" component={DashboardContainer} />
-                            <Route exact path="/device/:device/acquire" component={AcquireContainer} />
-                            <Route exact path="/device/:device/unreadable" component={UnreadableDeviceContainer} />
-                            <Route exact path="/device/:device/bootloader" component={BootloaderContainer} />
-                            <Route exact path="/device/:device/initialize" component={InitializeContainer} />
-                            <Route exact path="/device/:device/settings" component={DeviceSettingsContainer} />
+                            <Route exact path="/settings" component={WalletSettings} />
+                            <Route exact path="/device/:device/" component={WalletDashboard} />
+                            <Route exact path="/device/:device/network/:network" component={WalletDashboard} />
+                            <Route exact path="/device/:device/acquire" component={WalletAcquire} />
+                            <Route exact path="/device/:device/unreadable" component={WalletUnreadableDevice} />
+                            <Route exact path="/device/:device/bootloader" component={WalletBootloader} />
+                            <Route exact path="/device/:device/initialize" component={WalletInitialize} />
+                            <Route exact path="/device/:device/settings" component={WalletDeviceSettings} />
                             <Route exact path="/device/:device/network/:network/account/:account" component={SummaryContainer} />
                             <Route path="/device/:device/network/:network/account/:account/send" component={SendFormContainer} />
                             <Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} />

From ba0d8d4095358ba40880f9439d82efab3f874d93 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 16:31:43 +0200
Subject: [PATCH 072/103] Cleanup & fix imports

---
 .../NavigationMenu/AccountMenu/index.js       | 36 +++++++--------
 .../NavigationMenu/CoinMenu/index.js          | 46 +++++++++----------
 .../NavigationMenu/DeviceMenu/index.js        |  4 +-
 .../Wallet/components/LeftNavigation/index.js |  4 +-
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
index 611ff1fd..d582e18c 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
@@ -13,9 +13,9 @@ import { findDeviceAccounts } from 'reducers/AccountsReducer';
 import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
 
 import type { Accounts } from 'flowtype';
-import type { Props } from './index';
+import type { Props } from '../../common';
 
-import Row from '../Row';
+import Row from '../../Row';
 
 const RowAccountWrapper = styled.div`
     height: 64px;
@@ -45,22 +45,22 @@ const RowAccountWrapper = styled.div`
 const RowAccount = ({
     accountIndex, balance, url, isSelected = false,
 }) => (
-        <NavLink to={url}>
-            <RowAccountWrapper
-                to={url}
-                isSelected={isSelected}
-            >
-                <Row column>
-                    Account #{accountIndex + 1}
-                    {balance ? (
-                        <span>{balance}</span>
-                    ) : (
-                            <span>Loading...</span>
-                        )}
-                </Row>
-            </RowAccountWrapper>
-        </NavLink>
-    );
+    <NavLink to={url}>
+        <RowAccountWrapper
+            to={url}
+            isSelected={isSelected}
+        >
+            <Row column>
+                Account #{accountIndex + 1}
+                {balance ? (
+                    <span>{balance}</span>
+                ) : (
+                    <span>Loading...</span>
+                )}
+            </Row>
+        </RowAccountWrapper>
+    </NavLink>
+);
 RowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
     url: PropTypes.string.isRequired,
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
index b3b36c7a..40f257af 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
@@ -10,8 +10,8 @@ import styled from 'styled-components';
 
 import { FONT_SIZE, ICON_SIZE } from 'config/variables';
 
-import Divider from '../Divider';
-import Row from '../Row';
+import Divider from '../../Divider';
+import Row from '../../Row';
 
 const CoinNameWrapper = styled.div`
     display: flex;
@@ -31,13 +31,13 @@ const Logo = styled.div`
 const CoinName = ({
     coinImg, text,
 }) => (
-        <CoinNameWrapper>
-            <Logo
-                coinImg={coinImg}
-            />
-            <p>{text}</p>
-        </CoinNameWrapper>
-    );
+    <CoinNameWrapper>
+        <Logo
+            coinImg={coinImg}
+        />
+        <p>{text}</p>
+    </CoinNameWrapper>
+);
 CoinName.propTypes = {
     coinImg: PropTypes.string.isRequired,
     text: PropTypes.string.isRequired,
@@ -56,21 +56,21 @@ const RowCoinWrapper = styled.div`
 const RowCoin = ({
     coin, icon,
 }) => (
-        <RowCoinWrapper>
-            <Row>
-                <CoinName
-                    coinImg={coin.img}
-                    text={coin.name}
+    <RowCoinWrapper>
+        <Row>
+            <CoinName
+                coinImg={coin.img}
+                text={coin.name}
+            />
+            {icon && (
+                <Icon
+                    icon={icon.type}
+                    color={icon.color}
                 />
-                {icon && (
-                    <Icon
-                        icon={icon.type}
-                        color={icon.color}
-                    />
-                )}
-            </Row>
-        </RowCoinWrapper>
-    );
+            )}
+        </Row>
+    </RowCoinWrapper>
+);
 RowCoin.propTypes = {
     coin: PropTypes.shape({
         img: PropTypes.string.isRequired,
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
index 06c60079..1bebe707 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
@@ -4,9 +4,9 @@ import TrezorConnect from 'trezor-connect';
 
 import type { TrezorDevice } from 'flowtype';
 
-import type { Props } from '../common';
+import type { Props } from '../../common';
 
-import AsideDivider from '../Divider';
+import AsideDivider from '../../Divider';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 8476eefe..c5f979c0 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -9,10 +9,10 @@ import {
     CoinMenu,
     DeviceSelect,
     DeviceDropdown,
-} from './Menu';
+} from './NavigationMenu';
 import StickyContainer from './StickyContainer';
 
-import type { Props } from './index';
+import type { Props } from './common';
 
 type TransitionMenuProps = {
     animationType: string;

From f34291537520ac63a8757d87d24d1f40b1ea7214 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 16:35:36 +0200
Subject: [PATCH 073/103] Fix import

---
 src/js/views/Wallet/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/views/Wallet/index.js b/src/js/views/Wallet/index.js
index e4417966..36461737 100644
--- a/src/js/views/Wallet/index.js
+++ b/src/js/views/Wallet/index.js
@@ -9,10 +9,10 @@ import type { State, Dispatch } from 'flowtype';
 
 import Header from 'components/Header';
 import Footer from 'components/Footer';
-import DeviceSettingsTabs from 'components/wallet/pages/DeviceSettingsTabs';
 import ModalContainer from 'components/modal';
 import Notifications from 'components/Notification';
 import Log from 'components/Log';
+import DeviceSettingsTabs from './views/DeviceSettingsTabs';
 
 import LeftNavigation from './components/LeftNavigation/Container';
 import AccountTabs from './components/Tabs';

From a9aab60dd683b9f0d61ca305be3ac1fc7c233ad8 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 16:58:28 +0200
Subject: [PATCH 074/103] comment views strucutre

---
 src/js/views/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/js/views/index.js b/src/js/views/index.js
index 279e2f65..6d78b02f 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -4,6 +4,7 @@ import { Route, Switch } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
 
+// general
 import ErrorBoundary from 'support/ErrorBoundary';
 import LandingContainer from 'views/Landing/Container';
 
@@ -17,6 +18,7 @@ import WalletInitialize from 'views/Wallet/views/Initialize';
 import WalletAcquire from 'views/Wallet/views/Acquire';
 import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice';
 
+// wallet views - accounts
 import SignVerifyContainer from './Wallet/components/Sign';
 import ReceiveContainer from './Wallet/components/Receive/Container';
 import SendFormContainer from './Wallet/components/Send/Container';

From 503ba7eaabdc2907c43d1f51de6ee5f5f3bbc98f Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 17:08:38 +0200
Subject: [PATCH 075/103] span to styled component

---
 .../NavigationMenu/AccountMenu/index.js             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
index d582e18c..7a6a2de4 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
@@ -17,6 +17,11 @@ import type { Props } from '../../common';
 
 import Row from '../../Row';
 
+const Text = styled.span`
+    font-size: ${FONT_SIZE.SMALLER};
+    color: ${colors.TEXT_SECONDARY};
+`;
+
 const RowAccountWrapper = styled.div`
     height: 64px;
 
@@ -24,10 +29,6 @@ const RowAccountWrapper = styled.div`
     color: ${colors.TEXT_PRIMARY};
 
     border-top: 1px solid ${colors.DIVIDER};
-    span {
-        font-size: ${FONT_SIZE.SMALLER};
-        color: ${colors.TEXT_SECONDARY};
-    }
 
     ${props => props.isSelected && css`
         border-left: ${BORDER_WIDTH.SELECTED} solid ${colors.GREEN_PRIMARY};
@@ -53,9 +54,9 @@ const RowAccount = ({
             <Row column>
                 Account #{accountIndex + 1}
                 {balance ? (
-                    <span>{balance}</span>
+                    <Text>{balance}</Text>
                 ) : (
-                    <span>Loading...</span>
+                    <Text>Loading...</Text>
                 )}
             </Row>
         </RowAccountWrapper>

From d88f5b7b983ca34d782c4ec4c6efc679b4d41a10 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 18:38:57 +0200
Subject: [PATCH 076/103] Rewrited navigation rendering

---
 .../NavigationMenu/AccountMenu/index.js       |   1 +
 .../Wallet/components/LeftNavigation/index.js | 176 +++++++++---------
 2 files changed, 92 insertions(+), 85 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
index 7a6a2de4..b2d9c0b4 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
@@ -71,6 +71,7 @@ RowAccount.propTypes = {
 
 const AccountMenu = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
+    console.warn('selected', selected);
     if (!selected) return null;
 
     const { location } = props.router;
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index c5f979c0..ee2964cd 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -1,115 +1,121 @@
 /* @flow */
-import * as React from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import colors from 'config/colors';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
 
 import type { TrezorDevice } from 'flowtype';
 import {
-    AccountMenu,
-    CoinMenu,
-    DeviceSelect,
-    DeviceDropdown,
+    AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown,
 } from './NavigationMenu';
 import StickyContainer from './StickyContainer';
 
-import type { Props } from './common';
-
-type TransitionMenuProps = {
-    animationType: string;
-    children?: React.Node;
-}
-
 const TransitionGroupWrapper = styled(TransitionGroup)`
     width: 640px;
 `;
+
 const TransitionContentWrapper = styled.div`
     width: 320px;
     display: inline-block;
     vertical-align: top;
 `;
 
-const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGroup> => {
-    return (
-        <TransitionGroupWrapper component="div" className="transition-container">
-            <CSSTransition
-                key={props.animationType}
-                onExit={() => { window.dispatchEvent(new Event('resize')); }}
-                onExited={() => window.dispatchEvent(new Event('resize'))}
-                in
-                out
-                classNames={props.animationType}
-                appear={false}
-                timeout={300}
-            >
-                <TransitionContentWrapper>
-                    {props.children}
-                </TransitionContentWrapper>
-            </CSSTransition>
-        </TransitionGroupWrapper>
-    );
-};
+const StickyBottom = styled.div`
+    position: fixed;
+    bottom: 0;
+    background: ${colors.MAIN};
+    border-right: 1px solid ${colors.DIVIDER};
+`;
 
+const MenuWrapper = styled.div``;
 
-const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | string> => {
-    const selected: ?TrezorDevice = props.wallet.selectedDevice;
-    const { location } = props.router;
+const Help = styled.div``;
 
-    if (location.pathname === '/' || !selected) return (<aside />);
-
-    let menu = <section />;
-
-    let shouldRenderDeviceSelection = false;
-    // let shouldRenderCoins = false;
-    // let shouldRenderAccounts = false;
-
-    let animationType = '';
-    if (props.deviceDropdownOpened) {
-        shouldRenderDeviceSelection = true;
-        // menu = <DeviceDropdown {...props} />;
-    } else if (location.state.network) {
-        // shouldRenderAccounts = true;
-        shouldRenderDeviceSelection = false;
-        animationType = 'slide-left';
-        // menu = (
-        //     <TransitionMenu animationType="slide-left">
-        //         <AccountMenu {...props} />
-        //     </TransitionMenu>
-        // );
-    } else if (selected.features && !selected.features.bootloader_mode && selected.features.initialized) {
-        // shouldRenderCoins = true;
-        shouldRenderDeviceSelection = false;
-        animationType = 'slide-right';
-        // menu = (
-        //     <TransitionMenu animationType="slide-right">
-        //         <CoinMenu {...props} />
-        //     </TransitionMenu>
-        // );
+class LeftNavigation extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            animationType: null,
+            shouldRenderDeviceSelection: false,
+        };
     }
 
-    return (
-        <StickyContainer location={location.pathname} deviceSelection={props.deviceDropdownOpened}>
-            <DeviceSelect {...props} />
-            {/* { menu } */}
+    componentWillReceiveProps() {
+        const { selectedDevice } = this.props.wallet;
+        const hasFeatures = selectedDevice && selectedDevice.features;
 
-            {shouldRenderDeviceSelection ? (
-                <DeviceDropdown {...props} />
-            ) : (
-                <TransitionMenu
-                    animationType={animationType}
+        if (this.props.deviceDropdownOpened) {
+            this.setState({ shouldRenderDeviceSelection: true });
+        } else if (this.props.location.network) {
+            this.setState({
+                shouldRenderDeviceSelection: false,
+                animationType: 'slide-left',
+            });
+        } else if (selectedDevice && hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized) {
+            this.setState({
+                shouldRenderDeviceSelection: false,
+                animationType: 'slide-right',
+            });
+        }
+    }
+
+    // TODO: refactor to transition component for reuse of transitions
+    getMenuTransition(children) {
+        return (
+            <TransitionGroupWrapper component="div" className="transition-container">
+                <CSSTransition
+                    key={this.state.animationType}
+                    onExit={() => { window.dispatchEvent(new Event('resize')); }}
+                    onExited={() => window.dispatchEvent(new Event('resize'))}
+                    in
+                    out
+                    classNames={this.state.animationType}
+                    appear={false}
+                    timeout={300}
                 >
-                    {animationType === 'slide-left' && <AccountMenu key="accounts" {...props} />}
-                    {animationType === 'slide-right' && <CoinMenu key="coins" {...props} />}
-                </TransitionMenu>
-            )}
+                    <TransitionContentWrapper>
+                        {children}
+                    </TransitionContentWrapper>
+                </CSSTransition>
+            </TransitionGroupWrapper>);
+    }
 
+    shouldRenderAccounts() {
+        return !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
+    }
 
-            <div className="sticky-bottom">
-                <div className="help">
-                    <a href="https://trezor.io/support/" target="_blank" rel="noreferrer noopener">Need help?</a>
-                </div>
-            </div>
-        </StickyContainer>
-    );
+    shouldRenderCoins() {
+        return !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-right';
+    }
+
+    render() {
+        return (
+            <StickyContainer
+                location={this.props.location.pathname}
+                deviceSelection={this.props.deviceDropdownOpened}
+            >
+                <DeviceSelect {...this.props} />
+                <MenuWrapper>
+                    {this.state.shouldRenderDeviceSelection && this.getMenuTransition(<DeviceDropdown {...this.props} />) }
+                    {/* {this.shouldRenderAccounts && <AccountMenu key="accounts" {...this.props} />} */}
+                    {this.shouldRenderCoins && <CoinMenu key="coins" {...this.props} />}
+                </MenuWrapper>
+                <StickyBottom>
+                    <Help className="help">
+                        <a href="https://trezor.io/support/" target="_blank" rel="noreferrer noopener">Need help?</a>
+                    </Help>
+                </StickyBottom>
+            </StickyContainer>
+        );
+    }
+}
+
+LeftNavigation.propTypes = {
+    selectedDevice: PropTypes.object,
+    wallet: PropTypes.object,
+    deviceDropdownOpened: PropTypes.bool,
 };
 
+
 export default LeftNavigation;

From d2f63becfa23d2f920146e29bd651e27554c07ae Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Thu, 16 Aug 2018 18:43:29 +0200
Subject: [PATCH 077/103] changed variable name

---
 src/js/views/Wallet/components/LeftNavigation/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index ee2964cd..18335185 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -44,6 +44,7 @@ class LeftNavigation extends Component {
     componentWillReceiveProps() {
         const { selectedDevice } = this.props.wallet;
         const hasFeatures = selectedDevice && selectedDevice.features;
+        const deviceReady = hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
         if (this.props.deviceDropdownOpened) {
             this.setState({ shouldRenderDeviceSelection: true });
@@ -52,7 +53,7 @@ class LeftNavigation extends Component {
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-left',
             });
-        } else if (selectedDevice && hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized) {
+        } else if (deviceReady) {
             this.setState({
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-right',

From 8252d0908bd0112e3cab444e792f6d3d670b0a86 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Thu, 16 Aug 2018 19:38:30 +0200
Subject: [PATCH 078/103] Change folder structure of 'LeftNavigation'

---
 .../LeftNavigation/NavigationMenu/index.js    |  4 --
 .../AccountMenu/index.js                      |  4 +-
 .../CoinMenu/index.js                         |  4 +-
 .../DeviceMenu/index.js                       |  8 +--
 .../{ => components}/Divider/index.js         |  4 +-
 .../{ => components}/Row/index.js             |  0
 .../{ => components}/StickyContainer/index.js |  0
 .../LeftNavigation/{ => components}/common.js |  0
 .../Wallet/components/LeftNavigation/index.js | 53 +++++++++----------
 9 files changed, 34 insertions(+), 43 deletions(-)
 delete mode 100644 src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js
 rename src/js/views/Wallet/components/LeftNavigation/{NavigationMenu => components}/AccountMenu/index.js (98%)
 rename src/js/views/Wallet/components/LeftNavigation/{NavigationMenu => components}/CoinMenu/index.js (98%)
 rename src/js/views/Wallet/components/LeftNavigation/{NavigationMenu => components}/DeviceMenu/index.js (98%)
 rename src/js/views/Wallet/components/LeftNavigation/{ => components}/Divider/index.js (88%)
 rename src/js/views/Wallet/components/LeftNavigation/{ => components}/Row/index.js (100%)
 rename src/js/views/Wallet/components/LeftNavigation/{ => components}/StickyContainer/index.js (100%)
 rename src/js/views/Wallet/components/LeftNavigation/{ => components}/common.js (100%)

diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js
deleted file mode 100644
index aab425a4..00000000
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as AccountMenu } from './AccountMenu';
-export { default as CoinMenu } from './CoinMenu';
-export { DeviceSelect } from './DeviceMenu';
-export { DeviceDropdown } from './DeviceMenu';
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
similarity index 98%
rename from src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
rename to src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index d582e18c..c8c5938a 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -13,9 +13,9 @@ import { findDeviceAccounts } from 'reducers/AccountsReducer';
 import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
 
 import type { Accounts } from 'flowtype';
-import type { Props } from '../../common';
+import type { Props } from '../common';
 
-import Row from '../../Row';
+import Row from '../Row';
 
 const RowAccountWrapper = styled.div`
     height: 64px;
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
similarity index 98%
rename from src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
rename to src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
index 40f257af..dc848d29 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
@@ -10,8 +10,8 @@ import styled from 'styled-components';
 
 import { FONT_SIZE, ICON_SIZE } from 'config/variables';
 
-import Divider from '../../Divider';
-import Row from '../../Row';
+import Divider from '../Divider';
+import Row from '../Row';
 
 const CoinNameWrapper = styled.div`
     display: flex;
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
similarity index 98%
rename from src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
rename to src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index 1bebe707..fb73650b 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -4,9 +4,9 @@ import TrezorConnect from 'trezor-connect';
 
 import type { TrezorDevice } from 'flowtype';
 
-import type { Props } from '../../common';
+import type { Props } from '../common';
 
-import AsideDivider from '../../Divider';
+import AsideDivider from '../Divider';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
@@ -214,10 +214,10 @@ export class DeviceDropdown extends Component<Props> {
         return (
             <React.Fragment>
                 {currentDeviceMenu}
-                {deviceList.length > 1 ? <AsideDivider textLeft={'Other devices'} /> : null}
+                {deviceList.length > 1 ? <AsideDivider textLeft="Other devices" /> : null}
                 {deviceList}
                 {webUsbButton}
             </React.Fragment>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/js/views/Wallet/components/LeftNavigation/Divider/index.js b/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
similarity index 88%
rename from src/js/views/Wallet/components/LeftNavigation/Divider/index.js
rename to src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
index 1673d82d..c077fc49 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Divider/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
@@ -24,8 +24,8 @@ const Divider = ({ textLeft, textRight }) => (
 );
 
 Divider.propTypes = {
-    textLeft: PropTypes.string.isRequired,
-    textRight: PropTypes.string.isRequired,
+    textLeft: PropTypes.string,
+    textRight: PropTypes.string,
 };
 
 export default Divider;
diff --git a/src/js/views/Wallet/components/LeftNavigation/Row/index.js b/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
similarity index 100%
rename from src/js/views/Wallet/components/LeftNavigation/Row/index.js
rename to src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
diff --git a/src/js/views/Wallet/components/LeftNavigation/StickyContainer/index.js b/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
similarity index 100%
rename from src/js/views/Wallet/components/LeftNavigation/StickyContainer/index.js
rename to src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
diff --git a/src/js/views/Wallet/components/LeftNavigation/common.js b/src/js/views/Wallet/components/LeftNavigation/components/common.js
similarity index 100%
rename from src/js/views/Wallet/components/LeftNavigation/common.js
rename to src/js/views/Wallet/components/LeftNavigation/components/common.js
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index c5f979c0..01ebae80 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -4,15 +4,12 @@ import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
 
 import type { TrezorDevice } from 'flowtype';
-import {
-    AccountMenu,
-    CoinMenu,
-    DeviceSelect,
-    DeviceDropdown,
-} from './NavigationMenu';
-import StickyContainer from './StickyContainer';
+import AccountMenu from './components/AccountMenu';
+import CoinMenu from './components/CoinMenu';
+import { DeviceDropdown, DeviceSelect } from './components/DeviceMenu';
+import StickyContainer from './components/StickyContainer';
 
-import type { Props } from './common';
+import type { Props } from './components/common';
 
 type TransitionMenuProps = {
     animationType: string;
@@ -28,26 +25,24 @@ const TransitionContentWrapper = styled.div`
     vertical-align: top;
 `;
 
-const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGroup> => {
-    return (
-        <TransitionGroupWrapper component="div" className="transition-container">
-            <CSSTransition
-                key={props.animationType}
-                onExit={() => { window.dispatchEvent(new Event('resize')); }}
-                onExited={() => window.dispatchEvent(new Event('resize'))}
-                in
-                out
-                classNames={props.animationType}
-                appear={false}
-                timeout={300}
-            >
-                <TransitionContentWrapper>
-                    {props.children}
-                </TransitionContentWrapper>
-            </CSSTransition>
-        </TransitionGroupWrapper>
-    );
-};
+const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGroup> => (
+    <TransitionGroupWrapper component="div" className="transition-container">
+        <CSSTransition
+            key={props.animationType}
+            onExit={() => { window.dispatchEvent(new Event('resize')); }}
+            onExited={() => window.dispatchEvent(new Event('resize'))}
+            in
+            out
+            classNames={props.animationType}
+            appear={false}
+            timeout={300}
+        >
+            <TransitionContentWrapper>
+                {props.children}
+            </TransitionContentWrapper>
+        </CSSTransition>
+    </TransitionGroupWrapper>
+);
 
 
 const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | string> => {
@@ -56,7 +51,7 @@ const LeftNavigation = (props: Props): React$Element<typeof StickyContainer | st
 
     if (location.pathname === '/' || !selected) return (<aside />);
 
-    let menu = <section />;
+    const menu = <section />;
 
     let shouldRenderDeviceSelection = false;
     // let shouldRenderCoins = false;

From dcbdf2bfa1c82a7333802ca761aab0e1bc4ab02d Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 20:52:05 +0200
Subject: [PATCH 079/103] better parameter handling

---
 .../NavigationMenu/AccountMenu/index.js         |  7 ++-----
 .../NavigationMenu/CoinMenu/index.js            |  2 +-
 .../Wallet/components/LeftNavigation/index.js   | 17 ++++++++---------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
index b2d9c0b4..5cfc3352 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
@@ -43,6 +43,7 @@ const RowAccountWrapper = styled.div`
         }
     `}
 `;
+
 const RowAccount = ({
     accountIndex, balance, url, isSelected = false,
 }) => (
@@ -62,6 +63,7 @@ const RowAccount = ({
         </RowAccountWrapper>
     </NavLink>
 );
+
 RowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
     url: PropTypes.string.isRequired,
@@ -71,9 +73,6 @@ RowAccount.propTypes = {
 
 const AccountMenu = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
-    console.warn('selected', selected);
-    if (!selected) return null;
-
     const { location } = props.router;
     const urlParams = location.state;
     const { accounts } = props;
@@ -81,8 +80,6 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
 
     const { config } = props.localStorage;
     const selectedCoin = config.coins.find(c => c.network === location.state.network);
-    if (!selectedCoin) return;
-
     const fiatRate = props.fiat.find(f => f.network === selectedCoin.network);
 
     const deviceAccounts: Accounts = findDeviceAccounts(accounts, selected, location.state.network);
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
index 40f257af..6dccb775 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
@@ -129,7 +129,7 @@ class CoinMenu extends Component {
                     textRight="(You will be redirected)"
                 />
                 {coins.map(coin => (
-                    <a href={coin.url}>
+                    <a key={coin.url} href={coin.url}>
                         <RowCoin
                             coin={{
                                 img: coin.image,
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 18335185..7cfec80c 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -4,11 +4,7 @@ import PropTypes from 'prop-types';
 import colors from 'config/colors';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
-
-import type { TrezorDevice } from 'flowtype';
-import {
-    AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown,
-} from './NavigationMenu';
+import { AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown } from './NavigationMenu';
 import StickyContainer from './StickyContainer';
 
 const TransitionGroupWrapper = styled(TransitionGroup)`
@@ -42,13 +38,15 @@ class LeftNavigation extends Component {
     }
 
     componentWillReceiveProps() {
+        const { deviceDropdownOpened } = this.props;
         const { selectedDevice } = this.props.wallet;
+        const { network } = this.props.location;
         const hasFeatures = selectedDevice && selectedDevice.features;
         const deviceReady = hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
-        if (this.props.deviceDropdownOpened) {
+        if (deviceDropdownOpened) {
             this.setState({ shouldRenderDeviceSelection: true });
-        } else if (this.props.location.network) {
+        } else if (network) {
             this.setState({
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-left',
@@ -83,7 +81,8 @@ class LeftNavigation extends Component {
     }
 
     shouldRenderAccounts() {
-        return !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
+        const { selectedDevice } = this.props.wallet;
+        return selectedDevice && !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
     }
 
     shouldRenderCoins() {
@@ -99,7 +98,7 @@ class LeftNavigation extends Component {
                 <DeviceSelect {...this.props} />
                 <MenuWrapper>
                     {this.state.shouldRenderDeviceSelection && this.getMenuTransition(<DeviceDropdown {...this.props} />) }
-                    {/* {this.shouldRenderAccounts && <AccountMenu key="accounts" {...this.props} />} */}
+                    {/* {this.shouldRenderAccounts && this.getMenuTransition(<AccountMenu key="accounts" {...this.props} />)} */}
                     {this.shouldRenderCoins && <CoinMenu key="coins" {...this.props} />}
                 </MenuWrapper>
                 <StickyBottom>

From 50f8a182e60b929f9d7d32e79c098b9ab3a6d983 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 21:11:01 +0200
Subject: [PATCH 080/103] Fixed rendering function

---
 src/js/views/Wallet/components/LeftNavigation/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 7cfec80c..9327c554 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -81,8 +81,9 @@ class LeftNavigation extends Component {
     }
 
     shouldRenderAccounts() {
+        const { network } = this.props.location;
         const { selectedDevice } = this.props.wallet;
-        return selectedDevice && !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
+        return selectedDevice && network && !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
     }
 
     shouldRenderCoins() {
@@ -98,8 +99,8 @@ class LeftNavigation extends Component {
                 <DeviceSelect {...this.props} />
                 <MenuWrapper>
                     {this.state.shouldRenderDeviceSelection && this.getMenuTransition(<DeviceDropdown {...this.props} />) }
-                    {/* {this.shouldRenderAccounts && this.getMenuTransition(<AccountMenu key="accounts" {...this.props} />)} */}
-                    {this.shouldRenderCoins && <CoinMenu key="coins" {...this.props} />}
+                    {this.shouldRenderAccounts() && this.getMenuTransition(<AccountMenu {...this.props} />)}
+                    {this.shouldRenderCoins() && <CoinMenu {...this.props} />}
                 </MenuWrapper>
                 <StickyBottom>
                     <Help className="help">

From fc13b0d602785cb91d828667c5e79e13d35c46ab Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 21:25:57 +0200
Subject: [PATCH 081/103] Better support for icons

---
 src/js/components/Icon/index.js               |   4 +-
 src/js/config/icons.js                        | 320 +++++++++++++++++-
 .../NavigationMenu/CoinMenu/index.js          |   3 +-
 3 files changed, 321 insertions(+), 6 deletions(-)

diff --git a/src/js/components/Icon/index.js b/src/js/components/Icon/index.js
index 91f308fb..d36e8b76 100644
--- a/src/js/components/Icon/index.js
+++ b/src/js/components/Icon/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const Icon = ({ icon, size = 30, color = 'black' }) => {
+const Icon = ({ icon, size = 32, color = 'black' }) => {
     const styles = {
         svg: {
             display: 'inline-block',
@@ -17,7 +17,7 @@ const Icon = ({ icon, size = 30, color = 'black' }) => {
             style={styles.svg}
             width={`${size}`}
             height={`${size}`}
-            viewBox="0 0 16 16"
+            viewBox="0 0 1024 1024"
         >
             <path
                 style={styles.path}
diff --git a/src/js/config/icons.js b/src/js/config/icons.js
index 7f45c659..1a4cd725 100644
--- a/src/js/config/icons.js
+++ b/src/js/config/icons.js
@@ -1,4 +1,318 @@
 export default {
-    REDIRECT: 'M16 8c-4.418 0-8 3.583-8 8 0 4.419 3.582 8 8 8s8-3.581 8-8c0-4.417-3.582-8-8-8zM16.533 19.733v-2.133c-3.2-1.067-4.267 0-5.333 2.133 0-5.333 3.2-6.4 5.333-6.4v-2.133l4.267 4.267-4.267 4.266z',
-    WARNING: 'M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z',
-};
\ No newline at end of file
+    SKIP: 'M512 256c-141.376 0-256 114.656-256 256 0 141.408 114.624 256 256 256s256-114.592 256-256c0-141.344-114.624-256-256-256zM529.056 631.456v-68.256c-102.4-34.144-136.544 0-170.656 68.256 0-170.656 102.4-204.8 170.656-204.8v-68.256l136.544 136.544-136.544 136.512z',
+    WARNING: 'M795.616 735.008l-264.896-465.44c-10.272-18.080-27.168-18.080-37.504 0l-264.864 465.44c-10.272 18.176-1.696 32.992 19.040 32.992h529.184c20.8 0 29.376-14.816 19.040-32.992zM549.76 673.12c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-37.952c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v37.952zM549.76 559.264c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-113.856c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v113.856z',
+};
+
+/*
+        trezor icoomon font pack
+{
+  "icons": [
+    {
+      "paths": [
+        "M381.088 476.352v-89.696c0-72.16 53.696-130.656 119.904-130.656h35.104c66.208 0 119.904 58.496 119.904 130.656v7.616h-69.312c-4.416-36.704-33.248-65.056-68.128-65.056-37.952 0-68.736 33.536-68.736 74.88v72.288h221.184c18.208 0 32.992 15.552 32.992 34.72v222.24c0 19.104-14.784 34.656-32.992 34.656h-318.016c-18.208 0-32.992-15.552-32.992-34.72v-222.24c0-19.168 14.784-34.72 32.992-34.72h28.096z"
+      ],
+      "tags": [
+        "icon-unlocked"
+      ],
+      "defaultCode": 59648,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M671.008 476.352h-14.976v-89.632c0-72.256-53.76-130.72-120.064-130.72h-35.136c-66.304 0-119.744 58.464-119.744 130.72v89.632h-28.096c-18.336 0-32.992 15.424-32.992 34.688v222.272c0 18.944 14.656 34.688 32.992 34.688h318.016c18.336 0 32.992-15.744 32.992-34.688v-222.272c0-19.264-14.656-34.688-32.992-34.688zM449.824 404.064c0-41.44 30.56-74.848 68.736-74.848 34.816 0 63.552 33.728 68.128 70.336v76.768h-136.864v-72.256z"
+      ],
+      "tags": [
+        "icon-locked"
+      ],
+      "defaultCode": 59649,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M276 768h471.968c11.072 0 20.032-9.76 20.032-21.824v-75.968c0-12.064-8.96-21.824-20-21.824h-472c-11.040 0-20 9.76-20 21.824v75.968c0 12.064 8.96 21.824 20 21.824zM503.552 260.192l-231.232 288.128c-6.368 7.904-1.184 20.32 8.448 20.32h462.496c9.664 0 14.816-12.384 8.448-20.32l-231.232-288.128c-4.512-5.6-12.448-5.6-16.928 0z"
+      ],
+      "tags": [
+        "icon-eject"
+      ],
+      "defaultCode": 59650,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M347.392 473.312c17.28-82.24 90.4-142.336 173.92-142.336 31.648 0 61.92 8.704 88.576 24.416 6.656 3.936 12.8 8.672 18.944 13.504l-68.832 68.736 192 33.056-32-198.272-38.4 42.016c-5.92-5.024-12.064-9.728-18.336-14.144-40.928-28.672-89.92-44.288-141.92-44.288-121.664 0-225.12 89.312-245.984 210.368l-3.36 20.896h72.672l2.72-13.952zM676.608 550.688c-17.28 82.24-90.4 142.336-173.92 142.336-31.648 0-61.92-8.704-88.576-24.416-6.624-3.936-12.8-8.672-18.944-13.504l68.832-68.736-192-33.056 32 198.272 38.4-42.016c5.92 5.024 12.032 9.696 18.336 14.144 40.928 28.672 89.92 44.288 141.952 44.288 121.664 0 225.12-89.312 245.984-210.368l3.328-20.864h-72.672l-2.72 13.92z"
+      ],
+      "tags": [
+        "icon-refresh"
+      ],
+      "defaultCode": 59651,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M693.024 330.944c-99.968-99.936-262.080-99.936-362.048 0s-99.968 262.112 0 362.080c99.968 100 262.144 99.936 362.048 0 99.968-99.904 99.968-262.176 0-362.080zM507.904 300.192c27.008 0 48.992 21.984 48.992 49.088 0 27.296-21.984 49.472-48.992 49.472-27.264 0-49.536-22.176-49.536-49.472 0-27.552 21.728-49.088 49.536-49.088zM586.656 660.8c0 10.304-4.96 15.328-15.264 15.328h-126.464c-10.304 0-15.328-5.024-15.328-15.328v-32.256c0-10.304 5.024-15.264 15.328-15.264h23.36v-136.064h-23.872c-10.304 0-15.264-5.024-15.264-15.328v-32.224c0-10.304 4.96-15.264 15.264-15.264h88.288c10.304 0 15.264 4.96 15.264 15.264v183.648h23.424c10.304 0 15.264 4.96 15.264 15.264v32.224z"
+      ],
+      "tags": [
+        "icon-info"
+      ],
+      "defaultCode": 59652,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M580.992 256h-137.984c-103.296 0-187.008 85.952-187.008 192 0 96.608 69.536 176.32 160 189.792v130.208l128-128h36.992c103.296 0 187.008-85.952 187.008-192s-83.712-192-187.008-192z"
+      ],
+      "tags": [
+        "icon-chat"
+      ],
+      "defaultCode": 59653,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M512 256c-141.376 0-256 114.656-256 256 0 141.408 114.624 256 256 256s256-114.592 256-256c0-141.344-114.624-256-256-256zM529.056 631.456v-68.256c-102.4-34.144-136.544 0-170.656 68.256 0-170.656 102.4-204.8 170.656-204.8v-68.256l136.544 136.544-136.544 136.512z"
+      ],
+      "tags": [
+        "icon-skip"
+      ],
+      "defaultCode": 59654,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M739.552 462.144h-71.328c-4.256-13.664-10.208-26.56-17.472-38.56l47.264-47.424c11.2-11.008 11.2-29.056 0-40.192l-20.064-20.032c-11.136-11.104-29.152-11.040-40.192 0l-48.128 48.032c-12.992-7.392-27.072-13.152-42.080-16.992v-62.496c0-15.68-12.672-28.48-28.448-28.48h-28.448c-15.68 0-28.416 12.8-28.416 28.48v62.464c-16.352 4.128-31.68 10.656-45.728 19.2l-40.288-40.224c-11.072-11.040-29.184-11.104-40.288 0l-20.096 20.096c-11.104 11.072-10.976 29.152 0.064 40.288l40.992 40.992c-8.672 15.136-15.168 31.648-18.88 49.152h-53.504c-15.776 0-28.544 12.736-28.544 28.48v28.416c0 15.68 12.768 28.416 28.544 28.416h57.152c5.184 17.152 12.992 32.928 23.008 47.328l-38.656 38.656c-11.136 11.136-11.136 29.216-0.064 40.288l20.064 20.096c11.2 11.040 29.248 11.040 40.32-0.032l43.232-43.2c14.528 7.232 30.336 12.48 46.944 15.2v59.488c0 15.68 12.736 28.448 28.448 28.48h28.448c15.68-0.032 28.448-12.8 28.448-28.48v-66.816c14.336-5.088 27.904-11.872 40.224-20.544l45.76 45.888c11.104 11.072 29.12 11.072 40.224 0l20.096-20.128c11.168-11.072 11.168-29.056-0.096-40.288l-50.144-50.24c6.144-12.512 10.944-25.792 13.92-39.904h67.776c15.744 0 28.448-12.672 28.48-28.448v-28.448c-0.096-15.68-12.8-28.512-28.544-28.512zM504.928 583.072c-39.264 0-71.072-31.776-71.072-71.104 0-39.264 31.808-71.040 71.072-71.040 39.296 0 71.136 31.776 71.136 71.040 0 39.328-31.84 71.104-71.136 71.104z"
+      ],
+      "tags": [
+        "icon-cog"
+      ],
+      "defaultCode": 59655,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M795.616 735.008l-264.896-465.44c-10.272-18.080-27.168-18.080-37.504 0l-264.864 465.44c-10.272 18.176-1.696 32.992 19.040 32.992h529.184c20.8 0 29.376-14.816 19.040-32.992zM549.76 673.12c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-37.952c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v37.952zM549.76 559.264c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-113.856c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v113.856z"
+      ],
+      "tags": [
+        "icon-warning"
+      ],
+      "defaultCode": 59656,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M757.216 420.928l-219.616 237.44c-8.128 8.576-19.296 13.632-31.040 13.632-11.744-0.288-23.2-5.056-31.040-13.664l-208.768-227.040c-15.36-16.928-14.176-43.040 3.008-58.176 16.864-15.424 43.392-13.952 59.040 2.656l177.76 193.504 188.608-203.904c7.52-8 18.080-12.768 29.216-13.344 11.456-0.608 21.696 3.264 30.112 10.688 16.896 15.456 18.080 41.568 2.72 58.208z"
+      ],
+      "tags": [
+        "icon-arrow-down"
+      ],
+      "defaultCode": 59657,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M754.816 689.92c17.6 17.6 17.6 46.72 0 64.64-8.96 8.64-20.48 13.44-32.64 13.44s-23.68-4.8-32.32-13.44l-177.888-177.92-177.888 177.92c-16.32 16.96-47.040 17.6-64.64 0-17.92-17.92-17.92-47.040 0-64.64l178.208-177.92-178.208-177.92c-17.92-17.92-17.92-46.72 0-64.64 17.28-17.28 47.36-17.28 64.64 0l177.888 177.92 177.888-177.92c17.92-17.92 47.040-17.92 64.96 0 17.6 17.92 17.6 46.72 0 64.64l-178.24 177.92 178.24 177.92z"
+      ],
+      "tags": [
+        "icon-close"
+      ],
+      "defaultCode": 59658,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M757.216 603.072l-219.616-237.44c-8.128-8.576-19.296-13.632-31.040-13.632-11.744 0.288-23.2 5.056-31.040 13.664l-208.768 227.040c-15.36 16.928-14.176 43.040 3.008 58.176 16.864 15.424 43.392 13.952 59.040-2.656l177.76-193.504 188.608 203.904c7.52 8 18.080 12.768 29.216 13.344 11.456 0.608 21.696-3.264 30.112-10.688 16.896-15.456 18.080-41.568 2.72-58.208z"
+      ],
+      "tags": [
+        "icon-arrow-up"
+      ],
+      "defaultCode": 59659,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M420.928 757.216l237.44-219.616c8.576-8.128 13.632-19.296 13.632-31.040-0.288-11.744-5.056-23.2-13.664-31.040l-227.040-208.768c-16.928-15.36-43.040-14.176-58.176 3.008-15.424 16.864-13.952 43.392 2.656 59.040l193.504 177.76-203.904 188.608c-8 7.52-12.768 18.080-13.344 29.216-0.608 11.456 3.264 21.696 10.688 30.112 15.456 16.896 41.568 18.080 58.208 2.72z"
+      ],
+      "tags": [
+        "icon-arrow-right2"
+      ],
+      "defaultCode": 59660,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M768 512c0 22.080-17.92 40-40 40h-176v176c0 22.080-17.92 40-40 40s-40-17.92-40-40v-176h-176c-22.080 0-40-17.92-40-40s17.92-40 40-40h176v-176c0-22.080 17.92-40 40-40s40 17.92 40 40v176h176c22.080 0 40 17.92 40 40z"
+      ],
+      "tags": [
+        "icon-plus"
+      ],
+      "defaultCode": 59661,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M420.928 757.216l237.44-219.616c8.576-8.128 13.632-19.296 13.632-31.040-0.288-11.744-5.056-23.2-13.664-31.040l-227.040-208.768c-16.928-15.36-43.040-14.176-58.176 3.008-15.424 16.864-13.952 43.392 2.656 59.040l193.504 177.76-203.904 188.608c-8 7.52-12.768 18.080-13.344 29.216-0.608 11.456 3.264 21.696 10.688 30.112 15.456 16.896 41.568 18.080 58.208 2.72z"
+      ],
+      "tags": [
+        "icon-arrow-right"
+      ],
+      "defaultCode": 59662,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M693.024 330.944c-99.968-99.936-262.080-99.936-362.048 0s-99.968 262.112 0 362.080c99.968 100 262.144 99.936 362.048 0 99.968-99.904 99.968-262.176 0-362.080zM501.216 717.952c-27.808 0-50.496-22.464-50.496-50.048 0-28.32 22.176-50.528 50.496-50.528 27.616 0 50.048 22.656 50.048 50.528 0.032 27.168-22.88 50.048-50.048 50.048zM536.416 542.464v27.744c0 13.504-5.28 18.784-18.784 18.784h-36.224c-13.504 0-18.72-5.28-18.72-18.784v-61.984c0-15.68 16.064-20.352 30.208-24.48 3.456-1.056 7.040-2.080 10.496-3.264 18.336-6.592 29.696-14.816 29.696-35.296 0-6.656 0-26.816-32.832-26.816-20.224 0-38.624 7.776-49.6 12.416-6.208 2.624-9.28 3.904-12.384 3.904-6.336 0-12.32-5.088-13.248-10.304l-12.608-32.96c-1.824-3.776-1.824-6.784-1.824-9.216 0-24.288 75.552-37.664 100.608-37.664 63.104 0 105.504 40.672 105.504 101.152 0.032 65.44-49.12 85.952-80.288 96.768z"
+      ],
+      "tags": [
+        "icon-help"
+      ],
+      "defaultCode": 59663,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M768 288v160c0 17.6-14.4 32-32 32h-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32h160c17.6 0 32 14.4 32 32zM480 576v160c0 17.6-14.4 32-32 32h-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32h160c17.6 0 32 14.4 32 32zM480 288v160c0 17.6-14.4 32-32 32h-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32h160c17.6 0 32 14.4 32 32zM768 576v160c0 17.6-14.4 32-32 32h-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32h160c17.6 0 32 14.4 32 32z"
+      ],
+      "tags": [
+        "icon-dashboard"
+      ],
+      "defaultCode": 59664,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M768 503.36c-20.16 34.88-44.48 63.68-71.68 86.72l-64.64-64.64c0.64-4.16 0.96-8.64 0.96-12.8 0-60.16-51.84-108.8-115.84-108.8-2.24 0-4.16 0-6.4 0.32l-33.92-33.92c12.16-1.6 24-2.24 36.16-2.24 98.88 0 197.44 45.12 255.36 135.36zM348.8 313.92c-8.96-8.96-23.68-8.96-32.64 0l-3.52 3.52c-8.96 8.96-8.96 23.68 0 32.64l53.76 53.76c-43.52 22.4-81.6 56.32-110.4 100.8 83.84 130.56 226.88 177.6 348.48 137.28l57.6 57.6c9.28 9.28 23.68 9.28 32.96 0l3.2-3.2c8.96-8.96 8.96-23.68 0-32.64l-349.44-349.76zM516.8 621.44c-64 0.32-115.84-48.64-115.84-108.48-0.32-21.12 6.080-40.64 17.28-57.28l42.56 42.56c-1.92 5.76-2.56 12.16-1.92 18.88 2.88 30.080 30.72 52.16 62.72 49.92 2.24-0.32 4.8-0.64 7.040-0.96l42.56 42.56c-16.32 8.32-34.56 12.8-54.4 12.8z"
+      ],
+      "tags": [
+        "icon-eye-crossed"
+      ],
+      "defaultCode": 59665,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M603.2 265.6h-6.4c-25.494-5.341-54.79-8.398-84.8-8.398s-59.305 3.058-87.592 8.879l2.792-0.48h-6.72c-30.053 5.643-52.489 31.68-52.489 62.956 0 0.367 0.003 0.733 0.009 1.099l-0.001-0.055v234.88c0.075 40.921 11.238 79.22 30.643 112.071l-0.563-1.031 35.2 60.48c11.655 19.297 32.515 32.001 56.342 32.001 0.105 0 0.209 0 0.314-0.001h44.144c0.359 0.007 0.783 0.011 1.208 0.011 23.569 0 44.162-12.74 55.269-31.709l0.164-0.302 36.16-64c18.232-31.447 29.027-69.173 29.12-109.413v-232.987c0.005-0.293 0.008-0.639 0.008-0.986 0-31.391-22.599-57.503-52.416-62.954l-0.392-0.059zM629.76 563.2c-0.193 35.364-9.792 68.446-26.418 96.923l0.498-0.923-35.84 64c-6.868 11.865-19.463 19.742-33.906 19.84h-44.174c-0.073 0-0.159 0.001-0.246 0.001-14.427 0-27.041-7.762-33.894-19.338l-0.1-0.183-34.88-59.84c-16.656-28.155-26.515-62.042-26.56-98.227v-235.853c0.133-19.025 13.742-34.833 31.751-38.359l0.249-0.041h6.72c24.050-5.126 51.682-8.062 80-8.062s55.949 2.936 82.608 8.519l-2.608-0.457h6.72c18.258 3.568 31.867 19.375 32 38.386v0.014zM422.4 353.92h179.2c3.535 0 6.4 2.865 6.4 6.4v99.2c0 3.535-2.865 6.4-6.4 6.4h-179.2c-3.535 0-6.4-2.865-6.4-6.4v-99.2c0-3.535 2.865-6.4 6.4-6.4z"
+      ],
+      "tags": [
+        "icon-T1"
+      ],
+      "defaultCode": 59666,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M603.2 265.6h-6.4c-25.494-5.341-54.79-8.398-84.8-8.398s-59.305 3.058-87.592 8.879l2.792-0.48h-6.72c-30.053 5.643-52.489 31.68-52.489 62.956 0 0.367 0.003 0.733 0.009 1.099l-0.001-0.055v234.88c0.075 40.921 11.238 79.22 30.643 112.071l-0.563-1.031 35.2 60.48c11.655 19.297 32.515 32.001 56.342 32.001 0.105 0 0.209 0 0.314-0.001h44.144c0.359 0.007 0.783 0.011 1.208 0.011 23.569 0 44.162-12.74 55.269-31.709l0.164-0.302 36.16-64c18.152-31.468 28.933-69.175 29.12-109.385v-233.015c0.005-0.293 0.008-0.639 0.008-0.986 0-31.391-22.599-57.503-52.416-62.954l-0.392-0.059zM629.76 563.2c-0.193 35.364-9.792 68.446-26.418 96.923l0.498-0.923-35.84 64c-6.868 11.865-19.463 19.742-33.906 19.84h-44.174c-14.469-0.112-27.111-7.827-34.139-19.343l-34.981-61.297c-16.687-28.041-26.553-61.827-26.56-97.918v-234.882c0-19.072 13.676-34.95 31.757-38.362l0.243-0.038h6.72c24.050-5.126 51.682-8.062 80-8.062s55.949 2.936 82.608 8.519l-2.608-0.457h6.72c18.324 3.45 32 19.328 32 38.4v0zM422.4 353.92h179.2c3.535 0 6.4 2.865 6.4 6.4v99.2c0 3.535-2.865 6.4-6.4 6.4h-179.2c-3.535 0-6.4-2.865-6.4-6.4v-99.2c0-3.535 2.865-6.4 6.4-6.4zM531.2 490.24h70.4c3.535 0 6.4 2.865 6.4 6.4v28.8c0 3.535-2.865 6.4-6.4 6.4h-70.4c-3.535 0-6.4-2.865-6.4-6.4v-28.8c0-3.535 2.865-6.4 6.4-6.4zM422.4 491.2h70.4c3.535 0 6.4 2.865 6.4 6.4v28.8c0 3.535-2.865 6.4-6.4 6.4h-70.4c-3.535 0-6.4-2.865-6.4-6.4v-28.8c0-3.535 2.865-6.4 6.4-6.4z"
+      ],
+      "tags": [
+        "icon-T1-buttons"
+      ],
+      "defaultCode": 59667,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M526.72 614.080h-29.44c-16.229-0.18-30.307-9.217-37.647-22.496l-0.113-0.224-23.36-41.92c-12.685-22.404-20.16-49.203-20.16-77.748 0-0.004 0-0.008 0-0.012v0.001-164.16c-0.002-0.138-0.002-0.301-0.002-0.463 0-21.403 14.903-39.326 34.898-43.957l0.304-0.059h4.48c16.978-3.729 36.479-5.865 56.48-5.865s39.502 2.136 58.289 6.193l-1.809-0.327h4.48c20.14 4.81 34.883 22.655 34.883 43.943 0 0.189-0.001 0.377-0.003 0.565v-0.029 163.52c0 0.064 0 0.139 0 0.214 0 28.079-7.233 54.468-19.937 77.407l0.417-0.821-24 43.84c-7.529 13.375-21.591 22.288-37.744 22.4h-0.016zM512 274.24c-0.097 0-0.212 0-0.327 0-18.693 0-36.923 1.981-54.492 5.745l1.699-0.305h-4.48c-12.188 2.865-21.122 13.645-21.122 26.512 0 0.129 0.001 0.258 0.003 0.387v-0.020 164.48c0 0.094 0 0.204 0 0.315 0 25.018 6.525 48.512 17.966 68.873l-0.365-0.708 23.36 41.92c4.497 8.071 12.981 13.44 22.718 13.44 0.001 0 0.002 0 0.002 0h29.44c9.799-0.067 18.299-5.56 22.652-13.623l0.068-0.137 24-43.84c10.854-19.495 17.254-42.757 17.28-67.512v-162.248c0.002-0.109 0.002-0.238 0.002-0.368 0-12.867-8.935-23.648-20.938-26.476l-0.184-0.037h-4.48c-15.736-3.739-33.906-6.053-52.557-6.396l-0.243-0.004zM452.48 324.48h119.040c2.474 0 4.48 2.006 4.48 4.48v69.44c0 2.474-2.006 4.48-4.48 4.48h-119.040c-2.474 0-4.48-2.006-4.48-4.48v-69.44c0-2.474 2.006-4.48 4.48-4.48zM540.48 656.32v52.16h-18.24v59.52h-19.84v-59.52h-18.88v-52.16h56.96z"
+      ],
+      "tags": [
+        "icon-T1-connect"
+      ],
+      "defaultCode": 59668,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M551.36 781.76h-78.4c-0.225 0.006-0.489 0.010-0.754 0.010-10.242 0-19.207-5.468-24.135-13.643l-0.071-0.127-64-96c-29.426-43.619-46.99-97.353-47.040-155.187v-233.613c0.36-22.875 18.988-41.281 41.915-41.281 0.114 0 0.228 0 0.342 0.001h263.342c0.097-0.001 0.211-0.001 0.325-0.001 22.927 0 41.555 18.406 41.915 41.248v239.394c-0.289 59.994-19.423 115.463-51.779 160.855l0.579-0.855-60.48 86.080c-4.695 7.399-12.575 12.414-21.664 13.114l-0.096 0.006zM380.48 269.76c-0.1-0.003-0.217-0.004-0.334-0.004-7.552 0-13.716 5.946-14.064 13.413l-0.001 0.031v233.92c0 0.010 0 0.023 0 0.036 0 52.093 15.777 100.502 42.813 140.708l-0.573-0.904 64 96h79.040l60.16-86.080c28.821-40.408 46.080-90.794 46.080-145.211 0-0.024 0-0.049 0-0.073v0.004-238.4c-0.35-7.498-6.513-13.444-14.066-13.444-0.118 0-0.235 0.001-0.352 0.004h0.017z"
+      ],
+      "defaultCode": 59669,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M407.040 335.68h209.92c4.595 0 8.32 3.725 8.32 8.32v201.92c0 4.595-3.725 8.32-8.32 8.32h-209.92c-4.595 0-8.32-3.725-8.32-8.32v-201.92c0-4.595 3.725-8.32 8.32-8.32z"
+      ],
+      "defaultCode": 59670,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M539.52 608h-54.72c-6.578-0.052-12.387-3.298-15.96-8.261l-0.040-0.059-45.12-64c-20.029-28.726-32.002-64.366-32.002-102.802 0-0.309 0.001-0.617 0.002-0.925v0.047-157.76c0.349-15.459 12.963-27.856 28.473-27.856 0.34 0 0.679 0.006 1.016 0.018l-0.049-0.001h184.32c0.288-0.010 0.627-0.016 0.967-0.016 15.51 0 28.124 12.398 28.473 27.824l0.001 0.032v160c-0.074 40.641-13.522 78.128-36.176 108.308l0.336-0.468-42.24 57.28c-3.622 5.258-9.609 8.66-16.39 8.66-0.313 0-0.624-0.007-0.934-0.022l0.044 0.002zM419.84 265.6c-0.205-0.016-0.444-0.025-0.686-0.025-4.973 0-9.062 3.781-9.551 8.624l-0.003 0.040v155.84c0.066 34.769 11.081 66.953 29.778 93.302l-0.338-0.502 45.12 64h56l42.24-57.28c19.839-26.468 31.828-59.817 32-95.96v-160.040c-0.492-4.884-4.582-8.665-9.554-8.665-0.241 0-0.481 0.009-0.717 0.026l0.032-0.002z"
+      ],
+      "defaultCode": 59671,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M438.4 309.12h146.88c3.181 0 5.76 2.579 5.76 5.76v134.4c0 3.181-2.579 5.76-5.76 5.76h-146.88c-3.181 0-5.76-2.579-5.76-5.76v-134.4c0-3.181 2.579-5.76 5.76-5.76z"
+      ],
+      "defaultCode": 59672,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M541.12 659.52v50.56h-18.56v57.92h-20.48v-57.92h-18.88v-50.56h57.92z"
+      ],
+      "defaultCode": 59673,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M603.072 757.216l-237.44-219.616c-8.576-8.128-13.632-19.296-13.632-31.040 0.288-11.744 5.056-23.2 13.664-31.040l227.040-208.768c16.928-15.36 43.040-14.176 58.176 3.008 15.424 16.864 13.952 43.392-2.656 59.040l-193.504 177.76 203.904 188.608c8 7.52 12.768 18.080 13.344 29.216 0.608 11.456-3.264 21.696-10.688 30.112-15.456 16.896-41.568 18.080-58.208 2.72z"
+      ],
+      "tags": [
+        "icon-arrow-left"
+      ],
+      "defaultCode": 59674,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M677.44 613.76c-3.255 1.423-7.047 2.252-11.033 2.252-0.284 0-0.566-0.004-0.848-0.013l0.041 0.001c-8.323-0.531-15.657-4.371-20.77-10.206l-0.030-0.034-93.44-109.44c-0.378-0.735-1.131-1.229-1.999-1.229-1.237 0-2.24 1.003-2.24 2.24 0 0.209 0.029 0.412 0.083 0.605l-0.004-0.016v233.28c0.102 0.987 0.16 2.132 0.16 3.291 0 18.733-15.187 33.92-33.92 33.92s-33.92-15.187-33.92-33.92c0-1.159 0.058-2.304 0.172-3.433l-0.012 0.142v-236.16c0.050-0.177 0.079-0.379 0.079-0.589 0-1.237-1.003-2.24-2.24-2.24-0.868 0-1.621 0.494-1.993 1.216l-0.006 0.013-88.32 104.32c-5.204 6.343-13.042 10.358-21.819 10.358-7.711 0-14.699-3.099-19.784-8.121l0.003 0.003c-6.16-5.845-9.993-14.090-9.993-23.231 0-8.17 3.062-15.625 8.101-21.28l-0.028 0.032 146.56-173.44c5.311-6.15 13.061-10.069 21.731-10.24h0.029c8.727 0.036 16.523 3.991 21.724 10.196l0.036 0.044 152 178.56c5.441 6.124 8.764 14.234 8.764 23.121 0 12.698-6.785 23.81-16.927 29.911l-0.157 0.088zM329.28 292.8c-0.024-0.488-0.038-1.060-0.038-1.635 0-18.891 14.881-34.306 33.561-35.163l0.077-0.003h292.48c18.795 1.81 33.372 17.523 33.372 36.64s-14.577 34.83-33.222 36.628l-0.15 0.012h-292.48c-18.751-0.866-33.625-16.278-33.625-35.165 0-0.463 0.009-0.923 0.027-1.381l-0.002 0.066z"
+      ],
+      "tags": [
+        "icon-top"
+      ],
+      "defaultCode": 59675,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M692.8 313.92l-1.92-1.92c-6.246-7.057-15.326-11.484-25.44-11.484s-19.194 4.427-25.409 11.448l-0.031 0.036-196.48 224-3.84 1.6-3.84-1.92-48.64-57.28c-7.010-7.905-17.193-12.862-28.533-12.862-21.031 0-38.080 17.049-38.080 38.080 0 7.495 2.165 14.485 5.905 20.377l-0.092-0.155 100.8 148.16c5.391 8.036 14.386 13.292 24.618 13.44h8.662c17.251-0.146 32.385-9.075 41.163-22.529l0.117-0.191 195.2-296.32c4.473-6.632 7.141-14.803 7.141-23.597 0-11.162-4.297-21.32-11.326-28.911l0.025 0.028z"
+      ],
+      "tags": [
+        "icon-check"
+      ],
+      "defaultCode": 59676,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M693.12 330.88c-46.317-46.267-110.276-74.88-180.919-74.88-141.385 0-256 114.615-256 256s114.615 256 256 256c70.642 0 134.602-28.613 180.921-74.882l-0.002 0.002c46.387-46.337 75.081-110.377 75.081-181.12s-28.694-134.783-75.079-181.118l-0.002-0.002zM494.080 344.32h53.12c16 0 18.24 9.28 18.24 14.72v10.24l-10.88 194.56c0 14.4-8 17.28-18.88 17.28h-28.16c-10.56 0-17.28-2.88-18.88-17.92l-10.88-193.92v-10.56c-1.28-4.8 2.24-14.080 16.32-14.080zM521.28 717.76c-0.095 0.001-0.207 0.001-0.319 0.001-27.747 0-50.24-22.493-50.24-50.24s22.493-50.24 50.24-50.24c27.747 0 50.24 22.493 50.24 50.24 0 0.112 0 0.224-0.001 0.336v-0.017c0 0 0 0.001 0 0.001 0 27.634-22.311 50.057-49.903 50.239h-0.017z"
+      ],
+      "tags": [
+        "icon-error"
+      ],
+      "defaultCode": 59677,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M512.64 368c-99.2 0-198.4 45.76-256.64 136.64 128.64 200 394.56 203.84 512-1.28-57.92-90.24-156.48-135.36-255.36-135.36zM516.8 621.44c-64 0.32-115.84-48.64-115.84-108.48-0.32-60.16 51.52-109.12 115.84-109.12 64 0 115.84 48.64 115.84 108.8 0.32 60.16-51.52 108.8-115.84 108.8zM574.72 508.16c2.56 30.080-21.12 56.32-53.12 58.88-32 2.24-59.84-19.84-62.72-49.92-2.56-30.080 21.44-56.32 53.12-58.56 32-2.56 59.84 19.84 62.72 49.6z"
+      ],
+      "tags": [
+        "icon-eye"
+      ],
+      "defaultCode": 59678,
+      "grid": 0
+    },
+    {
+      "paths": [
+        "M656.224 402.304l-66.848 66.176-66.848-66.176-50.144 49.6 66.912 66.176-66.912 66.176 50.176 49.632 66.848-66.176 66.848 66.176 50.112-49.632-66.816-66.176 66.816-66.176-50.144-49.6zM337.824 256h540.928c27.2 0 49.248 21.824 49.248 48.768v414.464c0 26.944-22.048 48.768-49.248 48.768h-540.608c-13.856 0-27.072-5.792-36.416-15.936l-192.896-209.664c-17.248-18.752-17.088-47.488 0.352-66.048l192.576-204.8c9.344-9.92 22.4-15.552 36.064-15.552z"
+      ],
+      "tags": [
+        "icon-back"
+      ],
+      "defaultCode": 59679,
+      "grid": 0
+    }
+  ]
+}
+
+*/
\ No newline at end of file
diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
index 6dccb775..058f6f5e 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
@@ -65,6 +65,7 @@ const RowCoin = ({
             {icon && (
                 <Icon
                     icon={icon.type}
+                    size={27}
                     color={icon.color}
                 />
             )}
@@ -136,7 +137,7 @@ class CoinMenu extends Component {
                                 name: coin.coinName,
                             }}
                             icon={{
-                                type: ICONS.REDIRECT,
+                                type: ICONS.SKIP,
                                 color: colors.TEXT_SECONDARY,
                             }}
                         />

From cf79638cad26d5ab53086ed0dddf4427d8ac7cce Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 21:47:01 +0200
Subject: [PATCH 082/103] Fixed menu state

---
 src/js/views/Wallet/components/LeftNavigation/index.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 9327c554..e99c2cd7 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -40,7 +40,7 @@ class LeftNavigation extends Component {
     componentWillReceiveProps() {
         const { deviceDropdownOpened } = this.props;
         const { selectedDevice } = this.props.wallet;
-        const { network } = this.props.location;
+        const { network } = this.props.location.state;
         const hasFeatures = selectedDevice && selectedDevice.features;
         const deviceReady = hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
@@ -81,9 +81,13 @@ class LeftNavigation extends Component {
     }
 
     shouldRenderAccounts() {
-        const { network } = this.props.location;
         const { selectedDevice } = this.props.wallet;
-        return selectedDevice && network && !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
+        return selectedDevice 
+            && this.props.location 
+            && this.props.location.state 
+            && this.props.location.state.network 
+            && !this.state.shouldRenderDeviceSelection 
+            && this.state.animationType === 'slide-left';
     }
 
     shouldRenderCoins() {

From 934b1cbe0aa4edc4efa733a992930bb2c992552e Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 21:49:39 +0200
Subject: [PATCH 083/103] Reset state on mount

---
 src/js/views/Wallet/components/LeftNavigation/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index e99c2cd7..46578383 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -37,6 +37,13 @@ class LeftNavigation extends Component {
         };
     }
 
+    componentDidMount() {
+        this.setState({
+            animationType: null,
+            shouldRenderDeviceSelection: false,
+        })
+    }
+
     componentWillReceiveProps() {
         const { deviceDropdownOpened } = this.props;
         const { selectedDevice } = this.props.wallet;

From 3fb9c65be84b1f21a30e01833beae97eb4cca44a Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 22:55:42 +0200
Subject: [PATCH 084/103] Styled help

---
 src/js/config/icons.js                        |  1 +
 src/js/reducers/SelectedAccountReducer.js     |  1 -
 .../Wallet/components/LeftNavigation/index.js | 54 +++++++++++++++----
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/js/config/icons.js b/src/js/config/icons.js
index 1a4cd725..88dbab47 100644
--- a/src/js/config/icons.js
+++ b/src/js/config/icons.js
@@ -1,4 +1,5 @@
 export default {
+    CHAT: 'M580.992 256h-137.984c-103.296 0-187.008 85.952-187.008 192 0 96.608 69.536 176.32 160 189.792v130.208l128-128h36.992c103.296 0 187.008-85.952 187.008-192s-83.712-192-187.008-192z',
     SKIP: 'M512 256c-141.376 0-256 114.656-256 256 0 141.408 114.624 256 256 256s256-114.592 256-256c0-141.344-114.624-256-256-256zM529.056 631.456v-68.256c-102.4-34.144-136.544 0-170.656 68.256 0-170.656 102.4-204.8 170.656-204.8v-68.256l136.544 136.544-136.544 136.512z',
     WARNING: 'M795.616 735.008l-264.896-465.44c-10.272-18.080-27.168-18.080-37.504 0l-264.864 465.44c-10.272 18.176-1.696 32.992 19.040 32.992h529.184c20.8 0 29.376-14.816 19.040-32.992zM549.76 673.12c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-37.952c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v37.952zM549.76 559.264c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-113.856c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v113.856z',
 };
diff --git a/src/js/reducers/SelectedAccountReducer.js b/src/js/reducers/SelectedAccountReducer.js
index d2a0cbea..a83b2dca 100644
--- a/src/js/reducers/SelectedAccountReducer.js
+++ b/src/js/reducers/SelectedAccountReducer.js
@@ -38,7 +38,6 @@ export default (state: State = initialState, action: Action): State => {
     switch (action.type) {
         case ACCOUNT.UPDATE_SELECTED_ACCOUNT:
             return action.payload;
-
         default:
             return state;
     }
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 46578383..6d84e879 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -1,10 +1,13 @@
-/* @flow */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import colors from 'config/colors';
+import Icon from 'components/Icon';
+import icons from 'config/icons';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
-import { AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown } from './NavigationMenu';
+import {
+    AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown,
+} from './NavigationMenu';
 import StickyContainer from './StickyContainer';
 
 const TransitionGroupWrapper = styled(TransitionGroup)`
@@ -26,7 +29,30 @@ const StickyBottom = styled.div`
 
 const MenuWrapper = styled.div``;
 
-const Help = styled.div``;
+const Help = styled.div`
+    text-align: center;
+    width: 319px;
+    padding: 8px 0px;
+    border-top: 1px solid ${colors.DIVIDER};
+
+    &.fixed {
+        position: fixed;
+        bottom: 0px;
+    }
+`;
+
+const A = styled.a`
+    color: ${colors.TEXT_SECONDARY};
+    font-size: 12px;
+    display: inline-block;
+    padding: 8px;
+    height: auto;
+
+    &:hover {
+        background: transparent;
+        color: ${colors.TEXT_PRIMARY};
+    }
+`;
 
 class LeftNavigation extends Component {
     constructor(props) {
@@ -41,7 +67,7 @@ class LeftNavigation extends Component {
         this.setState({
             animationType: null,
             shouldRenderDeviceSelection: false,
-        })
+        });
     }
 
     componentWillReceiveProps() {
@@ -89,11 +115,11 @@ class LeftNavigation extends Component {
 
     shouldRenderAccounts() {
         const { selectedDevice } = this.props.wallet;
-        return selectedDevice 
-            && this.props.location 
-            && this.props.location.state 
-            && this.props.location.state.network 
-            && !this.state.shouldRenderDeviceSelection 
+        return selectedDevice
+            && this.props.location
+            && this.props.location.state
+            && this.props.location.state.network
+            && !this.state.shouldRenderDeviceSelection
             && this.state.animationType === 'slide-left';
     }
 
@@ -114,8 +140,14 @@ class LeftNavigation extends Component {
                     {this.shouldRenderCoins() && <CoinMenu {...this.props} />}
                 </MenuWrapper>
                 <StickyBottom>
-                    <Help className="help">
-                        <a href="https://trezor.io/support/" target="_blank" rel="noreferrer noopener">Need help?</a>
+                    <Help>
+                        <A
+                            href="https://trezor.io/support/"
+                            target="_blank"
+                            rel="noreferrer noopener"
+                        >
+                            <StyledIcon size={25} icon={icons.CHAT} color={colors.TEXT_SECONDARY} />Need help?
+                        </A>
                     </Help>
                 </StickyBottom>
             </StickyContainer>

From d6b2cdb877da188b3737da4ad707a35e3c33f1f5 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 22:57:48 +0200
Subject: [PATCH 085/103] Fixed missing style

---
 src/js/views/Wallet/components/LeftNavigation/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 6d84e879..72b617e2 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -146,7 +146,7 @@ class LeftNavigation extends Component {
                             target="_blank"
                             rel="noreferrer noopener"
                         >
-                            <StyledIcon size={25} icon={icons.CHAT} color={colors.TEXT_SECONDARY} />Need help?
+                            <Icon size={25} icon={icons.CHAT} color={colors.TEXT_SECONDARY} />Need help?
                         </A>
                     </Help>
                 </StickyBottom>

From 4b9ebce7d056f91135bdcbaf1fe95e0d3759b440 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 06:48:12 +0200
Subject: [PATCH 086/103] Fix eslint errors

---
 .../components/StickyContainer/index.js       | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js b/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
index 090e3c8f..6116c04c 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
@@ -35,20 +35,12 @@ export default class StickyContainer extends React.PureComponent<Props> {
 
     subscribers = [];
 
-    handleResize = (event: Event) => {
+    // handleResize = (event: Event) => {
 
-    }
-
-    handleScroll = (event: ?Event) => {
-        if (!this.framePending) {
-            this.framePending = true;
-            raf(this.update);
-        }
-    }
+    // }
 
     shouldUpdate = () => {
-        const wrapper: ?HTMLElement = this.wrapper;
-        const aside: ?HTMLElement = this.aside;
+        const { wrapper, aside }: {wrapper: ?HTMLElement, aside: ?HTMLElement} = this;
         if (!wrapper || !aside) return;
         const bottom: ?HTMLElement = wrapper.querySelector('.sticky-bottom');
         if (!bottom) return;
@@ -107,11 +99,6 @@ export default class StickyContainer extends React.PureComponent<Props> {
         raf(this.update);
     }
 
-    componentWillUnmount() {
-        window.removeEventListener('scroll', this.handleScroll);
-        window.removeEventListener('resize', this.handleScroll);
-    }
-
     componentDidUpdate(prevProps: Props) {
         if (this.props.location !== prevProps.location && this.aside) {
             const asideBounds = this.aside.getBoundingClientRect();
@@ -128,6 +115,18 @@ export default class StickyContainer extends React.PureComponent<Props> {
         }
     }
 
+    componentWillUnmount() {
+        window.removeEventListener('scroll', this.handleScroll);
+        window.removeEventListener('resize', this.handleScroll);
+    }
+
+    handleScroll = (/* event: ?Event */) => {
+        if (!this.framePending) {
+            this.framePending = true;
+            raf(this.update);
+        }
+    }
+
     render() {
         return (
             <aside

From ecda8645a5f95ff0c2aa1f754729ffdc4050b920 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 07:04:35 +0200
Subject: [PATCH 087/103] Add key prop to an iterable component

---
 .../components/LeftNavigation/components/AccountMenu/index.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index fd907123..a55597e5 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -105,6 +105,7 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
 
         return (
             <RowAccount
+                key={account.index}
                 accountIndex={account.index}
                 balance={balance}
                 url={url}

From 7d28c6294f8c1f252db90442cdc007f0708ce0e8 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 07:16:23 +0200
Subject: [PATCH 088/103] Fix imports

---
 src/js/views/Wallet/components/LeftNavigation/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 72b617e2..d7a47423 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -5,10 +5,10 @@ import Icon from 'components/Icon';
 import icons from 'config/icons';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
-import {
-    AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown,
-} from './NavigationMenu';
-import StickyContainer from './StickyContainer';
+import AccountMenu from './components/AccountMenu';
+import CoinMenu from './components/CoinMenu';
+import { DeviceSelect, DeviceDropdown } from './components/DeviceMenu';
+import StickyContainer from './components/StickyContainer';
 
 const TransitionGroupWrapper = styled(TransitionGroup)`
     width: 640px;

From b8b0eff161decb9323fbce51042ac93b79f27b6d Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 08:05:20 +0200
Subject: [PATCH 089/103] Fix bug when LeftNavigation menu wasn't properly
 rendering menus based on props

---
 .../Wallet/components/LeftNavigation/index.js      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index d7a47423..2e075b1c 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -70,16 +70,16 @@ class LeftNavigation extends Component {
         });
     }
 
-    componentWillReceiveProps() {
-        const { deviceDropdownOpened } = this.props;
-        const { selectedDevice } = this.props.wallet;
-        const { network } = this.props.location.state;
+    componentWillReceiveProps(nextProps) {
+        const { deviceDropdownOpened } = nextProps;
+        const { selectedDevice } = nextProps.wallet;
+        const hasNetwork = nextProps.location.state && nextProps.location.state.network;
         const hasFeatures = selectedDevice && selectedDevice.features;
         const deviceReady = hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
         if (deviceDropdownOpened) {
             this.setState({ shouldRenderDeviceSelection: true });
-        } else if (network) {
+        } else if (hasNetwork) {
             this.setState({
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-left',
@@ -135,9 +135,9 @@ class LeftNavigation extends Component {
             >
                 <DeviceSelect {...this.props} />
                 <MenuWrapper>
-                    {this.state.shouldRenderDeviceSelection && this.getMenuTransition(<DeviceDropdown {...this.props} />) }
+                    {this.state.shouldRenderDeviceSelection && <DeviceDropdown {...this.props} />}
                     {this.shouldRenderAccounts() && this.getMenuTransition(<AccountMenu {...this.props} />)}
-                    {this.shouldRenderCoins() && <CoinMenu {...this.props} />}
+                    {this.shouldRenderCoins() && this.getMenuTransition(<CoinMenu {...this.props} />)}
                 </MenuWrapper>
                 <StickyBottom>
                     <Help>

From 8b511e7f0b791dac68c6c7bc5d1a2c87ef4fa50a Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 11:27:53 +0200
Subject: [PATCH 090/103] Add a left arrow icon

---
 src/js/config/icons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/config/icons.js b/src/js/config/icons.js
index 88dbab47..a4d679d2 100644
--- a/src/js/config/icons.js
+++ b/src/js/config/icons.js
@@ -1,4 +1,5 @@
 export default {
+    ARROW_LEFT: 'M603.072 757.216l-237.44-219.616c-8.576-8.128-13.632-19.296-13.632-31.040 0.288-11.744 5.056-23.2 13.664-31.040l227.040-208.768c16.928-15.36 43.040-14.176 58.176 3.008 15.424 16.864 13.952 43.392-2.656 59.040l-193.504 177.76 203.904 188.608c8 7.52 12.768 18.080 13.344 29.216 0.608 11.456-3.264 21.696-10.688 30.112-15.456 16.896-41.568 18.080-58.208 2.72z',
     CHAT: 'M580.992 256h-137.984c-103.296 0-187.008 85.952-187.008 192 0 96.608 69.536 176.32 160 189.792v130.208l128-128h36.992c103.296 0 187.008-85.952 187.008-192s-83.712-192-187.008-192z',
     SKIP: 'M512 256c-141.376 0-256 114.656-256 256 0 141.408 114.624 256 256 256s256-114.592 256-256c0-141.344-114.624-256-256-256zM529.056 631.456v-68.256c-102.4-34.144-136.544 0-170.656 68.256 0-170.656 102.4-204.8 170.656-204.8v-68.256l136.544 136.544-136.544 136.512z',
     WARNING: 'M795.616 735.008l-264.896-465.44c-10.272-18.080-27.168-18.080-37.504 0l-264.864 465.44c-10.272 18.176-1.696 32.992 19.040 32.992h529.184c20.8 0 29.376-14.816 19.040-32.992zM549.76 673.12c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-37.952c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v37.952zM549.76 559.264c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-113.856c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v113.856z',

From 27e3385b7d64002d5dfb2121c2b80fec2bfe877b Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 11:49:04 +0200
Subject: [PATCH 091/103] Move 'RowCoin' to its own component

- 'RowCoin' is used in both 'AccountMenu' and 'CoinMenu'
---
 .../components/AccountMenu/index.js           | 29 +++++--
 .../components/CoinMenu/index.js              | 83 +------------------
 .../LeftNavigation/components/Row/index.js    |  1 -
 .../RowCoin/components/CoinName/index.js      | 35 ++++++++
 .../components/RowCoin/index.js               | 76 +++++++++++++++++
 5 files changed, 138 insertions(+), 86 deletions(-)
 create mode 100644 src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js
 create mode 100644 src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index a55597e5..64825764 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -1,12 +1,13 @@
 /* @flow */
+import React, { components } from 'react';
 import BigNumber from 'bignumber.js';
 import colors from 'config/colors';
 import Loader from 'components/LoaderCircle';
 import PropTypes from 'prop-types';
-import React from 'react';
 import styled, { css } from 'styled-components';
 import * as stateUtils from 'reducers/utils';
 import Tooltip from 'rc-tooltip';
+import ICONS from 'config/icons';
 
 import { NavLink } from 'react-router-dom';
 import { findDeviceAccounts } from 'reducers/AccountsReducer';
@@ -14,8 +15,9 @@ import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
 
 import type { Accounts } from 'flowtype';
 import type { Props } from '../common';
-
 import Row from '../Row';
+import RowCoin from '../RowCoin';
+
 
 const Text = styled.span`
     font-size: ${FONT_SIZE.SMALLER};
@@ -63,7 +65,6 @@ const RowAccount = ({
         </RowAccountWrapper>
     </NavLink>
 );
-
 RowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
     url: PropTypes.string.isRequired,
@@ -183,12 +184,28 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
         }
     }
 
-
     let backButton = null;
     if (selectedCoin) {
+        let imgName = selectedCoin.network;
+        if (selectedCoin.network === 'ethereum') {
+            imgName = 'eth';
+        } else if (selectedCoin.network === 'ethereum-classic') {
+            imgName = 'etc';
+        }
+        const imgUrl = `../images/${imgName}-logo.png`;
         backButton = (
-            <NavLink to={baseUrl} className={`back ${selectedCoin.network}`}>
-                <span className={selectedCoin.network}>{selectedCoin.name}</span>
+            <NavLink to={baseUrl}>
+                <RowCoin
+                    coin={{
+                        img: imgUrl,
+                        name: selectedCoin.name,
+                    }}
+                    iconLeft={{
+                        type: ICONS.ARROW_LEFT,
+                        color: colors.TEXT_PRIMARY,
+                        size: 20,
+                    }}
+                />
             </NavLink>
         );
     }
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
index ccdab5aa..27b71639 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
@@ -1,88 +1,12 @@
 /* @flow */
 import coins from 'constants/coins';
 import colors from 'config/colors';
-import Icon from 'components/Icon';
 import ICONS from 'config/icons';
-import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import styled from 'styled-components';
-
-import { FONT_SIZE, ICON_SIZE } from 'config/variables';
-
+import { NavLink } from 'react-router-dom';
 import Divider from '../Divider';
-import Row from '../Row';
-
-const CoinNameWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-`;
-const Logo = styled.div`
-    height: ${ICON_SIZE.BASE};
-    width: ${ICON_SIZE.BASE};
-    margin-right: 10px;
-
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: auto ${ICON_SIZE.BASE};
-    background-image: url('${props => props.coinImg}');
-`;
-const CoinName = ({
-    coinImg, text,
-}) => (
-    <CoinNameWrapper>
-        <Logo
-            coinImg={coinImg}
-        />
-        <p>{text}</p>
-    </CoinNameWrapper>
-);
-CoinName.propTypes = {
-    coinImg: PropTypes.string.isRequired,
-    text: PropTypes.string.isRequired,
-};
-
-const RowCoinWrapper = styled.div`
-    display: block;
-    height: 50px;
-
-    font-size: ${FONT_SIZE.BASE};
-    color: ${colors.TEXT_PRIMARY};
-    &:hover {
-        background-color: ${colors.GRAY_LIGHT};
-    }
-`;
-const RowCoin = ({
-    coin, icon,
-}) => (
-    <RowCoinWrapper>
-        <Row>
-            <CoinName
-                coinImg={coin.img}
-                text={coin.name}
-            />
-            {icon && (
-                <Icon
-                    icon={icon.type}
-                    size={27}
-                    color={icon.color}
-                />
-            )}
-        </Row>
-    </RowCoinWrapper>
-);
-RowCoin.propTypes = {
-    coin: PropTypes.shape({
-        img: PropTypes.string.isRequired,
-        name: PropTypes.string.isRequired,
-    }).isRequired,
-    icon: PropTypes.shape({
-        type: PropTypes.string.isRequired,
-        color: PropTypes.string.isRequired,
-    }),
-};
-
+import RowCoin from '../RowCoin';
 
 class CoinMenu extends Component {
     getBaseUrl() {
@@ -136,9 +60,10 @@ class CoinMenu extends Component {
                                 img: coin.image,
                                 name: coin.coinName,
                             }}
-                            icon={{
+                            iconRight={{
                                 type: ICONS.SKIP,
                                 color: colors.TEXT_SECONDARY,
+                                size: 27,
                             }}
                         />
                     </a>
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js b/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
index de5f8209..5a8598f8 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';
 import { TRANSITION_TIME } from 'config/variables';
 
 const Wrapper = styled.div`
-    padding: 16px 24px;
     height: 100%;
 
     display: flex;
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js
new file mode 100644
index 00000000..9066a06e
--- /dev/null
+++ b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js
@@ -0,0 +1,35 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import styled from 'styled-components';
+import { ICON_SIZE } from 'config/variables';
+
+const CoinNameWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const Logo = styled.div`
+    height: ${ICON_SIZE.BASE};
+    width: ${ICON_SIZE.BASE};
+    margin-right: 5px;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: auto ${ICON_SIZE.BASE};
+    background-image: url('${props => props.coinImg}');
+`;
+
+const CoinName = ({
+    coinImg, text,
+}) => (
+    <CoinNameWrapper>
+        {coinImg && <Logo coinImg={coinImg} />}
+        <p>{text}</p>
+    </CoinNameWrapper>
+);
+CoinName.propTypes = {
+    coinImg: PropTypes.string,
+    text: PropTypes.string.isRequired,
+};
+
+export default CoinName;
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
new file mode 100644
index 00000000..7352d990
--- /dev/null
+++ b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
@@ -0,0 +1,76 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+import Icon from 'components/Icon';
+import { FONT_SIZE } from 'config/variables';
+import colors from 'config/colors';
+import Row from '../Row';
+import CoinName from './components/CoinName';
+
+const RowCoinWrapper = styled.div`
+    padding: 16px 24px;
+    height: 50px;
+    display: block;
+    font-size: ${FONT_SIZE.BASE};
+    color: ${colors.TEXT_PRIMARY};
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
+`;
+
+const Left = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const IconWrapper = styled.div`
+    margin-right: 10px;
+`;
+
+const RowCoin = ({
+    coin, iconLeft, iconRight,
+}) => (
+    <RowCoinWrapper>
+        <Row>
+            <Left>
+                {iconLeft && (
+                    <IconWrapper>
+                        <Icon
+                            icon={iconLeft.type}
+                            size={iconLeft.size}
+                            color={iconLeft.color}
+                        />
+                    </IconWrapper>
+                )}
+                <CoinName
+                    coinImg={coin.img}
+                    text={coin.name}
+                />
+            </Left>
+            {iconRight && (
+                <Icon
+                    icon={iconRight.type}
+                    size={iconRight.size}
+                    color={iconRight.color}
+                />
+            )}
+        </Row>
+    </RowCoinWrapper>
+);
+
+const iconShape = {
+    type: PropTypes.string.isRequired,
+    color: PropTypes.string.isRequired,
+    size: PropTypes.number.isRequired,
+};
+RowCoin.propTypes = {
+    coin: PropTypes.shape({
+        img: PropTypes.string.isRequired,
+        name: PropTypes.string.isRequired,
+    }).isRequired,
+    iconLeft: PropTypes.shape(iconShape),
+    iconRight: PropTypes.shape(iconShape),
+};
+
+export default RowCoin;

From fed2c3031aeb2b646dbe296a5ca908df3ef4cace Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 12:07:15 +0200
Subject: [PATCH 092/103] FIx double divider border in 'DeviceMenu'

---
 .../components/CoinMenu/index.js              |  2 ++
 .../components/DeviceMenu/index.js            |  4 ++--
 .../components/Divider/index.js               | 21 ++++++++++++++-----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
index 27b71639..c532ebef 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
@@ -52,6 +52,8 @@ class CoinMenu extends Component {
                 <Divider
                     textLeft="Other coins"
                     textRight="(You will be redirected)"
+                    borderTop
+                    borderBottom
                 />
                 {coins.map(coin => (
                     <a key={coin.url} href={coin.url}>
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index fb73650b..5c746d69 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -6,7 +6,7 @@ import type { TrezorDevice } from 'flowtype';
 
 import type { Props } from '../common';
 
-import AsideDivider from '../Divider';
+import Divider from '../Divider';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
@@ -214,7 +214,7 @@ export class DeviceDropdown extends Component<Props> {
         return (
             <React.Fragment>
                 {currentDeviceMenu}
-                {deviceList.length > 1 ? <AsideDivider textLeft="Other devices" /> : null}
+                {deviceList.length > 1 ? <Divider textLeft="Other devices" borderBottom /> : null}
                 {deviceList}
                 {webUsbButton}
             </React.Fragment>
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js b/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
index c077fc49..99abce67 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
@@ -1,4 +1,4 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 import React from 'react';
 import PropTypes from 'prop-types';
 
@@ -12,12 +12,21 @@ const Wrapper = styled.div`
     font-size: ${FONT_SIZE.SMALLER};
     color: ${colors.TEXT_SECONDARY};
     background: ${colors.GRAY_LIGHT};
-    border-top: 1px solid ${colors.DIVIDER};
-    border-bottom: 1px solid ${colors.DIVIDER};
+    ${props => props.borderTop && css`
+        border-top: 1px solid ${colors.DIVIDER};
+    `}
+    ${props => props.borderBottom && css`
+        border-bottom: 1px solid ${colors.DIVIDER};
+    `}
 `;
 
-const Divider = ({ textLeft, textRight }) => (
-    <Wrapper>
+const Divider = ({
+    textLeft, textRight, borderTop, borderBottom,
+}) => (
+    <Wrapper
+        borderTop={borderTop}
+        borderBottom={borderBottom}
+    >
         <p>{textLeft}</p>
         <p>{textRight}</p>
     </Wrapper>
@@ -26,6 +35,8 @@ const Divider = ({ textLeft, textRight }) => (
 Divider.propTypes = {
     textLeft: PropTypes.string,
     textRight: PropTypes.string,
+    borderTop: PropTypes.bool.isRequired,
+    borderBottom: PropTypes.bool.isRequired,
 };
 
 export default Divider;

From f534e76f64ad9c78b1f3841194890d7aa5d1583a Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 12:12:55 +0200
Subject: [PATCH 093/103] Add default props values to divider

---
 .../components/LeftNavigation/components/Divider/index.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js b/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
index 99abce67..681f1847 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/Divider/index.js
@@ -21,7 +21,7 @@ const Wrapper = styled.div`
 `;
 
 const Divider = ({
-    textLeft, textRight, borderTop, borderBottom,
+    textLeft, textRight, borderTop = false, borderBottom = false,
 }) => (
     <Wrapper
         borderTop={borderTop}

From 23db6d173786cdeb9564e70549ebcb9596a2ec88 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 17 Aug 2018 12:32:57 +0200
Subject: [PATCH 094/103] Separate function

---
 .eslintrc                                     |  1 +
 .../components/CoinMenu/index.js              | 46 +++++++++----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 6bc0340c..853370ab 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -9,6 +9,7 @@
         "jest": true
     },
     "rules": {
+        "class-methods-use-this": 0,
         "react/require-default-props": 0,
         "react/forbid-prop-types": 0,
         "react/destructuring-assignment": 0,
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
index 27b71639..f3a48ce1 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
@@ -22,33 +22,33 @@ class CoinMenu extends Component {
         return baseUrl;
     }
 
+    getImgUrl(network) {
+        let imgName = network;
+        if (network === 'ethereum') {
+            imgName = 'eth';
+        } else if (network === 'ethereum-classic') {
+            imgName = 'etc';
+        }
+        return `../images/${imgName}-logo.png`;
+    }
+
     render() {
         const { config } = this.props.localStorage;
         return (
             <React.Fragment>
-                {config.coins.map((item) => {
-                    let imgName = item.network;
-                    if (item.network === 'ethereum') {
-                        imgName = 'eth';
-                    } else if (item.network === 'ethereum-classic') {
-                        imgName = 'etc';
-                    }
-                    const imgUrl = `../images/${imgName}-logo.png`;
-
-                    return (
-                        <NavLink
-                            key={item.network}
-                            to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
-                        >
-                            <RowCoin
-                                coin={{
-                                    img: imgUrl,
-                                    name: item.name,
-                                }}
-                            />
-                        </NavLink>
-                    );
-                })}
+                {config.coins.map(item => (
+                    <NavLink
+                        key={item.network}
+                        to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
+                    >
+                        <RowCoin
+                            coin={{
+                                img: this.getImgUrl(item.network),
+                                name: item.name,
+                            }}
+                        />
+                    </NavLink>
+                ))}
                 <Divider
                     textLeft="Other coins"
                     textRight="(You will be redirected)"

From 9cff1868d24aafa8ef888907670bf6a6ae088ec4 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 17 Aug 2018 12:35:12 +0200
Subject: [PATCH 095/103] Added wrapper

---
 .../LeftNavigation/components/CoinMenu/index.js           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
index f3a48ce1..207ecb52 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
@@ -1,4 +1,4 @@
-/* @flow */
+import styled from 'styled-components';
 import coins from 'constants/coins';
 import colors from 'config/colors';
 import ICONS from 'config/icons';
@@ -8,6 +8,8 @@ import { NavLink } from 'react-router-dom';
 import Divider from '../Divider';
 import RowCoin from '../RowCoin';
 
+const Wrapper = styled.div``;
+
 class CoinMenu extends Component {
     getBaseUrl() {
         const { selectedDevice } = this.props.wallet;
@@ -35,7 +37,7 @@ class CoinMenu extends Component {
     render() {
         const { config } = this.props.localStorage;
         return (
-            <React.Fragment>
+            <Wrapper>
                 {config.coins.map(item => (
                     <NavLink
                         key={item.network}
@@ -68,7 +70,7 @@ class CoinMenu extends Component {
                         />
                     </a>
                 ))}
-            </React.Fragment>
+            </Wrapper>
         );
     }
 }

From 8c4d68f49c6cb9eb2b7f0d9076ea7188e42bf6de Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 17 Aug 2018 12:39:15 +0200
Subject: [PATCH 096/103] Indent small enhancements

---
 .../LeftNavigation/components/Row/index.js       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js b/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
index 5a8598f8..c0f27b06 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/Row/index.js
@@ -6,26 +6,22 @@ import { TRANSITION_TIME } from 'config/variables';
 
 const Wrapper = styled.div`
     height: 100%;
-
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    cursor: pointer;
+    transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
+
     ${props => props.column && css`
         flex-direction: column;
         align-items: flex-start;
     `}
-
-    cursor: pointer;
-    transition: background-color ${TRANSITION_TIME.BASE}, color ${TRANSITION_TIME.BASE};
 `;
 
-const Row = ({
-    children, column = false,
-}) => (
-    <Wrapper
-        column={column}
-    >{children}
+const Row = ({ children, column = false }) => (
+    <Wrapper column={column}>
+        {children}
     </Wrapper>
 );
 

From 18425310deb0ba2acdd098a01a686db1e072a203 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 12:53:49 +0200
Subject: [PATCH 097/103] Style RowAccount & add selection

---
 .../components/AccountMenu/index.js           | 79 +++++++++----------
 src/styles/aside.less                         | 76 +++++++++---------
 2 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index 64825764..b7688678 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -1,5 +1,5 @@
 /* @flow */
-import React, { components } from 'react';
+import React, { Component } from 'react';
 import BigNumber from 'bignumber.js';
 import colors from 'config/colors';
 import Loader from 'components/LoaderCircle';
@@ -26,12 +26,13 @@ const Text = styled.span`
 
 const RowAccountWrapper = styled.div`
     height: 64px;
-
+    padding: 16px 0 16px 24px;
     font-size: ${FONT_SIZE.SMALL};
     color: ${colors.TEXT_PRIMARY};
-
     border-top: 1px solid ${colors.DIVIDER};
-
+    &:hover {
+        background-color: ${colors.GRAY_LIGHT};
+    }
     ${props => props.isSelected && css`
         border-left: ${BORDER_WIDTH.SELECTED} solid ${colors.GREEN_PRIMARY};
         background: ${colors.WHITE};
@@ -47,27 +48,24 @@ const RowAccountWrapper = styled.div`
 `;
 
 const RowAccount = ({
-    accountIndex, balance, url, isSelected = false,
+    accountIndex, balance, isSelected = false,
 }) => (
-    <NavLink to={url}>
-        <RowAccountWrapper
-            to={url}
-            isSelected={isSelected}
-        >
-            <Row column>
-                Account #{accountIndex + 1}
-                {balance ? (
-                    <Text>{balance}</Text>
-                ) : (
-                    <Text>Loading...</Text>
-                )}
-            </Row>
-        </RowAccountWrapper>
-    </NavLink>
+    <RowAccountWrapper
+        isSelected={isSelected}
+    >
+        <Row column>
+            Account #{accountIndex + 1}
+            {balance ? (
+                <Text>{balance}</Text>
+            ) : (
+                <Text>Loading...</Text>
+            )}
+        </Row>
+    </RowAccountWrapper>
 );
+
 RowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
-    url: PropTypes.string.isRequired,
     balance: PropTypes.string,
     isSelected: PropTypes.bool,
 };
@@ -104,18 +102,19 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
             }
         }
 
+        const urlAccountIndex = parseInt(props.location.state.account);
         return (
-            <RowAccount
+            <NavLink
+                to={url}
                 key={account.index}
-                accountIndex={account.index}
-                balance={balance}
-                url={url}
-            />
-
-            // <NavLink key={i} activeClassName="selected" className="account" to={url}>
-            //     { `Account #${(account.index + 1)}` }
-            //     <span>{ account.loaded ? balance : 'Loading...' }</span>
-            // </NavLink>
+            >
+                <RowAccount
+                    accountIndex={account.index}
+                    url={url}
+                    balance={balance}
+                    isSelected={urlAccountIndex === account.index}
+                />
+            </NavLink>
         );
     });
 
@@ -123,15 +122,15 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
         if (selected.connected) {
             const url: string = location.pathname.replace(/account+\/([0-9]*)/, 'account/0');
             selectedAccounts = (
-                <RowAccount
-                    accountIndex={0}
-                    url={url}
-                />
-
-                // <NavLink activeClassName="selected" className="account" to={url}>
-                //     Account #1
-                //     <span>Loading...</span>
-                // </NavLink>
+                <NavLink
+                    to={url}
+                >
+                    <RowAccount
+                        accountIndex={0}
+                        url={url}
+                        isSelected
+                    />
+                </NavLink>
             );
         }
     }
diff --git a/src/styles/aside.less b/src/styles/aside.less
index 808c0c97..ca9d26b6 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -376,37 +376,37 @@ aside {
         //     }
         // }
 
-        &.back {
-            padding-left: 80px;
+        // &.back {
+        //     padding-left: 80px;
 
-            &:before {
-                content: '';
-                position: absolute;
-                display: block;
-                width: 20px;
-                height: 20px;
-                left: 56px;
-                top: 0px;
-                bottom: 0px;
-                margin: auto 0;
-                background-repeat: no-repeat;
-                background-position: center;
-                background-size: auto 20px;
-            }
+        //     &:before {
+        //         content: '';
+        //         position: absolute;
+        //         display: block;
+        //         width: 20px;
+        //         height: 20px;
+        //         left: 56px;
+        //         top: 0px;
+        //         bottom: 0px;
+        //         margin: auto 0;
+        //         background-repeat: no-repeat;
+        //         background-position: center;
+        //         background-size: auto 20px;
+        //     }
 
-            &:after {
-                .icomoon-arrow-left;
-                position: absolute;
-                display: block;
-                width: 20px;
-                height: 20px;
-                left: 24px;
-                top: 0px;
-                bottom: 0px;
-                margin: auto 0;
-                font-size: 20px;
-            }
-        }
+        //     &:after {
+        //         .icomoon-arrow-left;
+        //         position: absolute;
+        //         display: block;
+        //         width: 20px;
+        //         height: 20px;
+        //         left: 24px;
+        //         top: 0px;
+        //         bottom: 0px;
+        //         margin: auto 0;
+        //         font-size: 20px;
+        //     }
+        // }
 
         // &.ethereum:before,
         // &.ethereum-classic:before,
@@ -465,15 +465,15 @@ aside {
     //     }
     // }
 
-    .device-divider {
-        font-size: 12px;
-        display: flex;
-        justify-content: space-between;
-        color: @color_text_secondary;
-        background: @color_gray_light;
-        padding: 8px 28px 8px 24px;
-        border-bottom: 1px solid @color_divider;
-    }
+    // .device-divider {
+    //     font-size: 12px;
+    //     display: flex;
+    //     justify-content: space-between;
+    //     color: @color_text_secondary;
+    //     background: @color_gray_light;
+    //     padding: 8px 28px 8px 24px;
+    //     border-bottom: 1px solid @color_divider;
+    // }
 
     .help {
         width: 319px; // - 1px border-roght; 320px;

From fd1bdb2f85a5bd882d15a4f3b5f602f76b546b8f Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 12:56:37 +0200
Subject: [PATCH 098/103] Disable CSS styles

---
 src/styles/aside.less | 70 +++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/styles/aside.less b/src/styles/aside.less
index ca9d26b6..e0288643 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -264,7 +264,7 @@ aside {
         }
     }
 
-    a {
+    // a {
         // position: relative;
         // display: block;
         // cursor: pointer;
@@ -280,7 +280,7 @@ aside {
         //     background-color: @color_gray_light;
         // }
 
-        &.account {
+        // &.account {
             // height: 64px;
             // display: flex;
             // flex-direction: column;
@@ -293,46 +293,46 @@ aside {
             //     color: @color_text_secondary;
             // }
 
-            &:before {
-                content: '';
-                width: 0px;
-                height: 100%;
-                position: absolute;
-                top: 0;
-                left: 0;
-                background: @color_green_primary;
-                transition: width 0.3s;
-            }
+            // &:before {
+            //     content: '';
+            //     width: 0px;
+            //     height: 100%;
+            //     position: absolute;
+            //     top: 0;
+            //     left: 0;
+            //     background: @color_green_primary;
+            //     transition: width 0.3s;
+            // }
 
-            &.selected {
-                background: @color_white;
+            // &.selected {
+            //     background: @color_white;
                 //border-left: 3px solid @color_green_primary;
                 //border-bottom: 1px solid @color_divider;
                 //padding-left: 27px;
 
-                &:before {
-                    width: 3px;
-                }
+                // &:before {
+                //     width: 3px;
+                // }
 
-                &:hover {
-                    background: @color_white;
-                }
+                // &:hover {
+                //     background: @color_white;
+                // }
 
-                &:last-child {
+                // &:last-child {
                     // border-bottom: 1px solid @color_divider;
-                    &:after {
-                        content: '';
-                        position: absolute;
-                        bottom: 0px;
-                        left: 0px;
-                        width: 100%;
-                        height: 1px;
-                        line-height: 1px;
-                        background-color: @color_divider;
-                    }
-                }
-            }
-        }
+                    // &:after {
+                    //     content: '';
+                    //     position: absolute;
+                    //     bottom: 0px;
+                    //     left: 0px;
+                    //     width: 100%;
+                    //     height: 1px;
+                    //     line-height: 1px;
+                    //     background-color: @color_divider;
+                    // }
+                // }
+            // }
+        // }
 
 
 
@@ -448,7 +448,7 @@ aside {
         // &.zec:before {
         //     background-image: url('../images/zec-logo.png');
         // }
-    }
+    // }
 
     // .coin-divider {
     //     font-size: 12px;

From 5eebb76e27da6aa44a248c09fcc52f56b57a4a2d Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 13:02:13 +0200
Subject: [PATCH 099/103] Add wrappers

---
 .../LeftNavigation/components/AccountMenu/index.js        | 6 ++++--
 .../LeftNavigation/components/DeviceMenu/index.js         | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index b7688678..a5993b0e 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -19,6 +19,8 @@ import Row from '../Row';
 import RowCoin from '../RowCoin';
 
 
+const Wrapper = style.div``;
+
 const Text = styled.span`
     font-size: ${FONT_SIZE.SMALLER};
     color: ${colors.TEXT_SECONDARY};
@@ -210,13 +212,13 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
     }
 
     return (
-        <React.Fragment>
+        <Wrapper>
             {backButton}
             <div>
                 {selectedAccounts}
             </div>
             {discoveryStatus}
-        </React.Fragment>
+        </Wrapper>
     );
 };
 
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index 5c746d69..3b66792b 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -1,13 +1,15 @@
 /* @flow */
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
-
+import styled from 'styled-components';
 import type { TrezorDevice } from 'flowtype';
 
 import type { Props } from '../common';
 
 import Divider from '../Divider';
 
+const Wrapper = styled.div``;
+
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
     const { transport } = props.connect;
@@ -212,12 +214,12 @@ export class DeviceDropdown extends Component<Props> {
 
 
         return (
-            <React.Fragment>
+            <Wrapper>
                 {currentDeviceMenu}
                 {deviceList.length > 1 ? <Divider textLeft="Other devices" borderBottom /> : null}
                 {deviceList}
                 {webUsbButton}
-            </React.Fragment>
+            </Wrapper>
         );
     }
 }

From 95fb87d17fd1fd29322e4629ad150c581edbde37 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Fri, 17 Aug 2018 13:08:42 +0200
Subject: [PATCH 100/103] Move 'CoinName' component inside 'RowCoin'

---
 .../components/AccountMenu/index.js           |  2 +-
 .../RowCoin/components/CoinName/index.js      | 35 -------------------
 .../components/RowCoin/index.js               | 27 ++++++++++----
 3 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index a5993b0e..ae6cbeef 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -19,7 +19,7 @@ import Row from '../Row';
 import RowCoin from '../RowCoin';
 
 
-const Wrapper = style.div``;
+const Wrapper = styled.div``;
 
 const Text = styled.span`
     font-size: ${FONT_SIZE.SMALLER};
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js
deleted file mode 100644
index 9066a06e..00000000
--- a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/components/CoinName/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import styled from 'styled-components';
-import { ICON_SIZE } from 'config/variables';
-
-const CoinNameWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-`;
-
-const Logo = styled.div`
-    height: ${ICON_SIZE.BASE};
-    width: ${ICON_SIZE.BASE};
-    margin-right: 5px;
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: auto ${ICON_SIZE.BASE};
-    background-image: url('${props => props.coinImg}');
-`;
-
-const CoinName = ({
-    coinImg, text,
-}) => (
-    <CoinNameWrapper>
-        {coinImg && <Logo coinImg={coinImg} />}
-        <p>{text}</p>
-    </CoinNameWrapper>
-);
-CoinName.propTypes = {
-    coinImg: PropTypes.string,
-    text: PropTypes.string.isRequired,
-};
-
-export default CoinName;
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
index 7352d990..455c747b 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
@@ -2,10 +2,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import Icon from 'components/Icon';
-import { FONT_SIZE } from 'config/variables';
+import { ICON_SIZE, FONT_SIZE } from 'config/variables';
 import colors from 'config/colors';
 import Row from '../Row';
-import CoinName from './components/CoinName';
+
+const CoinNameWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const Logo = styled.div`
+    height: ${ICON_SIZE.BASE};
+    width: ${ICON_SIZE.BASE};
+    margin-right: 5px;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: auto ${ICON_SIZE.BASE};
+    background-image: url('${props => props.coinImg}');
+`;
 
 const RowCoinWrapper = styled.div`
     padding: 16px 24px;
@@ -43,10 +58,10 @@ const RowCoin = ({
                         />
                     </IconWrapper>
                 )}
-                <CoinName
-                    coinImg={coin.img}
-                    text={coin.name}
-                />
+                <CoinNameWrapper>
+                    <Logo coinImg={coin.img} />
+                    <p>{coin.name}</p>
+                </CoinNameWrapper>
             </Left>
             {iconRight && (
                 <Icon

From 4fb214b588743583c6fa1c7288d174ea8556e076 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 17 Aug 2018 13:10:55 +0200
Subject: [PATCH 101/103] Connect device split

---
 .../views/Landing/components/ConnectDevice.js | 114 ------------------
 .../components/ConnectHIDDevice.js            |  32 +++++
 .../components/ConnectWebUsbDevice.js         |  48 ++++++++
 .../components/DisconnectDevice.js            |  25 ++++
 .../Landing/components/ConnectDevice/index.js |  28 +++++
 5 files changed, 133 insertions(+), 114 deletions(-)
 delete mode 100644 src/js/views/Landing/components/ConnectDevice.js
 create mode 100644 src/js/views/Landing/components/ConnectDevice/components/ConnectHIDDevice.js
 create mode 100644 src/js/views/Landing/components/ConnectDevice/components/ConnectWebUsbDevice.js
 create mode 100644 src/js/views/Landing/components/ConnectDevice/components/DisconnectDevice.js
 create mode 100644 src/js/views/Landing/components/ConnectDevice/index.js

diff --git a/src/js/views/Landing/components/ConnectDevice.js b/src/js/views/Landing/components/ConnectDevice.js
deleted file mode 100644
index fc007576..00000000
--- a/src/js/views/Landing/components/ConnectDevice.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/* @flow */
-
-import React, { Component } from 'react';
-import TrezorConnect from 'trezor-connect';
-import { H2 } from 'components/Heading';
-
-import type { State, TrezorDevice } from 'flowtype';
-
-type Props = {
-    transport: $PropertyType<$ElementType<State, 'connect'>, 'transport'>;
-    disconnectRequest: ?TrezorDevice;
-}
-
-const DisconnectDevice = (props: Props) => {
-    if (!props.disconnectRequest) return null;
-    return (
-        <main>
-            <H2 claim>The private bank in your hands.</H2>
-            <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
-            <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
-            <div className="row">
-                <p className="connect">
-                    <span>
-                        Unplug { props.disconnectRequest.instanceLabel } device.
-                    </span>
-                </p>
-            </div>
-            <div className="image" />
-        </main>
-    );
-};
-
-const ConnectHIDDevice = (props: Props) => (
-    <main>
-        <H2 claim>The private bank in your hands.</H2>
-        <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
-        <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
-        <div className="row">
-            <p className="connect">
-                <span>
-                    <svg width="12px" height="35px" viewBox="0 0 20 57">
-                        <g stroke="none" strokeWidth="1" fill="none" transform="translate(1, 1)">
-                            <rect className="connect-usb-pin" fill="#01B757" x="6" y="39" width="6" height="5" />
-                            <rect className="connect-usb-cable" stroke="#01B757" strokeWidth="1" x="8.5" y="44.5" width="1" height="11" />
-                            <path stroke="#01B757" d="M8.90856859,33.9811778 L6.43814432,33.9811778 C5.45301486,34.0503113 4.69477081,33.6889084 4.1634122,32.8969691 C3.36637428,31.7090602 -0.000402169348,26.3761977 0.0748097911,23.2982514 C0.124878873,21.2492429 0.0999525141,14.5598149 3.07156595e-05,3.22996744 C-0.000274213164,3.1963928 0.00243636275,3.162859 0.00812115776,3.12976773 C0.28477346,1.51937083 1.22672004,0.617538852 2.8339609,0.424271782 C4.45813658,0.228968338 6.54411954,0.0875444105 9.09190977,0 L9.09190977,0.0169167084 C11.5566027,0.104886477 13.5814718,0.244169993 15.1665175,0.434768145 C16.7530267,0.625542287 17.6912941,1.50671985 17.9813196,3.07830083 C17.9943481,3.14889902 18.0005888,3.22058224 17.9999563,3.29236974 L17.9999901,3.29237004 C17.9004498,14.5907444 17.875676,21.2628703 17.9256686,23.3087478 C18.0008805,26.3866941 14.6341041,31.7195566 13.8370662,32.9074655 C13.3057075,33.6994047 12.5474635,34.0608076 11.562334,33.9916742 L8.90856859,33.9916742 L8.90856859,33.9811778 Z" />
-                            <rect fill="#01B757" x="2" y="7" width="14" height="7" rx="0.5625" />
-                        </g>
-                    </svg>
-                        Connect TREZOR to continue
-                </span>
-            </p>
-        </div>
-        <div className="image">
-            <p>
-                <span>Don't have TREZOR? <a href="https://trezor.io/" className="green" target="_blank" rel="noreferrer noopener">Get one</a></span>
-            </p>
-        </div>
-    </main>
-);
-
-class ConnectWebUsbDevice extends Component<Props> {
-    componentDidMount(): void {
-        TrezorConnect.renderWebUSBButton();
-    }
-
-    componentDidUpdate() {
-        TrezorConnect.renderWebUSBButton();
-    }
-
-    render() {
-        return (
-            <main>
-                <H2 claim>The private bank in your hands.</H2>
-                <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
-                <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
-                <div className="row webusb">
-                    <p className="connect">
-                        <span>
-                            <svg width="12px" height="35px" viewBox="0 0 20 57">
-                                <g stroke="none" strokeWidth="1" fill="none" transform="translate(1, 1)">
-                                    <rect className="connect-usb-pin" fill="#01B757" x="6" y="39" width="6" height="5" />
-                                    <rect className="connect-usb-cable" stroke="#01B757" strokeWidth="1" x="8.5" y="44.5" width="1" height="11" />
-                                    <path stroke="#01B757" d="M8.90856859,33.9811778 L6.43814432,33.9811778 C5.45301486,34.0503113 4.69477081,33.6889084 4.1634122,32.8969691 C3.36637428,31.7090602 -0.000402169348,26.3761977 0.0748097911,23.2982514 C0.124878873,21.2492429 0.0999525141,14.5598149 3.07156595e-05,3.22996744 C-0.000274213164,3.1963928 0.00243636275,3.162859 0.00812115776,3.12976773 C0.28477346,1.51937083 1.22672004,0.617538852 2.8339609,0.424271782 C4.45813658,0.228968338 6.54411954,0.0875444105 9.09190977,0 L9.09190977,0.0169167084 C11.5566027,0.104886477 13.5814718,0.244169993 15.1665175,0.434768145 C16.7530267,0.625542287 17.6912941,1.50671985 17.9813196,3.07830083 C17.9943481,3.14889902 18.0005888,3.22058224 17.9999563,3.29236974 L17.9999901,3.29237004 C17.9004498,14.5907444 17.875676,21.2628703 17.9256686,23.3087478 C18.0008805,26.3866941 14.6341041,31.7195566 13.8370662,32.9074655 C13.3057075,33.6994047 12.5474635,34.0608076 11.562334,33.9916742 L8.90856859,33.9916742 L8.90856859,33.9811778 Z" />
-                                    <rect fill="#01B757" x="2" y="7" width="14" height="7" rx="0.5625" />
-                                </g>
-                            </svg>
-                            Connect TREZOR
-                        </span>
-                    </p>
-                    <p className="webusb-and">and</p>
-                    <button className="trezor-webusb-button">Check for devices</button>
-                </div>
-                <div className="image">
-                    <p>
-                        <span>Device not recognized? <a href="#/bridge" className="green">Try installing the TREZOR Bridge.</a></span>
-                        <span>Don't have TREZOR? <a href="https://trezor.io/" className="green" target="_blank" rel="noreferrer noopener">Get one</a></span>
-                    </p>
-                </div>
-            </main>
-        );
-    }
-}
-
-const ConnectDevice = (props: Props) => {
-    const { transport, disconnectRequest } = props;
-    if (disconnectRequest) {
-        return <DisconnectDevice {...props} />;
-    } if (transport && transport.version.indexOf('webusb') >= 0) {
-        return <ConnectWebUsbDevice {...props} />;
-    }
-    return <ConnectHIDDevice {...props} />;
-};
-
-export default ConnectDevice;
\ No newline at end of file
diff --git a/src/js/views/Landing/components/ConnectDevice/components/ConnectHIDDevice.js b/src/js/views/Landing/components/ConnectDevice/components/ConnectHIDDevice.js
new file mode 100644
index 00000000..c4abe2da
--- /dev/null
+++ b/src/js/views/Landing/components/ConnectDevice/components/ConnectHIDDevice.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import { H2 } from 'components/Heading';
+
+const ConnectHIDDevice = () => (
+    <main>
+        <H2 claim>The private bank in your hands.</H2>
+        <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
+        <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
+        <div className="row">
+            <p className="connect">
+                <span>
+                    <svg width="12px" height="35px" viewBox="0 0 20 57">
+                        <g stroke="none" strokeWidth="1" fill="none" transform="translate(1, 1)">
+                            <rect className="connect-usb-pin" fill="#01B757" x="6" y="39" width="6" height="5" />
+                            <rect className="connect-usb-cable" stroke="#01B757" strokeWidth="1" x="8.5" y="44.5" width="1" height="11" />
+                            <path stroke="#01B757" d="M8.90856859,33.9811778 L6.43814432,33.9811778 C5.45301486,34.0503113 4.69477081,33.6889084 4.1634122,32.8969691 C3.36637428,31.7090602 -0.000402169348,26.3761977 0.0748097911,23.2982514 C0.124878873,21.2492429 0.0999525141,14.5598149 3.07156595e-05,3.22996744 C-0.000274213164,3.1963928 0.00243636275,3.162859 0.00812115776,3.12976773 C0.28477346,1.51937083 1.22672004,0.617538852 2.8339609,0.424271782 C4.45813658,0.228968338 6.54411954,0.0875444105 9.09190977,0 L9.09190977,0.0169167084 C11.5566027,0.104886477 13.5814718,0.244169993 15.1665175,0.434768145 C16.7530267,0.625542287 17.6912941,1.50671985 17.9813196,3.07830083 C17.9943481,3.14889902 18.0005888,3.22058224 17.9999563,3.29236974 L17.9999901,3.29237004 C17.9004498,14.5907444 17.875676,21.2628703 17.9256686,23.3087478 C18.0008805,26.3866941 14.6341041,31.7195566 13.8370662,32.9074655 C13.3057075,33.6994047 12.5474635,34.0608076 11.562334,33.9916742 L8.90856859,33.9916742 L8.90856859,33.9811778 Z" />
+                            <rect fill="#01B757" x="2" y="7" width="14" height="7" rx="0.5625" />
+                        </g>
+                    </svg>
+                        Connect TREZOR to continue
+                </span>
+            </p>
+        </div>
+        <div className="image">
+            <p>
+                <span>Don't have TREZOR? <a href="https://trezor.io/" className="green" target="_blank" rel="noreferrer noopener">Get one</a></span>
+            </p>
+        </div>
+    </main>
+);
+
+export default ConnectHIDDevice;
\ No newline at end of file
diff --git a/src/js/views/Landing/components/ConnectDevice/components/ConnectWebUsbDevice.js b/src/js/views/Landing/components/ConnectDevice/components/ConnectWebUsbDevice.js
new file mode 100644
index 00000000..0e075ba2
--- /dev/null
+++ b/src/js/views/Landing/components/ConnectDevice/components/ConnectWebUsbDevice.js
@@ -0,0 +1,48 @@
+import React, { Component } from 'react';
+import { H2 } from 'components/Heading';
+import TrezorConnect from 'trezor-connect';
+
+class ConnectWebUsbDevice extends Component<Props> {
+    componentDidMount() {
+        TrezorConnect.renderWebUSBButton();
+    }
+
+    componentDidUpdate() {
+        TrezorConnect.renderWebUSBButton();
+    }
+
+    render() {
+        return (
+            <main>
+                <H2 claim>The private bank in your hands.</H2>
+                <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
+                <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
+                <div className="row webusb">
+                    <p className="connect">
+                        <span>
+                            <svg width="12px" height="35px" viewBox="0 0 20 57">
+                                <g stroke="none" strokeWidth="1" fill="none" transform="translate(1, 1)">
+                                    <rect className="connect-usb-pin" fill="#01B757" x="6" y="39" width="6" height="5" />
+                                    <rect className="connect-usb-cable" stroke="#01B757" strokeWidth="1" x="8.5" y="44.5" width="1" height="11" />
+                                    <path stroke="#01B757" d="M8.90856859,33.9811778 L6.43814432,33.9811778 C5.45301486,34.0503113 4.69477081,33.6889084 4.1634122,32.8969691 C3.36637428,31.7090602 -0.000402169348,26.3761977 0.0748097911,23.2982514 C0.124878873,21.2492429 0.0999525141,14.5598149 3.07156595e-05,3.22996744 C-0.000274213164,3.1963928 0.00243636275,3.162859 0.00812115776,3.12976773 C0.28477346,1.51937083 1.22672004,0.617538852 2.8339609,0.424271782 C4.45813658,0.228968338 6.54411954,0.0875444105 9.09190977,0 L9.09190977,0.0169167084 C11.5566027,0.104886477 13.5814718,0.244169993 15.1665175,0.434768145 C16.7530267,0.625542287 17.6912941,1.50671985 17.9813196,3.07830083 C17.9943481,3.14889902 18.0005888,3.22058224 17.9999563,3.29236974 L17.9999901,3.29237004 C17.9004498,14.5907444 17.875676,21.2628703 17.9256686,23.3087478 C18.0008805,26.3866941 14.6341041,31.7195566 13.8370662,32.9074655 C13.3057075,33.6994047 12.5474635,34.0608076 11.562334,33.9916742 L8.90856859,33.9916742 L8.90856859,33.9811778 Z" />
+                                    <rect fill="#01B757" x="2" y="7" width="14" height="7" rx="0.5625" />
+                                </g>
+                            </svg>
+                            Connect TREZOR
+                        </span>
+                    </p>
+                    <p className="webusb-and">and</p>
+                    <button className="trezor-webusb-button">Check for devices</button>
+                </div>
+                <div className="image">
+                    <p>
+                        <span>Device not recognized? <a href="#/bridge" className="green">Try installing the TREZOR Bridge.</a></span>
+                        <span>Don't have TREZOR? <a href="https://trezor.io/" className="green" target="_blank" rel="noreferrer noopener">Get one</a></span>
+                    </p>
+                </div>
+            </main>
+        );
+    }
+}
+
+export default ConnectWebUsbDevice;
\ No newline at end of file
diff --git a/src/js/views/Landing/components/ConnectDevice/components/DisconnectDevice.js b/src/js/views/Landing/components/ConnectDevice/components/DisconnectDevice.js
new file mode 100644
index 00000000..e26db268
--- /dev/null
+++ b/src/js/views/Landing/components/ConnectDevice/components/DisconnectDevice.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { H2 } from 'components/Heading';
+
+const DisconnectDevice = ({ instanceLabel }) => (
+    <main>
+        <H2 claim>The private bank in your hands.</H2>
+        <p>TREZOR Wallet is an easy-to-use interface for your TREZOR.</p>
+        <p>TREZOR Wallet allows you to easily control your funds, manage your balance and initiate transfers.</p>
+        <div className="row">
+            <p className="connect">
+                <span>
+                        Unplug { instanceLabel } device.
+                </span>
+            </p>
+        </div>
+        <div className="image" />
+    </main>
+);
+
+DisconnectDevice.propTypes = {
+    instanceLabel: PropTypes.string.isRequired,
+};
+
+export default DisconnectDevice;
\ No newline at end of file
diff --git a/src/js/views/Landing/components/ConnectDevice/index.js b/src/js/views/Landing/components/ConnectDevice/index.js
new file mode 100644
index 00000000..f2d7bc2e
--- /dev/null
+++ b/src/js/views/Landing/components/ConnectDevice/index.js
@@ -0,0 +1,28 @@
+/* @flow */
+
+import React, { Component } from 'react';
+import TrezorConnect from 'trezor-connect';
+import { H2 } from 'components/Heading';
+
+import type { State, TrezorDevice } from 'flowtype';
+
+import DisconnectDevice from './components/DisconnectDevice';
+import ConnectHIDDevice from './components/ConnectHIDDevice';
+import ConnectWebUsbDevice from './components/ConnectWebUsbDevice';
+
+type Props = {
+    transport: $PropertyType<$ElementType<State, 'connect'>, 'transport'>;
+    disconnectRequest: ?TrezorDevice;
+}
+
+const ConnectDevice = (props: Props) => {
+    const { transport, disconnectRequest } = props;
+    if (disconnectRequest) {
+        return <DisconnectDevice instanceLabel={props.disconnectRequest.instanceLabel} />;
+    } if (transport && transport.version.indexOf('webusb') >= 0) {
+        return <ConnectWebUsbDevice {...props} />;
+    }
+    return <ConnectHIDDevice {...props} />;
+};
+
+export default ConnectDevice;
\ No newline at end of file

From 2d9bad285bb7479cba2e645ab21ffe22d51590c6 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Fri, 17 Aug 2018 15:08:38 +0200
Subject: [PATCH 102/103] Device list first part refactoring

---
 .../DeviceMenu/components/DeviceList/index.js | 47 +++++++++++++++++++
 .../components/DeviceMenu/index.js            | 12 ++---
 2 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js

diff --git a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js
new file mode 100644
index 00000000..81935b30
--- /dev/null
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import styled from 'styled-components';
+import deviceConstants from 'constants/device';
+
+const Wrapper = styled.div``;
+
+class DeviceList {
+    getStatus(device) {
+        let deviceStatus = '';
+        if (device.type === 'unacquired' || (device.features && device.status === 'occupied')) {
+            deviceStatus = 'Used in other window';
+        } else if (device.type === 'unreadable') {
+            deviceStatus = 'Connected';
+        } else if (!device.connected) {
+            deviceStatus = 'Disconnected';
+        } else if (!device.available) {
+            deviceStatus = 'Unavailable';
+        }
+
+        return deviceStatus;
+    }
+
+    render() {
+        return (
+            <Wrapper>
+                {this.props.devices.map((device, index) => (
+                    <div key={index} className={css} onClick={() => this.props.onSelectDevice(device)}>
+                        <div className="label-container">
+                            <span className="label">{device.instanceLabel}</span>
+                            <span className="status">{this.getStatus(device)}</span>
+                        </div>
+                        <div
+                            className="forget-button"
+                            onClick={(event) => {
+                                event.stopPropagation();
+                                event.preventDefault();
+                                this.onDeviceMenuClick({ type: 'forget', label: '' }, device);
+                            }}
+                        />
+                    </div>
+                ))}
+            </Wrapper>
+        );
+    }
+}
+
+export default DeviceList;
\ No newline at end of file
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index 3b66792b..fb73650b 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -1,14 +1,12 @@
 /* @flow */
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
-import styled from 'styled-components';
+
 import type { TrezorDevice } from 'flowtype';
 
 import type { Props } from '../common';
 
-import Divider from '../Divider';
-
-const Wrapper = styled.div``;
+import AsideDivider from '../Divider';
 
 export const DeviceSelect = (props: Props) => {
     const { devices } = props;
@@ -214,12 +212,12 @@ export class DeviceDropdown extends Component<Props> {
 
 
         return (
-            <Wrapper>
+            <React.Fragment>
                 {currentDeviceMenu}
-                {deviceList.length > 1 ? <Divider textLeft="Other devices" borderBottom /> : null}
+                {deviceList.length > 1 ? <AsideDivider textLeft="Other devices" /> : null}
                 {deviceList}
                 {webUsbButton}
-            </Wrapper>
+            </React.Fragment>
         );
     }
 }

From 570155511729160448ddbbff3cdc1a347da14ee9 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Mon, 20 Aug 2018 12:44:18 +0200
Subject: [PATCH 103/103] Refactor components/styles

---
 src/js/config/icons.js                        |   1 +
 .../components/AccountMenu/index.js           | 110 ++++++++++--
 .../components/StickyContainer/index.js       |  13 +-
 .../Wallet/components/LeftNavigation/index.js |  24 ++-
 src/styles/aside.less                         | 168 +++++++++---------
 5 files changed, 215 insertions(+), 101 deletions(-)

diff --git a/src/js/config/icons.js b/src/js/config/icons.js
index a4d679d2..936466a1 100644
--- a/src/js/config/icons.js
+++ b/src/js/config/icons.js
@@ -1,4 +1,5 @@
 export default {
+    PLUS: 'M768 512c0 22.080-17.92 40-40 40h-176v176c0 22.080-17.92 40-40 40s-40-17.92-40-40v-176h-176c-22.080 0-40-17.92-40-40s17.92-40 40-40h176v-176c0-22.080 17.92-40 40-40s40 17.92 40 40v176h176c22.080 0 40 17.92 40 40z',
     ARROW_LEFT: 'M603.072 757.216l-237.44-219.616c-8.576-8.128-13.632-19.296-13.632-31.040 0.288-11.744 5.056-23.2 13.664-31.040l227.040-208.768c16.928-15.36 43.040-14.176 58.176 3.008 15.424 16.864 13.952 43.392-2.656 59.040l-193.504 177.76 203.904 188.608c8 7.52 12.768 18.080 13.344 29.216 0.608 11.456-3.264 21.696-10.688 30.112-15.456 16.896-41.568 18.080-58.208 2.72z',
     CHAT: 'M580.992 256h-137.984c-103.296 0-187.008 85.952-187.008 192 0 96.608 69.536 176.32 160 189.792v130.208l128-128h36.992c103.296 0 187.008-85.952 187.008-192s-83.712-192-187.008-192z',
     SKIP: 'M512 256c-141.376 0-256 114.656-256 256 0 141.408 114.624 256 256 256s256-114.592 256-256c0-141.344-114.624-256-256-256zM529.056 631.456v-68.256c-102.4-34.144-136.544 0-170.656 68.256 0-170.656 102.4-204.8 170.656-204.8v-68.256l136.544 136.544-136.544 136.512z',
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index ae6cbeef..63976041 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -1,6 +1,7 @@
 /* @flow */
 import React, { Component } from 'react';
 import BigNumber from 'bignumber.js';
+import Icon from 'components/Icon';
 import colors from 'config/colors';
 import Loader from 'components/LoaderCircle';
 import PropTypes from 'prop-types';
@@ -11,7 +12,9 @@ import ICONS from 'config/icons';
 
 import { NavLink } from 'react-router-dom';
 import { findDeviceAccounts } from 'reducers/AccountsReducer';
-import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
+import {
+    FONT_SIZE, BORDER_WIDTH, TRANSITION_TIME,
+} from 'config/variables';
 
 import type { Accounts } from 'flowtype';
 import type { Props } from '../common';
@@ -72,6 +75,79 @@ RowAccount.propTypes = {
     isSelected: PropTypes.bool,
 };
 
+const AddAccountWrapper = styled.div`
+    position: relative;
+    padding: 8px 0 8px 20px;
+    cursor: pointer;
+    color: ${colors.TEXT_SECONDARY};
+    display: flex;
+    align-items: center;
+
+    &:hover {
+        color: ${colors.TEXT_PRIMARY};
+        transition: background-color ${TRANSITION_TIME.BASE} ease-in-out, color ${TRANSITION_TIME.BASE} ease-in-out, border-color ${TRANSITION_TIME.BASE} ease-in-out;
+    }
+`;
+
+const AddAccountIconWrapper = styled.div`
+    margin-right: 12px;
+`;
+
+const DiscoveryStatusWrapper = styled.div`
+    height: 64px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+    font-size: ${FONT_SIZE.SMALL};
+    padding: 16px 28px 16px 30px;
+    white-space: nowrap;
+    border-top: 1px solid ${colors.DIVIDER};
+`;
+
+const DiscoveryStatusText = styled.div`
+    display: block;
+    font-size: ${FONT_SIZE.SMALLER};
+    color: ${colors.TEXT_SECONDARY};
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const DiscoveryLoadingWrapper = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: ${FONT_SIZE.SMALL};
+    padding: 8px 0 8px 22px;
+    white-space: nowrap;
+    color: ${colors.TEXT_SECONDARY};
+`;
+
+const DiscoveryLoadingText = styled.span`
+    margin-left: 14px;
+`;
+
+// class AccountMenu extends Component {
+//     constructor(props: Props) {
+//         super(props);
+//         this.state = {
+//             selectedAccounts: null,
+//             selectedCoin: null,
+//         };
+//     }
+
+//     componentWillReceiveProps(nextProps) {
+
+//     }
+
+//     render() {
+//         return (
+//             <div>
+//                 Hello
+//             </div>
+//         );
+//     }
+// }
+
 const AccountMenu = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
     const { location } = props.router;
@@ -104,7 +180,7 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
             }
         }
 
-        const urlAccountIndex = parseInt(props.location.state.account);
+        const urlAccountIndex = parseInt(props.router.location.state.account, 10);
         return (
             <NavLink
                 to={url}
@@ -147,9 +223,18 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
             const lastAccount = deviceAccounts[deviceAccounts.length - 1];
             if (lastAccount && (new BigNumber(lastAccount.balance).greaterThan(0) || lastAccount.nonce > 0)) {
                 discoveryStatus = (
-                    <div className="add-account" onClick={props.addAccount}>
+                    <AddAccountWrapper
+                        onClick={props.addAccount}
+                    >
+                        <AddAccountIconWrapper>
+                            <Icon
+                                icon={ICONS.PLUS}
+                                size={24}
+                                color={colors.TEXT_SECONDARY}
+                            />
+                        </AddAccountIconWrapper>
                         Add account
-                    </div>
+                    </AddAccountWrapper>
                 );
             } else {
                 const tooltip = (
@@ -171,16 +256,21 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
             }
         } else if (!selected.connected || !selected.available) {
             discoveryStatus = (
-                <div className="discovery-status">
+                <DiscoveryStatusWrapper>
                     Accounts could not be loaded
-                    <span>{`Connect ${selected.instanceLabel} device`}</span>
-                </div>
+                    <DiscoveryStatusText>
+                        {`Connect ${selected.instanceLabel} device`}
+                    </DiscoveryStatusText>
+                </DiscoveryStatusWrapper>
             );
         } else {
             discoveryStatus = (
-                <div className="discovery-loading">
-                    <Loader size="20" /> Loading accounts...
-                </div>
+                <DiscoveryLoadingWrapper>
+                    <Loader size="20" />
+                    <DiscoveryLoadingText>
+                        Loading accounts...
+                    </DiscoveryLoadingText>
+                </DiscoveryLoadingWrapper>
             );
         }
     }
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js b/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
index 6116c04c..d7575935 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js
@@ -6,6 +6,7 @@
 import * as React from 'react';
 import raf from 'raf';
 import { getViewportHeight, getScrollY } from 'utils/windowUtils';
+import styled from 'styled-components';
 
 type Props = {
     location: string,
@@ -13,6 +14,13 @@ type Props = {
     children?: React.Node,
 }
 
+const StickyContainerWrapper = styled.div`
+    position: relative;
+    top: 0;
+    width: 320px;
+    overflow: hidden;
+`;
+
 export default class StickyContainer extends React.PureComponent<Props> {
     // Class variables.
     currentScrollY: number = 0;
@@ -136,12 +144,11 @@ export default class StickyContainer extends React.PureComponent<Props> {
                 onTouchMove={this.handleScroll}
                 onTouchEnd={this.handleScroll}
             >
-                <div
-                    className="sticky-container"
+                <StickyContainerWrapper
                     ref={node => this.wrapper = node}
                 >
                     {this.props.children}
-                </div>
+                </StickyContainerWrapper>
             </aside>
         );
     }
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 2e075b1c..c810a2d3 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -30,6 +30,9 @@ const StickyBottom = styled.div`
 const MenuWrapper = styled.div``;
 
 const Help = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
     text-align: center;
     width: 319px;
     padding: 8px 0px;
@@ -94,17 +97,30 @@ class LeftNavigation extends Component {
 
     // TODO: refactor to transition component for reuse of transitions
     getMenuTransition(children) {
+        console.warn('GET MENU TRANSITION', this.state.animationType);
         return (
             <TransitionGroupWrapper component="div" className="transition-container">
                 <CSSTransition
                     key={this.state.animationType}
-                    onExit={() => { window.dispatchEvent(new Event('resize')); }}
+                    onEnter={() => {
+                        console.warn('ON ENTER');
+                    }}
+                    onEntering={() => {
+                        console.warn('ON ENTERING (ACTIVE)');
+                    }}
+                    onExit={() => {
+                        console.warn('ON EXIT');
+                        window.dispatchEvent(new Event('resize'));
+                    }}
+                    onExiting={() => {
+                        console.warn('ON EXITING (ACTIVE)');
+                    }}
                     onExited={() => window.dispatchEvent(new Event('resize'))}
-                    in
-                    out
                     classNames={this.state.animationType}
                     appear={false}
-                    timeout={300}
+                    timeout={30000}
+                    in
+                    out
                 >
                     <TransitionContentWrapper>
                         {children}
diff --git a/src/styles/aside.less b/src/styles/aside.less
index e0288643..5b3fcfe1 100644
--- a/src/styles/aside.less
+++ b/src/styles/aside.less
@@ -6,10 +6,10 @@ aside {
     overflow-x: hidden;
 
     .sticky-container {
-        position: relative;
-        top: 0;
-        width: 320px;
-        overflow: hidden;
+        // position: relative;
+        // top: 0;
+        // width: 320px;
+        // overflow: hidden;
 
         &.fixed {
             position: fixed;
@@ -18,12 +18,12 @@ aside {
 
         &.fixed-bottom {
             padding-bottom: 60px; // height of .help
-            .sticky-bottom {
-                position: fixed;
-                bottom: 0;
-                background: @color_main;
-                border-right: 1px solid @color_divider;
-            }
+            // .sticky-bottom {
+            //     position: fixed;
+            //     bottom: 0;
+            //     background: @color_main;
+            //     border-right: 1px solid @color_divider;
+            // }
         }
     }
 
@@ -475,38 +475,38 @@ aside {
     //     border-bottom: 1px solid @color_divider;
     // }
 
-    .help {
-        width: 319px; // - 1px border-roght; 320px;
-        padding: 14px 0px;
-        text-align: center;
-        border-top: 1px solid @color_divider;
+    // .help {
+    //     width: 319px; // - 1px border-roght; 320px;
+    //     padding: 14px 0px;
+    //     text-align: center;
+    //     border-top: 1px solid @color_divider;
 
-        &.fixed {
-            position: fixed;
-            bottom: 0px;
-        }
+    //     &.fixed {
+    //         position: fixed;
+    //         bottom: 0px;
+    //     }
 
-        a {
-            color: @color_text_secondary;
-            font-size: 12px;
-            display: inline-block;
-            padding: 8px;
-            height: auto;
+    //     a {
+    //         color: @color_text_secondary;
+    //         font-size: 12px;
+    //         display: inline-block;
+    //         padding: 8px;
+    //         height: auto;
 
-            &:before {
-                .icomoon-chat;
-                font-size: 32px;
-                position: absolute;
-                top: 0px;
-                left: -26px;
-            }
+    //         &:before {
+    //             .icomoon-chat;
+    //             font-size: 32px;
+    //             position: absolute;
+    //             top: 0px;
+    //             left: -26px;
+    //         }
 
-            &:hover {
-                background: transparent;
-                color: @color_text_primary;
-            }
-        }
-    }
+    //         &:hover {
+    //             background: transparent;
+    //             color: @color_text_primary;
+    //         }
+    //     }
+    // }
 
     .wallet-settings {
 
@@ -514,56 +514,56 @@ aside {
 
 
 
-    .add-account {
-        position: relative;
-        padding: 8px 0 8px 20px;
-        cursor: pointer;
-        color: @color_text_secondary;
-        display: flex;
-        align-items: center;
+    // .add-account {
+    //     position: relative;
+    //     padding: 8px 0 8px 20px;
+    //     cursor: pointer;
+    //     color: @color_text_secondary;
+    //     display: flex;
+    //     align-items: center;
 
-        &:before {
-            .icomoon-plus;
-            margin-right: 12px;
-        }
+    //     &:before {
+    //         .icomoon-plus;
+    //         margin-right: 12px;
+    //     }
 
-        .hover();
-        &:hover {
-            color: @color_text_primary;
-        }
-    }
+    //     .hover();
+    //     &:hover {
+    //         color: @color_text_primary;
+    //     }
+    // }
 
-    .discovery-status {
-        height: 64px;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-evenly;
-        font-size: 14px;
-        padding: 16px 28px 16px 30px;
-        white-space: nowrap;
-        border-top: 1px solid @color_divider;
-        span {
-            display: block;
-            font-size: 12px;
-            color: @color_text_secondary;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
+    // .discovery-status {
+    //     height: 64px;
+    //     display: flex;
+    //     flex-direction: column;
+    //     justify-content: space-evenly;
+    //     font-size: 14px;
+    //     padding: 16px 28px 16px 30px;
+    //     white-space: nowrap;
+    //     border-top: 1px solid @color_divider;
+    //     span {
+    //         display: block;
+    //         font-size: 12px;
+    //         color: @color_text_secondary;
+    //         overflow: hidden;
+    //         text-overflow: ellipsis;
+    //     }
+    // }
 
-    .discovery-loading {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        font-size: 14px;
-        padding: 8px 0 8px 22px;
-        white-space: nowrap;
-        color: @color_text_secondary;
-        //border-top: 1px solid @color_divider;
-        .loader-circle {
-            margin-right: 14px;
-        }
-    }
+    // .discovery-loading {
+    //     display: flex;
+    //     flex-direction: row;
+    //     align-items: center;
+    //     font-size: 14px;
+    //     padding: 8px 0 8px 22px;
+    //     white-space: nowrap;
+    //     color: @color_text_secondary;
+    //     //border-top: 1px solid @color_divider;
+    //     .loader-circle {
+    //         margin-right: 14px;
+    //     }
+    // }
 
     // menu trasitions