merge

.flowconfig

@@ -10,6 +10,8 @@
 .*/node_modules/oboe/test/.*
 .*/_old/.*
 .*/public/solidity/.*
+.*/build/.*
+.*/build-devel/.*
 
 [libs]
 ./src/flowtype/npm/redux_v3.x.x.js

README.md

@@ -1,4 +1,4 @@
-# TREZOR Wallet
+# Trezor Ethereum wallet
 
 To install dependencies run `npm install` or `yarn`
 

browserslist

@@ -1,4 +1,4 @@
 # Browsers that we support
 > 5%
-IE > 9 # sorry
-last 10 versions
+IE > 8
+last 5 versions

package.json

@@ -60,8 +60,8 @@
         "redux-logger": "^3.0.6",
         "redux-raven-middleware": "^1.2.0",
         "redux-thunk": "^2.2.0",
+        "styled-components": "^3.4.9",
         "rimraf": "^2.6.2",
-        "styled-components": "^3.3.3",
         "styled-media-query": "^2.0.2",
         "styled-normalize": "^8.0.0",
         "trezor-connect": "^5.0.32",

public/unsupported-browsers/style.css

@@ -0,0 +1,64 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+    font: inherit;
+    background: #ebebeb;
+    vertical-align: baseline;
+    text-align: center;
+    font-family: Roboto;
+}
+
+.header {
+    height: 40px;
+    width: 100%;
+    background: #1A1A1A;
+    margin-bottom: 100px;
+}
+
+.unsupported-browsers {
+    width: 100%;
+    font-size: 30px;
+}
+
+.main {
+    width: 100%;
+    text-align: center;
+    margin: 0 auto;
+}
+
+.box {
+    margin-top: 20px;
+}
+
+p {
+    width: 100%;
+    clear: both;
+    font-size: 15px;
+}
+
+img {
+    clear: both;
+}
+
+a {
+    clear: both;
+    color: #01B757;
+    width: 100%;
+    text-decoration: none;
+    display: block;
+    font-size: 20px;
+}

src/actions/PendingTxActions.js

@@ -2,8 +2,13 @@
 
 
 import * as PENDING from 'actions/constants/pendingTx';
+
+import type {
+    Action, ThunkAction, GetState, Dispatch,
+} from 'flowtype';
 import type { State, PendingTx } from 'reducers/PendingTxReducer';
 
+
 export type PendingTxAction = {
     type: typeof PENDING.FROM_STORAGE,
     payload: State
@@ -15,9 +20,34 @@ export type PendingTxAction = {
     tx: PendingTx,
     receipt?: Object,
 } | {
-    type: typeof PENDING.TX_NOT_FOUND,
+    type: typeof PENDING.TX_REJECTED,
     tx: PendingTx,
 } | {
     type: typeof PENDING.TX_TOKEN_ERROR,
     tx: PendingTx,
-}
+}
+
+export const reject = (tx: PendingTx): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
+    /*
+            dispatch({
+                    type: NOTIFICATION.ADD,
+                    payload: {
+                        type: 'warning',
+                        title: 'Pending transaction rejected',
+                        message: `Transaction with id: ${tx.id} not found.`,
+                        cancelable: true,
+                        actions: [
+                            {
+                                label: 'OK',
+                                callback: () => {
+                                    dispatch({
+                                        type: PENDING.TX_RESOLVED,
+                                        tx,
+                                    });
+                                },
+                            },
+                        ],
+                    },
+                });
+            */
+};

src/actions/RouterActions.js

@@ -152,7 +152,7 @@ export const getValidUrl = (action: RouterAction): PayloadAction<string> => (dis
     // Disallow displaying landing page
     // redirect to previous url
     if (!shouldBeLandingPage && landingPageUrl) {
-        return location.pathname;
+        return dispatch(getFirstAvailableDeviceUrl()) || location.pathname;
     }
 
     // Regular url change during application live cycle
@@ -170,22 +170,10 @@ export const getValidUrl = (action: RouterAction): PayloadAction<string> => (dis
     return composedUrl || location.pathname;
 };
 
-
 /*
-* Utility used in "selectDevice" and "selectFirstAvailableDevice"
-* sorting device array by "ts" (timestamp) field
+* Compose url from requested device object and returns url
 */
-const sortDevices = (devices: Array<TrezorDevice>): Array<TrezorDevice> => devices.sort((a, b) => {
-    if (!a.ts || !b.ts) {
-        return -1;
-    }
-    return a.ts > b.ts ? -1 : 1;
-});
-
-/*
-* Compose url from given device object and redirect
-*/
-export const selectDevice = (device: TrezorDevice | Device): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
+const getDeviceUrl = (device: TrezorDevice | Device): PayloadAction<?string> => (dispatch: Dispatch, getState: GetState): ?string => {
     let url: ?string;
     if (!device.features) {
         url = `/device/${device.path}/${device.type === 'unreadable' ? 'unreadable' : 'acquire'}`;
@@ -208,12 +196,7 @@ export const selectDevice = (device: TrezorDevice | Device): ThunkAction => (dis
             }
         }
     }
-
-    const currentParams: RouterLocationState = getState().router.location.state;
-    const requestedParams = dispatch(pathToParams(url));
-    if (currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) {
-        dispatch(goto(url));
-    }
+    return url;
 };
 
 /*
@@ -223,17 +206,54 @@ export const selectDevice = (device: TrezorDevice | Device): ThunkAction => (dis
 * 3. Saved with latest timestamp
 * OR redirect to landing page
 */
-export const selectFirstAvailableDevice = (): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
+export const getFirstAvailableDeviceUrl = (): PayloadAction<?string> => (dispatch: Dispatch, getState: GetState): ?string => {
     const { devices } = getState();
+    let url: ?string;
     if (devices.length > 0) {
         const unacquired = devices.find(d => !d.features);
         if (unacquired) {
-            dispatch(selectDevice(unacquired));
+            url = dispatch(getDeviceUrl(unacquired));
         } else {
             const latest: Array<TrezorDevice> = sortDevices(devices);
             const firstConnected: ?TrezorDevice = latest.find(d => d.connected);
-            dispatch(selectDevice(firstConnected || latest[0]));
+            url = dispatch(getDeviceUrl(firstConnected || latest[0]));
         }
+    }
+    return url;
+};
+
+/*
+* Utility used in "getDeviceUrl" and "getFirstAvailableDeviceUrl"
+* sorting device array by "ts" (timestamp) field
+*/
+const sortDevices = (devices: Array<TrezorDevice>): Array<TrezorDevice> => devices.sort((a, b) => {
+    if (!a.ts || !b.ts) {
+        return -1;
+    }
+    return a.ts > b.ts ? -1 : 1;
+});
+
+/*
+* Redirect to requested device
+*/
+export const selectDevice = (device: TrezorDevice | Device): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
+    const url: ?string = dispatch(getDeviceUrl(device));
+    if (!url) return;
+
+    const currentParams: RouterLocationState = getState().router.location.state;
+    const requestedParams = dispatch(pathToParams(url));
+    if (currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) {
+        dispatch(goto(url));
+    }
+};
+
+/*
+* Redirect to first device or landing page
+*/
+export const selectFirstAvailableDevice = (): ThunkAction => (dispatch: Dispatch): void => {
+    const url = dispatch(getFirstAvailableDeviceUrl());
+    if (url) {
+        dispatch(goto(url));
     } else {
         dispatch(gotoLandingPage());
     }
@@ -256,8 +276,7 @@ export const isLandingPageUrl = ($url?: string): PayloadAction<boolean> => (disp
     if (typeof url !== 'string') {
         url = getState().router.location.pathname;
     }
-    // TODO: add more landing page cases/urls to config.json (like /tools etc)
-    return (url === '/' || url === '/bridge');
+    return url === '/';
 };
 
 /*

src/actions/SelectedAccountActions.js

@@ -1,100 +1,210 @@
 /* @flow */
-
-
 import { LOCATION_CHANGE } from 'react-router-redux';
+import * as WALLET from 'actions/constants/wallet';
 import * as ACCOUNT from 'actions/constants/account';
-import * as NOTIFICATION from 'actions/constants/notification';
+import * as DISCOVERY from 'actions/constants/discovery';
+import * as TOKEN from 'actions/constants/token';
 import * as PENDING from 'actions/constants/pendingTx';
 
-import * as stateUtils from 'reducers/utils';
+import * as reducerUtils from 'reducers/utils';
 
 import type {
-    AsyncAction,
+    PayloadAction,
     Action,
     GetState,
     Dispatch,
     State,
 } from 'flowtype';
 
+type SelectedAccountState = $ElementType<State, 'selectedAccount'>;
+
 export type SelectedAccountAction = {
     type: typeof ACCOUNT.DISPOSE,
 } | {
     type: typeof ACCOUNT.UPDATE_SELECTED_ACCOUNT,
-    payload: $ElementType<State, 'selectedAccount'>
+    payload: SelectedAccountState,
 };
 
+type AccountStatus = {
+    type: string; // notification type
+    title: string; // notification title
+    message?: string; // notification message
+    shouldRender: boolean; // should render account page
+}
+
 export const dispose = (): Action => ({
     type: ACCOUNT.DISPOSE,
 });
 
-export const updateSelectedValues = (prevState: State, action: Action): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
-    const locationChange: boolean = action.type === LOCATION_CHANGE;
+const getAccountStatus = (state: State, selectedAccount: SelectedAccountState): ?AccountStatus => {
+    const device = state.wallet.selectedDevice;
+    if (!device || !device.state) {
+        return {
+            type: 'info',
+            title: 'Loading device...',
+            shouldRender: false,
+        };
+    }
+
+    const {
+        account,
+        discovery,
+        network,
+    } = selectedAccount;
+
+    // corner case: accountState didn't finish loading state after LOCATION_CHANGE action
+    if (!network) {
+        return {
+            type: 'info',
+            title: 'Loading account state...',
+            shouldRender: false,
+        };
+    }
+
+    const blockchain = state.blockchain.find(b => b.name === network.network);
+    if (blockchain && !blockchain.connected) {
+        return {
+            type: 'backend',
+            title: `${network.name} backend is not connected`,
+            shouldRender: false,
+        };
+    }
+
+    // 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 {
+                        type: 'info',
+                        title: 'Loading accounts...',
+                        shouldRender: false,
+                    };
+                }
+                // case 2: device is unavailable (created with different passphrase settings) account cannot be accessed
+                return {
+                    type: 'info',
+                    title: `Device ${device.instanceLabel} is unavailable`,
+                    message: 'Change passphrase settings to use this device',
+                    shouldRender: false,
+                };
+            }
+
+            // case 3: device is disconnected
+            return {
+                type: 'info',
+                title: `Device ${device.instanceLabel} is disconnected`,
+                message: 'Connect device to load accounts',
+                shouldRender: false,
+            };
+        }
+
+        if (discovery.completed) {
+            // case 4: account not found and discovery is completed
+            return {
+                type: 'warning',
+                title: 'Account does not exist',
+                shouldRender: false,
+            };
+        }
+
+        // case 6: discovery is not completed yet
+        return {
+            type: 'info',
+            title: 'Loading accounts...',
+            shouldRender: false,
+        };
+    }
+
+    // Additional status: account does exists and it's visible but shouldn't be active
+    if (!device.connected) {
+        return {
+            type: 'info',
+            title: `Device ${device.instanceLabel} is disconnected`,
+            shouldRender: true,
+        };
+    }
+    if (!device.available) {
+        return {
+            type: 'info',
+            title: `Device ${device.instanceLabel} is unavailable`,
+            message: 'Change passphrase settings to use this device',
+            shouldRender: true,
+        };
+    }
+
+    // Additional status: account does exists, but waiting for discovery to complete
+    if (discovery && !discovery.completed) {
+        return {
+            type: 'info',
+            title: 'Loading accounts...',
+            shouldRender: true,
+        };
+    }
+
+    return null;
+};
+
+// list of all actions which has influence on "selectedAccount" reducer
+// other actions will be ignored
+const actions = [
+    LOCATION_CHANGE,
+    WALLET.SET_SELECTED_DEVICE,
+    WALLET.UPDATE_SELECTED_DEVICE,
+    ...Object.values(ACCOUNT).filter(v => typeof v === 'string' && v !== ACCOUNT.UPDATE_SELECTED_ACCOUNT), // exported values got unwanted "__esModule: true" as first element
+    ...Object.values(DISCOVERY).filter(v => typeof v === 'string'),
+    ...Object.values(TOKEN).filter(v => typeof v === 'string'),
+    ...Object.values(PENDING).filter(v => typeof v === 'string'),
+];
+
+/*
+* Called from WalletService
+*/
+export const observe = (prevState: State, action: Action): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => {
+    // ignore not listed actions
+    if (actions.indexOf(action.type) < 0) return false;
+
     const state: State = getState();
     const { location } = state.router;
+    // displayed route is not an account route
+    if (!location.state.account) return false;
 
-    // handle devices state change (from trezor-connect events or location change)
-    if (locationChange
-            || prevState.accounts !== state.accounts
-            || prevState.discovery !== state.discovery
-            || prevState.tokens !== state.tokens
-            || prevState.pending !== state.pending) {
-        const account = stateUtils.getSelectedAccount(state);
-        const network = stateUtils.getSelectedNetwork(state);
-        const discovery = stateUtils.getDiscoveryProcess(state);
-        const tokens = stateUtils.getAccountTokens(state, account);
-        const pending = stateUtils.getAccountPendingTx(state.pending, account);
+    // get new values for selected account
+    const account = reducerUtils.getSelectedAccount(state);
+    const network = reducerUtils.getSelectedNetwork(state);
+    const discovery = reducerUtils.getDiscoveryProcess(state);
+    const tokens = reducerUtils.getAccountTokens(state, account);
+    const pending = reducerUtils.getAccountPendingTx(state.pending, account);
 
-        const payload: $ElementType<State, 'selectedAccount'> = {
-            location: location.pathname,
-            account,
-            network,
-            discovery,
-            tokens,
-            pending,
-        };
+    // prepare new state for "selectedAccount" reducer
+    const newState: SelectedAccountState = {
+        location: state.router.location.pathname,
+        account,
+        network,
+        discovery,
+        tokens,
+        pending,
+        notification: null,
+        shouldRender: false,
+    };
 
-        let needUpdate: boolean = false;
-        Object.keys(payload).forEach((key) => {
-            if (Array.isArray(payload[key])) {
-                if (Array.isArray(state.selectedAccount[key]) && payload[key].length !== state.selectedAccount[key].length) {
-                    needUpdate = true;
-                }
-            } else if (payload[key] !== state.selectedAccount[key]) {
-                needUpdate = true;
-            }
+    // get "selectedAccount" status from newState
+    const status = getAccountStatus(state, newState);
+    newState.notification = status || null;
+    newState.shouldRender = status ? status.shouldRender : true;
+    // check if newState is different than previous state
+    const stateChanged = reducerUtils.observeChanges(prevState.selectedAccount, newState, {
+        account: ['balance', 'nonce'],
+        discovery: ['accountIndex', 'interrupted', 'completed', 'waitingForBlockchain', 'waitingForDevice'],
+    });
+
+    if (stateChanged) {
+        // update values in reducer
+        dispatch({
+            type: ACCOUNT.UPDATE_SELECTED_ACCOUNT,
+            payload: newState,
         });
-
-        if (needUpdate) {
-            dispatch({
-                type: ACCOUNT.UPDATE_SELECTED_ACCOUNT,
-                payload,
-            });
-
-            if (location.state.send) {
-                const rejectedTxs = pending.filter(tx => tx.rejected);
-                rejectedTxs.forEach((tx) => {
-                    dispatch({
-                        type: NOTIFICATION.ADD,
-                        payload: {
-                            type: 'warning',
-                            title: 'Pending transaction rejected',
-                            message: `Transaction with id: ${tx.id} not found.`,
-                            cancelable: true,
-                            actions: [
-                                {
-                                    label: 'OK',
-                                    callback: () => {
-                                        dispatch({
-                                            type: PENDING.TX_RESOLVED,
-                                            tx,
-                                        });
-                                    },
-                                },
-                            ],
-                        },
-                    });
-                });
-            }
-        }
     }
+    return stateChanged;
 };

src/actions/SendFormActions.js

@@ -2,6 +2,7 @@
 
 import TrezorConnect from 'trezor-connect';
 import BigNumber from 'bignumber.js';
+import * as ACCOUNT from 'actions/constants/account';
 import * as NOTIFICATION from 'actions/constants/notification';
 import * as SEND from 'actions/constants/send';
 import * as WEB3 from 'actions/constants/web3';
@@ -45,10 +46,21 @@ export type SendFormAction = {
     type: typeof SEND.TOGGLE_ADVANCED | typeof SEND.TX_SENDING | typeof SEND.TX_ERROR,
 } | SendTxAction;
 
+// list of all actions which has influence on "sendForm" reducer
+// other actions will be ignored
+const actions = [
+    ACCOUNT.UPDATE_SELECTED_ACCOUNT,
+    WEB3.GAS_PRICE_UPDATED,
+    ...Object.values(SEND).filter(v => typeof v === 'string'),
+];
+
 /*
-* Called from WalletService on EACH action
+* Called from WalletService
 */
 export const observe = (prevState: ReducersState, action: Action): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
+    // ignore not listed actions
+    if (actions.indexOf(action.type) < 0) return;
+
     const currentState = getState();
     // do not proceed if it's not "send" url
     if (!currentState.router.location.state.send) return;
@@ -75,16 +87,9 @@ export const observe = (prevState: ReducersState, action: Action): ThunkAction =
 
     let shouldUpdate: boolean = false;
     // check if "selectedAccount" reducer changed
-    const selectedAccountChanged = reducerUtils.observeChanges(prevState.selectedAccount, currentState.selectedAccount, ['account', 'tokens', 'pending']);
-    if (selectedAccountChanged) {
-        // double check
-        // there are only few fields that we are interested in
-        // check them to avoid unnecessary calculation and validation
-        const accountChanged = reducerUtils.observeChanges(prevState.selectedAccount.account, currentState.selectedAccount.account, ['balance', 'nonce']);
-        const tokensChanged = reducerUtils.observeChanges(prevState.selectedAccount.tokens, currentState.selectedAccount.tokens);
-        const pendingChanged = reducerUtils.observeChanges(prevState.selectedAccount.pending, currentState.selectedAccount.pending);
-        shouldUpdate = accountChanged || tokensChanged || pendingChanged;
-    }
+    shouldUpdate = reducerUtils.observeChanges(prevState.selectedAccount, currentState.selectedAccount, {
+        account: ['balance', 'nonce'],
+    });
 
     // check if "sendForm" reducer changed
     if (!shouldUpdate) {

src/actions/TrezorConnectActions.js

@@ -71,9 +71,7 @@ export type TrezorConnectAction = {
     type: typeof CONNECT.DEVICE_FROM_STORAGE,
     payload: Array<TrezorDevice>
 } | {
-    type: typeof CONNECT.START_ACQUIRING,
-} | {
-    type: typeof CONNECT.STOP_ACQUIRING,
+    type: typeof CONNECT.START_ACQUIRING | typeof CONNECT.STOP_ACQUIRING,
 };
 
 export const init = (): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
@@ -128,10 +126,10 @@ export const init = (): AsyncAction => async (dispatch: Dispatch, getState: GetS
             pendingTransportEvent: (getState().devices.length < 1),
         });
     } catch (error) {
-        // dispatch({
-        //     type: CONNECT.INITIALIZATION_ERROR,
-        //     error
-        // })
+        dispatch({
+            type: CONNECT.INITIALIZATION_ERROR,
+            error,
+        });
     }
 };
 
@@ -206,7 +204,7 @@ export const getSelectedDeviceState = (): AsyncAction => async (dispatch: Dispat
 export const deviceDisconnect = (device: Device): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
     const selected: ?TrezorDevice = getState().wallet.selectedDevice;
 
-    if (device && device.features) {
+    if (device.features) {
         if (selected && selected.features && selected.features.device_id === device.features.device_id) {
             dispatch(DiscoveryActions.stop(selected));
         }
@@ -218,7 +216,11 @@ export const deviceDisconnect = (device: Device): AsyncAction => async (dispatch
                 device: instances[0],
                 instances,
             });
+        } else {
+            dispatch(RouterActions.selectFirstAvailableDevice());
         }
+    } else {
+        dispatch(RouterActions.selectFirstAvailableDevice());
     }
 };
 

src/actions/WalletActions.js

@@ -1,16 +1,16 @@
 /* @flow */
 
-
 import { LOCATION_CHANGE } from 'react-router-redux';
+import { DEVICE } from 'trezor-connect';
 import * as WALLET from 'actions/constants/wallet';
-import * as stateUtils from 'reducers/utils';
+import * as reducerUtils from 'reducers/utils';
 
 import type {
     Device,
     TrezorDevice,
     RouterLocationState,
     ThunkAction,
-    AsyncAction,
+    PayloadAction,
     Action,
     Dispatch,
     GetState,
@@ -80,26 +80,40 @@ export const clearUnavailableDevicesData = (prevState: State, device: Device): T
     }
 };
 
+// list of all actions which has influence on "selectedDevice" field in "wallet" reducer
+// other actions will be ignored
+const actions = [
+    LOCATION_CHANGE,
+    ...Object.values(DEVICE).filter(v => typeof v === 'string'),
+];
+
+/*
+* Called from WalletService
+*/
+export const observe = (prevState: State, action: Action): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => {
+    // ignore not listed actions
+    if (actions.indexOf(action.type) < 0) return false;
 
-export const updateSelectedValues = (prevState: State, action: Action): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
-    const locationChange: boolean = action.type === LOCATION_CHANGE;
     const state: State = getState();
 
+    const locationChanged = reducerUtils.observeChanges(prevState.router.location, state.router.location);
+    const device = reducerUtils.getSelectedDevice(state);
+    const selectedDeviceChanged = reducerUtils.observeChanges(state.wallet.selectedDevice, device);
+
     // handle devices state change (from trezor-connect events or location change)
-    if (locationChange || prevState.devices !== state.devices) {
-        const device = stateUtils.getSelectedDevice(state);
-        if (state.wallet.selectedDevice !== device) {
-            if (device && stateUtils.isSelectedDevice(state.wallet.selectedDevice, device)) {
-                dispatch({
-                    type: WALLET.UPDATE_SELECTED_DEVICE,
-                    device,
-                });
-            } else {
-                dispatch({
-                    type: WALLET.SET_SELECTED_DEVICE,
-                    device,
-                });
-            }
+    if (locationChanged || selectedDeviceChanged) {
+        if (device && reducerUtils.isSelectedDevice(state.wallet.selectedDevice, device)) {
+            dispatch({
+                type: WALLET.UPDATE_SELECTED_DEVICE,
+                device,
+            });
+        } else {
+            dispatch({
+                type: WALLET.SET_SELECTED_DEVICE,
+                device,
+            });
         }
+        return true;
     }
+    return false;
 };

src/actions/Web3Actions.js

@@ -139,7 +139,7 @@ export const resolvePendingTransactions = (network: string): PromiseAction<void>
         const status = await instance.web3.eth.getTransaction(tx.id);
         if (!status) {
             dispatch({
-                type: PENDING.TX_NOT_FOUND,
+                type: PENDING.TX_REJECTED,
                 tx,
             });
         } else {

src/actions/constants/pendingTx.js

@@ -4,5 +4,5 @@
 export const FROM_STORAGE: 'pending__from_storage' = 'pending__from_storage';
 export const ADD: 'pending__add' = 'pending__add';
 export const TX_RESOLVED: 'pending__tx_resolved' = 'pending__tx_resolved';
-export const TX_NOT_FOUND: 'pending__tx_not_found' = 'pending__tx_not_found';
+export const TX_REJECTED: 'pending__tx_rejected' = 'pending__tx_rejected';
 export const TX_TOKEN_ERROR: 'pending__tx_token_error' = 'pending__tx_token_error';

src/components/Button/index.js

@@ -2,13 +2,13 @@ import React from 'react';
 import styled, { css } from 'styled-components';
 import PropTypes from 'prop-types';
 import colors from 'config/colors';
-import { TRANSITION } from 'config/variables';
+import { TRANSITION, FONT_WEIGHT, FONT_SIZE } from 'config/variables';
 
 const Wrapper = styled.button`
     padding: ${props => (props.icon ? '4px 24px 4px 15px' : '11px 24px')};
     border-radius: 3px;
-    font-size: 14px;
-    font-weight: 300;
+    font-size: ${FONT_SIZE.SMALL};
+    font-weight: ${FONT_WEIGHT.SMALLEST};
     cursor: pointer;
     background: ${colors.GREEN_PRIMARY};
     color: ${colors.WHITE};

src/components/Checkbox/index.js

@@ -26,18 +26,18 @@ const IconWrapper = styled.div`
     border-radius: 2px;
     justify-content: center;
     align-items: center;
-    color: ${props => (props.checked ? colors.WHITE : colors.GREEN_PRIMARY)};
-    background: ${props => (props.checked ? colors.GREEN_PRIMARY : colors.WHITE)};
-    border: 1px solid ${props => (props.checked ? colors.GREEN_PRIMARY : colors.DIVIDER)};
+    color: ${props => (props.isChecked ? colors.WHITE : colors.GREEN_PRIMARY)};
+    background: ${props => (props.isChecked ? colors.GREEN_PRIMARY : colors.WHITE)};
+    border: 1px solid ${props => (props.isChecked ? colors.GREEN_PRIMARY : colors.DIVIDER)};
     width: 24px;
     height: 24px;
 
     &:hover,
     &:focus {
-        ${props => !props.checked && css`
+        ${props => !props.isChecked && css`
             border: 1px solid ${colors.GREEN_PRIMARY};
         `}
-        background: ${props => (props.checked ? colors.GREEN_PRIMARY : colors.WHITE)};
+        background: ${props => (props.isChecked ? colors.GREEN_PRIMARY : colors.WHITE)};
     }
 `;
 
@@ -50,7 +50,7 @@ const Label = styled.div`
 
     &:hover,
     &:focus {
-        color: ${props => (props.checked ? colors.TEXT_PRIMARY : colors.TEXT_PRIMARY)};
+        color: ${props => (props.isChecked ? colors.TEXT_PRIMARY : colors.TEXT_PRIMARY)};
     }
 `;
 
@@ -63,7 +63,7 @@ class Checkbox extends PureComponent {
 
     render() {
         const {
-            checked,
+            isChecked,
             children,
             onClick,
         } = this.props;
@@ -73,20 +73,20 @@ class Checkbox extends PureComponent {
                 onKeyUp={e => this.handleKeyboard(e)}
                 tabIndex={0}
             >
-                <IconWrapper checked={checked}>
-                    {checked && (
+                <IconWrapper isChecked={isChecked}>
+                    {isChecked && (
                         <Tick>
                             <Icon
                                 hoverColor={colors.WHITE}
                                 size={26}
-                                color={checked ? colors.WHITE : colors.GREEN_PRIMARY}
+                                color={isChecked ? colors.WHITE : colors.GREEN_PRIMARY}
                                 icon={icons.SUCCESS}
                             />
                         </Tick>
                     )
                     }
                 </IconWrapper>
-                <Label checked={checked}>{children}</Label>
+                <Label isChecked={isChecked}>{children}</Label>
             </Wrapper>
         );
     }
@@ -94,7 +94,7 @@ class Checkbox extends PureComponent {
 
 Checkbox.propTypes = {
     onClick: PropTypes.func.isRequired,
-    checked: PropTypes.bool,
+    isChecked: PropTypes.bool,
     children: PropTypes.string,
 };
 

src/components/Header/index.js

@@ -1,7 +1,7 @@
 /* @flow */
 import React from 'react';
 import styled from 'styled-components';
-
+import { NavLink } from 'react-router-dom';
 import colors from 'config/colors';
 
 const Wrapper = styled.header`
@@ -13,12 +13,9 @@ const Wrapper = styled.header`
         fill: ${colors.WHITE};
         height: 28px;
         width: 100px;
-        flex: 1;
     }
 `;
 
-const LinkWrapper = styled.div``;
-
 const LayoutWrapper = styled.div`
     width: 100%;
     height: 100%;
@@ -26,12 +23,21 @@ const LayoutWrapper = styled.div`
     margin: 0 auto;
     display: flex;
     align-items: center;
+    justify-content: space-between;
 
     @media screen and (max-width: 1170px) {
         padding: 0 25px;
     }
 `;
 
+const Left = styled.div`
+    flex: 1;
+    display: flex;
+    justify-content: flex-start;
+`;
+
+const Right = styled.div``;
+
 const A = styled.a`
     color: ${colors.WHITE};
     margin-left: 24px;
@@ -55,21 +61,25 @@ const A = styled.a`
 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">
-                <polygon points="101.1,12.8 118.2,12.8 118.2,17.3 108.9,29.9 118.2,29.9 118.2,35.2 101.1,35.2 101.1,30.7 110.4,18.1 101.1,18.1" />
-                <path d="M158.8,26.9c2.1-0.8,4.3-2.9,4.3-6.6c0-4.5-3.1-7.4-7.7-7.4h-10.5v22.3h5.8v-7.5h2.2l4.1,7.5h6.7L158.8,26.9z M154.7,22.5 h-4V18h4c1.5,0,2.5,0.9,2.5,2.2C157.2,21.6,156.2,22.5,154.7,22.5z" />
-                <path d="M130.8,12.5c-6.8,0-11.6,4.9-11.6,11.5s4.9,11.5,11.6,11.5s11.7-4.9,11.7-11.5S137.6,12.5,130.8,12.5z M130.8,30.3 c-3.4,0-5.7-2.6-5.7-6.3c0-3.8,2.3-6.3,5.7-6.3c3.4,0,5.8,2.6,5.8,6.3C136.6,27.7,134.2,30.3,130.8,30.3z" />
-                <polygon points="82.1,12.8 98.3,12.8 98.3,18 87.9,18 87.9,21.3 98,21.3 98,26.4 87.9,26.4 87.9,30 98.3,30 98.3,35.2 82.1,35.2 " />
-                <path d="M24.6,9.7C24.6,4.4,20,0,14.4,0S4.2,4.4,4.2,9.7v3.1H0v22.3h0l14.4,6.7l14.4-6.7h0V12.9h-4.2V9.7z M9.4,9.7 c0-2.5,2.2-4.5,5-4.5s5,2,5,4.5v3.1H9.4V9.7z M23,31.5l-8.6,4l-8.6-4V18.1H23V31.5z" />
-                <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>
-            <LinkWrapper>
+            <Left>
+                <NavLink to="/">
+                    <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">
+                        <polygon points="101.1,12.8 118.2,12.8 118.2,17.3 108.9,29.9 118.2,29.9 118.2,35.2 101.1,35.2 101.1,30.7 110.4,18.1 101.1,18.1" />
+                        <path d="M158.8,26.9c2.1-0.8,4.3-2.9,4.3-6.6c0-4.5-3.1-7.4-7.7-7.4h-10.5v22.3h5.8v-7.5h2.2l4.1,7.5h6.7L158.8,26.9z M154.7,22.5 h-4V18h4c1.5,0,2.5,0.9,2.5,2.2C157.2,21.6,156.2,22.5,154.7,22.5z" />
+                        <path d="M130.8,12.5c-6.8,0-11.6,4.9-11.6,11.5s4.9,11.5,11.6,11.5s11.7-4.9,11.7-11.5S137.6,12.5,130.8,12.5z M130.8,30.3 c-3.4,0-5.7-2.6-5.7-6.3c0-3.8,2.3-6.3,5.7-6.3c3.4,0,5.8,2.6,5.8,6.3C136.6,27.7,134.2,30.3,130.8,30.3z" />
+                        <polygon points="82.1,12.8 98.3,12.8 98.3,18 87.9,18 87.9,21.3 98,21.3 98,26.4 87.9,26.4 87.9,30 98.3,30 98.3,35.2 82.1,35.2 " />
+                        <path d="M24.6,9.7C24.6,4.4,20,0,14.4,0S4.2,4.4,4.2,9.7v3.1H0v22.3h0l14.4,6.7l14.4-6.7h0V12.9h-4.2V9.7z M9.4,9.7 c0-2.5,2.2-4.5,5-4.5s5,2,5,4.5v3.1H9.4V9.7z M23,31.5l-8.6,4l-8.6-4V18.1H23V31.5z" />
+                        <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>
+                </NavLink>
+            </Left>
+            <Right>
                 <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>
-            </LinkWrapper>
+            </Right>
         </LayoutWrapper>
     </Wrapper>
 );

src/components/Icon/index.js

@@ -3,6 +3,16 @@ import PropTypes from 'prop-types';
 import colors from 'config/colors';
 import styled, { keyframes } from 'styled-components';
 
+const chooseIconAnimationType = (canAnimate, isActive) => {
+    if (canAnimate) {
+        if (isActive) {
+            return rotate180up;
+        }
+        return rotate180down;
+    }
+    return null;
+};
+
 // TODO: make animation of icons better
 const rotate180up = keyframes`
     from {
@@ -23,7 +33,7 @@ const rotate180down = keyframes`
 `;
 
 const SvgWrapper = styled.svg`
-    animation: ${props => (props.canAnimate ? (props.isActive ? rotate180up : rotate180down) : null)} 0.2s linear 1 forwards;
+    animation: ${props => chooseIconAnimationType(props.canAnimate, props.isActive)} 0.2s linear 1 forwards;
 
     :hover {
         path {

src/components/Notification/NotificationGroups/components/Group/index.js

@@ -0,0 +1,113 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+import Icon from 'components/Icon';
+import ICONS from 'config/icons';
+import colors from 'config/colors';
+import { Notification } from 'components/Notification';
+import { getIcon, getColor } from 'utils/notification';
+
+const Wrapper = styled.div``;
+
+const Header = styled.div`
+    display: flex;
+    cursor: pointer;
+    justify-content: space-between;
+    background: ${colors.WHITE};
+    align-items: center;
+    padding: 5px 10px;
+    border-bottom: 1px solid ${colors.BACKGROUND};
+`;
+
+const Left = styled.div`
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+`;
+
+const Right = styled.div``;
+const Body = styled.div``;
+
+const Title = styled.div`
+    color: ${props => props.color};
+`;
+
+class Group extends Component {
+    constructor() {
+        super();
+        this.state = {
+            visibleCount: 1,
+            visible: true,
+        };
+    }
+
+    toggle = () => {
+        if (this.state.visible) {
+            this.setState({
+                visible: false,
+                visibleCount: 0,
+            });
+        } else {
+            this.setState({
+                visible: true,
+                visibleCount: this.props.groupNotifications.length,
+            });
+        }
+    }
+
+    render() {
+        const { type, groupNotifications } = this.props;
+        const color = getColor(type);
+        return (
+            <Wrapper>
+                {groupNotifications.length > 1 && (
+                    <Header onClick={this.toggle}>
+                        <Left>
+                            <Icon
+                                color={color}
+                                size={30}
+                                icon={getIcon(type)}
+                            />
+                            <Title color={color}>
+                                {groupNotifications.length} {groupNotifications.length > 1 ? `${type}s` : type}
+                            </Title>
+                        </Left>
+                        <Right>
+                            <Icon
+                                icon={ICONS.ARROW_DOWN}
+                                color={colors.TEXT_SECONDARY}
+                                size={24}
+                                isActive={this.state.visible}
+                                canAnimate
+                            />
+                        </Right>
+                    </Header>
+                )}
+                <Body>
+                    {groupNotifications
+                        .slice(0, this.state.visibleCount)
+                        .map(notification => (
+                            <Notification
+                                key={notification.title}
+                                type={notification.type}
+                                title={notification.title}
+                                message={notification.message}
+                            />
+                        ))}
+                </Body>
+            </Wrapper>
+        );
+    }
+}
+
+Group.propTypes = {
+    type: PropTypes.string,
+    groupNotifications: PropTypes.arrayOf({
+        key: PropTypes.string,
+        type: PropTypes.string,
+        title: PropTypes.string,
+        message: PropTypes.string,
+    }),
+};
+
+export default Group;

src/components/Notification/NotificationGroups/index.js

@@ -0,0 +1,56 @@
+import React, { Component } from 'react';
+import styled from 'styled-components';
+
+import { PRIORITY } from 'constants/notifications';
+import Group from './components/Group';
+
+const Wrapper = styled.div``;
+
+class NotificationsGroup extends Component {
+    constructor() {
+        super();
+        this.notifications = [
+            { type: 'warning', title: 'adddaa', message: 'aaaa' },
+            { type: 'error', title: 'aaddda', message: 'aaaa' },
+            { type: 'info', title: 'aafffa', message: 'aaaa' },
+            { type: 'error', title: 'aggaa', message: 'aaaa' },
+            { type: 'warning', title: 'aasssa', message: 'aaaa' },
+            { type: 'success', title: 'afaa', message: 'aaaa' },
+            { type: 'error', title: 'aada', message: 'aaaa' },
+            { type: 'error', title: 'aafffa', message: 'aaaa' },
+        ];
+    }
+
+    groupNotifications = notifications => notifications
+        .reduce((acc, obj) => {
+            const key = obj.type;
+            if (!acc[key]) {
+                acc[key] = [];
+            }
+            acc[key].push(obj);
+            return acc;
+        }, {});
+
+    sortByPriority(notifications) {
+        return notifications;
+    }
+
+    render() {
+        const { notifications } = this;
+        const notificationGroups = this.groupNotifications(notifications);
+        const sortedNotifications = this.sortByPriority(notificationGroups);
+
+        return (
+            <Wrapper>
+                {Object.keys(sortedNotifications).map(group => (
+                    <Group
+                        groupNotifications={notificationGroups[group]}
+                        type={group}
+                    />
+                ))}
+            </Wrapper>
+        );
+    }
+}
+
+export default NotificationsGroup;

src/components/Notification/index.js

@@ -1,22 +1,44 @@
+/* @flow */
+
 import React from 'react';
+import media from 'styled-media-query';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import styled, { css } from 'styled-components';
 import colors from 'config/colors';
+import { getColor, getIcon } from 'utils/notification';
 import Icon from 'components/Icon';
 import icons from 'config/icons';
 import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
 
 import * as NotificationActions from 'actions/NotificationActions';
 import Loader from 'components/Loader';
+import type { Action, State } from 'flowtype';
 import NotificationButton from './components/NotificationButton';
 
+type Props = {
+    key?: number,
+    notifications: $ElementType<State, 'notifications'>,
+    close: (notif?: any) => Action,
+};
+
+type NProps = {
+    type: string,
+    cancelable?: boolean;
+    title: string;
+    message?: string;
+    actions?: Array<any>;
+    close?: typeof NotificationActions.close,
+    loading?: boolean
+};
+
 const Wrapper = styled.div`
     position: relative;
     color: ${colors.TEXT_PRIMARY};
     background: ${colors.TEXT_SECONDARY};
     padding: 24px 48px 24px 24px;
     display: flex;
+    min-height: 90px;
     flex-direction: row;
     text-align: left;
 
@@ -39,11 +61,19 @@ const Wrapper = styled.div`
         color: ${colors.ERROR_PRIMARY};
         background: ${colors.ERROR_SECONDARY};
     `}
+
+    ${media.lessThan('610px')`
+        flex-direction: column;
+    `}
 `;
 
 const Body = styled.div`
     display: flex;
-    margin-right: 40px;
+    width: 60%;
+
+    ${media.lessThan('610px')`
+        width: 100%;
+    `}
 `;
 
 const Title = styled.div`
@@ -65,54 +95,41 @@ const Message = styled.div`
 const StyledIcon = styled(Icon)`
     position: relative;
     top: -7px;
+    min-width: 20px;
 `;
 
-const MessageContent = styled.div`
-    height: 20px;
-    display: flex;
+const IconWrapper = styled.div`
+    min-width: 20px;
 `;
 
 const Texts = styled.div`
     display: flex;
     flex-direction: column;
+    flex: 1;
 `;
 
 const AdditionalContent = styled.div`
-    flex: 1;
     display: flex;
     justify-content: flex-end;
     align-items: flex-end;
+    flex: 1;
 `;
 
 const ActionContent = styled.div`
+    display: flex;
     justify-content: right;
     align-items: flex-end;
+
+    ${media.lessThan('610px')`
+        width: 100%;
+        padding: 10px 0 0 30px;
+        align-items: flex-start;
+    `}
 `;
 
 export const Notification = (props: NProps): React$Element<string> => {
     const close: Function = typeof props.close === 'function' ? props.close : () => {}; // TODO: add default close action
 
-    const getIconColor = (type) => {
-        let color;
-        switch (type) {
-            case 'info':
-                color = colors.INFO_PRIMARY;
-                break;
-            case 'error':
-                color = colors.ERROR_PRIMARY;
-                break;
-            case 'warning':
-                color = colors.WARNING_PRIMARY;
-                break;
-            case 'success':
-                color = colors.SUCCESS_PRIMARY;
-                break;
-            default:
-                color = null;
-        }
-
-        return color;
-    };
 
     return (
         <Wrapper type={props.type}>
@@ -120,27 +137,27 @@ export const Notification = (props: NProps): React$Element<string> => {
             {props.cancelable && (
                 <CloseClick onClick={() => close()}>
                     <Icon
-                        color={getIconColor(props.type)}
+                        color={getColor(props.type)}
                         icon={icons.CLOSE}
                         size={20}
                     />
                 </CloseClick>
             )}
             <Body>
-                <MessageContent>
+                <IconWrapper>
                     <StyledIcon
-                        color={getIconColor(props.type)}
-                        icon={icons[props.type.toUpperCase()]}
+                        color={getColor(props.type)}
+                        icon={getIcon(props.type)}
                     />
-                    <Texts>
-                        <Title>{ props.title }</Title>
-                        { props.message && (
-                            <Message>
-                                <p dangerouslySetInnerHTML={{ __html: props.message }} />
-                            </Message>
-                        ) }
-                    </Texts>
-                </MessageContent>
+                </IconWrapper>
+                <Texts>
+                    <Title>{ props.title }</Title>
+                    { props.message && (
+                        <Message>
+                            <p dangerouslySetInnerHTML={{ __html: props.message }} />
+                        </Message>
+                    ) }
+                </Texts>
             </Body>
             <AdditionalContent>
                 {props.actions && props.actions.length > 0 && (
@@ -161,7 +178,7 @@ export const Notification = (props: NProps): React$Element<string> => {
     );
 };
 
-export const NotificationGroup = (props) => {
+export const NotificationGroup = (props: Props) => {
     const { notifications, close } = props;
     return notifications.map(n => (
         <Notification
@@ -183,4 +200,4 @@ export default connect(
     dispatch => ({
         close: bindActionCreators(NotificationActions.close, dispatch),
     }),
-)(NotificationGroup);
+)(NotificationGroup);

src/components/Textarea/index.js

@@ -15,10 +15,11 @@ const disabledColor = colors.TEXT_PRIMARY;
 
 const StyledTextarea = styled.textarea`
     width: 100%;
-    padding: 12px;
+    min-height: 85px;
+    margin-bottom: 10px;
+    padding: 6px 12px;
     box-sizing: border-box;
-    min-height: 25px;
-    border: ${props => (props.isError ? `1px solid ${colors.ERROR_PRIMARY}` : `1px solid ${colors.DIVIDER}`)};
+    border: 1px solid ${props => (props.borderColor ? props.borderColor : colors.DIVIDER)};
     border-radius: 2px;
     resize: none;
     outline: none;
@@ -56,8 +57,9 @@ const StyledTextarea = styled.textarea`
     }
 
     &:disabled {
-        border: 1px solid ${disabledColor};
-        cursor: not-allowed;
+        pointer-events: none;
+        background: ${colors.GRAY_LIGHT};
+        color: ${colors.TEXT_SECONDARY};
 
         &::-webkit-input-placeholder {
             color: ${disabledColor};
@@ -86,6 +88,23 @@ const TopLabel = styled.span`
     color: ${colors.TEXT_SECONDARY};
 `;
 
+const BottomText = styled.span`
+    font-size: ${FONT_SIZE.SMALLER};
+    color: ${props => (props.color ? props.color : colors.TEXT_SECONDARY)};
+`;
+
+const getColor = (inputState) => {
+    let color = '';
+    if (inputState === 'success') {
+        color = colors.SUCCESS_PRIMARY;
+    } else if (inputState === 'warning') {
+        color = colors.WARNING_PRIMARY;
+    } else if (inputState === 'error') {
+        color = colors.ERROR_PRIMARY;
+    }
+    return color;
+};
+
 const Textarea = ({
     className,
     placeholder = '',
@@ -95,10 +114,13 @@ const Textarea = ({
     onBlur,
     isDisabled,
     onChange,
-    isError,
     topLabel,
+    state = '',
+    bottomText = '',
 }) => (
-    <Wrapper>
+    <Wrapper
+        className={className}
+    >
         {topLabel && (
             <TopLabel>{topLabel}</TopLabel>
         )}
@@ -111,14 +133,20 @@ const Textarea = ({
             value={value}
             placeholder={placeholder}
             onChange={onChange}
-            isError={isError}
+            borderColor={getColor(state)}
         />
+        {bottomText && (
+            <BottomText
+                color={getColor(state)}
+            >
+                {bottomText}
+            </BottomText>
+        )}
     </Wrapper>
 );
 
 Textarea.propTypes = {
     className: PropTypes.string,
-    isError: PropTypes.bool,
     onFocus: PropTypes.func,
     onBlur: PropTypes.func,
     onChange: PropTypes.func,
@@ -127,6 +155,8 @@ Textarea.propTypes = {
     value: PropTypes.string,
     isDisabled: PropTypes.bool,
     topLabel: PropTypes.node,
+    state: PropTypes.string,
+    bottomText: PropTypes.string,
 };
 
 export default Textarea;

src/components/Tooltip/index.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import RcTooltip from 'rc-tooltip';
 import colors from 'config/colors';
+import Link from 'components/Link';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 
@@ -11,7 +12,7 @@ const Wrapper = styled.div`
         position: absolute;
         z-index: 1070;
         visibility: visible;
-        border: 1px solid ${colors.DIVIDER};
+        border: none;
         border-radius: 3px;
         box-shadow: 0 3px 8px rgba(0, 0, 0, 0.06);
     }
@@ -22,15 +23,15 @@ const Wrapper = styled.div`
 
     .rc-tooltip-inner {
         padding: 8px 10px;
-        color: ${colors.TEXT_SECONDARY};
+        color: ${colors.WHITE};
         font-size: 12px;
         line-height: 1.5;
         text-align: left;
         text-decoration: none;
-        background-color: ${colors.WHITE};
+        background-color: ${colors.TOOLTIP_BACKGROUND};
         border-radius: 3px;
         min-height: 34px;
-        border: 1px solid ${colors.WHITE};
+        border: none;
     }
 
     .rc-tooltip-arrow,
@@ -48,7 +49,7 @@ const Wrapper = styled.div`
         bottom: -6px;
         margin-left: -6px;
         border-width: 6px 6px 0;
-        border-top-color: ${colors.DIVIDER};
+        border-top-color: ${colors.BLACK};
     }
 
     .rc-tooltip-placement-top .rc-tooltip-arrow-inner,
@@ -57,7 +58,7 @@ const Wrapper = styled.div`
         bottom: 2px;
         margin-left: -6px;
         border-width: 6px 6px 0;
-        border-top-color: ${colors.WHITE};
+        border-top-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-top .rc-tooltip-arrow {
@@ -78,7 +79,7 @@ const Wrapper = styled.div`
         left: -5px;
         margin-top: -6px;
         border-width: 6px 6px 6px 0;
-        border-right-color: ${colors.DIVIDER};
+        border-right-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-right .rc-tooltip-arrow-inner,
@@ -87,7 +88,7 @@ const Wrapper = styled.div`
         left: 1px;
         margin-top: -6px;
         border-width: 6px 6px 6px 0;
-        border-right-color: ${colors.WHITE};
+        border-right-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-right .rc-tooltip-arrow {
@@ -109,7 +110,7 @@ const Wrapper = styled.div`
         right: -5px;
         margin-top: -6px;
         border-width: 6px 0 6px 6px;
-        border-left-color: ${colors.DIVIDER};
+        border-left-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-left .rc-tooltip-arrow-inner,
@@ -118,7 +119,7 @@ const Wrapper = styled.div`
         right: 1px;
         margin-top: -6px;
         border-width: 6px 0 6px 6px;
-        border-left-color: ${colors.WHITE};
+        border-left-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-left .rc-tooltip-arrow {
@@ -140,7 +141,7 @@ const Wrapper = styled.div`
         top: -5px;
         margin-left: -6px;
         border-width: 0 6px 6px;
-        border-bottom-color: ${colors.DIVIDER};
+        border-bottom-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-bottom .rc-tooltip-arrow-inner,
@@ -149,7 +150,7 @@ const Wrapper = styled.div`
         top: 1px;
         margin-left: -6px;
         border-width: 0 6px 6px;
-        border-bottom-color: ${colors.WHITE};
+        border-bottom-color: ${colors.TOOLTIP_BACKGROUND};
     }
 
     .rc-tooltip-placement-bottom .rc-tooltip-arrow {
@@ -165,6 +166,20 @@ const Wrapper = styled.div`
     }
 `;
 
+const Content = styled.div`
+    padding-bottom: 10px;
+    text-align: justify;
+`;
+
+const ContentWrapper = styled.div``;
+const ReadMore = styled.div`
+    padding: 10px 0 5px 0;
+    text-align: center;
+    width: 100%;
+    color: ${colors.WHITE};
+    border-top: 1px solid ${colors.TEXT_SECONDARY};
+`;
+
 class Tooltip extends Component {
     render() {
         const {
@@ -172,6 +187,7 @@ class Tooltip extends Component {
             placement,
             content,
             children,
+            readMoreLink,
             maxWidth,
         } = this.props;
         return (
@@ -184,7 +200,16 @@ class Tooltip extends Component {
                     getTooltipContainer={() => this.tooltipContainerRef}
                     arrowContent={<div className="rc-tooltip-arrow-inner" />}
                     placement={placement}
-                    overlay={content}
+                    overlay={() => (
+                        <ContentWrapper>
+                            <Content>{content}</Content>
+                            {readMoreLink && (
+                                <Link target="_blank" href={readMoreLink}>
+                                    <ReadMore>Read more</ReadMore>
+                                </Link>
+                            )
+                            }
+                        </ContentWrapper>)}
                 >
                     {children}
                 </RcTooltip>
@@ -205,6 +230,7 @@ Tooltip.propTypes = {
         PropTypes.element,
         PropTypes.string,
     ]),
+    readMoreLink: PropTypes.string,
 };
 
 export default Tooltip;

src/components/inputs/Input/index.js

@@ -115,20 +115,21 @@ class Input extends Component {
                             />
                         )}
                         <StyledInput
-                            hasIcon={!!this.props.state}
+                            hasIcon={this.getIcon(this.props.state).length > 0}
                             innerRef={this.props.innerRef}
                             hasAddon={!!this.props.sideAddons}
                             type={this.props.type}
                             color={this.getColor(this.props.state)}
                             placeholder={this.props.placeholder}
-                            autoComplete={this.props.autoComplete}
-                            autoCorrect={this.props.autoCorrect}
-                            autoCapitalize={this.props.autoCapitalize}
+                            autocomplete={this.props.autocomplete}
+                            autocorrect={this.props.autocorrect}
+                            autocapitalize={this.props.autocapitalize}
                             spellCheck={this.props.spellCheck}
                             value={this.props.value}
                             onChange={this.props.onChange}
                             borderColor={this.getColor(this.props.state)}
                             disabled={this.props.isDisabled}
+                            name={this.props.name}
                         />
                     </InputIconWrapper>
                     {this.props.sideAddons && this.props.sideAddons.map(sideAddon => sideAddon)}
@@ -150,9 +151,9 @@ Input.propTypes = {
     innerRef: PropTypes.func,
     placeholder: PropTypes.string,
     type: PropTypes.string,
-    autoComplete: PropTypes.string,
-    autoCorrect: PropTypes.string,
-    autoCapitalize: PropTypes.string,
+    autocomplete: PropTypes.string,
+    autocorrect: PropTypes.string,
+    autocapitalize: PropTypes.string,
     spellCheck: PropTypes.string,
     value: PropTypes.string,
     onChange: PropTypes.func,
@@ -161,6 +162,7 @@ Input.propTypes = {
     topLabel: PropTypes.node,
     sideAddons: PropTypes.arrayOf(PropTypes.node),
     isDisabled: PropTypes.bool,
+    name: PropTypes.string,
 };
 
 Input.defaultProps = {

src/components/modals/device/Duplicate/index.js

@@ -63,12 +63,6 @@ const ErrorMessage = styled.div`
 `;
 
 export default class DuplicateDevice extends Component<Props, State> {
-    state: State;
-
-    input: ?HTMLInputElement;
-
-    keyboardHandler: (event: KeyboardEvent) => void;
-
     constructor(props: Props) {
         super(props);
 
@@ -85,6 +79,12 @@ export default class DuplicateDevice extends Component<Props, State> {
         };
     }
 
+    state: State;
+
+    input: ?HTMLInputElement;
+
+    keyboardHandler: (event: KeyboardEvent) => void;
+
     componentDidMount(): void {
         // one time autofocus
         if (this.input) this.input.focus();

src/components/modals/passphrase/Passphrase/index.js

@@ -1,18 +1,25 @@
 /* @flow */
 import React, { Component } from 'react';
-import raf from 'raf';
+import styled from 'styled-components';
 import colors from 'config/colors';
+import { FONT_SIZE, TRANSITION } from 'config/variables';
 import { H2 } from 'components/Heading';
 import P from 'components/Paragraph';
-import { FONT_SIZE } from 'config/variables';
-import Link from 'components/Link';
 import Checkbox from 'components/Checkbox';
 import Button from 'components/Button';
 import Input from 'components/inputs/Input';
-import styled from 'styled-components';
 
 import type { Props } from '../../index';
 
+type State = {
+    deviceLabel: string,
+    shouldShowSingleInput: boolean,
+    passphraseInputValue: string,
+    passphraseCheckInputValue: string,
+    doPassphraseInputsMatch: boolean,
+    isPassphraseHidden: boolean,
+};
+
 const Wrapper = styled.div`
     padding: 24px 48px;
     max-width: 390px;
@@ -45,315 +52,229 @@ const Footer = styled.div`
     justify-content: center;
 `;
 
-type State = {
-    deviceLabel: string;
-    singleInput: boolean;
-    passphrase: string;
-    passphraseRevision: string;
-    passphraseFocused: boolean;
-    passphraseRevisionFocused: boolean;
-    passphraseRevisionTouched: boolean;
-    match: boolean;
-    visible: boolean;
-}
+const LinkButton = styled(Button)`
+    padding: 0;
+    margin: 0;
+    text-decoration: none;
+    cursor: pointer;
+    transition: ${TRANSITION.HOVER};
+    font-size: ${FONT_SIZE.SMALLER};
+    border-radius: 0;
+    border-bottom: 1px solid ${colors.GREEN_PRIMARY};
+    background: transparent;
 
-export default class PinModal extends Component<Props, State> {
+    &,
+    &:visited,
+    &:active,
+    &:hover {
+        color: ${colors.GREEN_PRIMARY};
+    }
+
+    &:hover {
+        border-color: transparent;
+        background: transparent;
+    }
+`;
+
+class Passphrase extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
         const device = props.modal.opened ? props.modal.device : null;
-        if (!device) return;
+        if (!device) {
+            return;
+        }
 
-        // check if this device is already known
-        const selected = props.wallet.selectedDevice;
+        // Check if this device is already known
+        // if device is already known then only one input is presented
+        const { selectedDevice } = props.wallet;
         let deviceLabel = device.label;
-        let singleInput = false;
-        if (selected && selected.path === device.path) {
-            deviceLabel = selected.instanceLabel;
-            singleInput = selected.remember || selected.state !== null;
+        let shouldShowSingleInput = false;
+        if (selectedDevice && selectedDevice.path === device.path) {
+            deviceLabel = selectedDevice.instanceLabel;
+            shouldShowSingleInput = selectedDevice.remember || selectedDevice.state !== null;
         }
 
         this.state = {
             deviceLabel,
-            singleInput,
-            passphrase: '',
-            passphraseRevision: '',
-            passphraseFocused: false,
-            passphraseRevisionFocused: false,
-            passphraseRevisionTouched: false,
-            match: true,
-            visible: false,
+            shouldShowSingleInput,
+            passphraseInputValue: '',
+            passphraseCheckInputValue: '',
+            doPassphraseInputsMatch: true,
+            isPassphraseHidden: true,
         };
     }
 
-    keyboardHandler: (event: KeyboardEvent) => void;
-
     state: State;
 
-    passphraseInput: ?HTMLInputElement;
+    componentDidMount() {
+        this.passphraseInput.focus();
 
-    passphraseRevisionInput: ?HTMLInputElement;
-
-
-    keyboardHandler(event: KeyboardEvent): void {
-        if (event.keyCode === 13) {
-            event.preventDefault();
-            //this.passphraseInput.blur();
-            //this.passphraseRevisionInput.blur();
-
-            //this.passphraseInput.type = 'text';
-            //this.passphraseRevisionInput.type = 'text';
-
-            this.submit();
-
-            // TODO: set timeout, or wait for blur event
-            //onPassphraseSubmit(passphrase, passphraseCached);
-            //raf(() => onPassphraseSubmit(passphrase));
-        }
+        this.handleKeyPress = this.handleKeyPress.bind(this);
+        window.addEventListener('keypress', this.handleKeyPress, false);
     }
 
-
-    componentDidMount(): void {
-        // one time autofocus
-        if (this.passphraseInput) this.passphraseInput.focus();
-        this.keyboardHandler = this.keyboardHandler.bind(this);
-        window.addEventListener('keydown', this.keyboardHandler, false);
-
-
-        // document.oncontextmenu = (event) => {
-        //     const el = window.event.srcElement || event.target;
-        //     const type = el.tagName.toLowerCase() || '';
-        //     if (type === 'input') {
-        //         return false;
-        //     }
-        // };
+    componentWillUnmount() {
+        window.removeEventListener('keypress', this.handleKeyPress, false);
     }
 
-    // we don't want to keep password inside "value" attribute,
-    // so we need to replace it thru javascript
-    componentDidUpdate() {
-        const {
-            passphrase,
-            passphraseRevision,
-            passphraseFocused,
-            passphraseRevisionFocused,
-            visible,
-        } = this.state;
-        // } = this.props.modal;
+    handleKeyPress: (event: KeyboardEvent) => void;
 
-        const passphraseInputValue: string = passphrase;
-        const passphraseRevisionInputValue: string = passphraseRevision;
-        // if (!visible && !passphraseFocused) {
-        //     passphraseInputValue = passphrase.replace(/./g, '•');
-        // }
-        // if (!visible && !passphraseRevisionFocused) {
-        //     passphraseRevisionInputValue = passphraseRevision.replace(/./g, '•');
-        // }
+    passphraseInput: HTMLInputElement;
 
+    handleInputChange(event: Event) {
+        const { target } = event;
+        if (target instanceof HTMLInputElement) {
+            const inputValue = target.value;
+            const inputName = target.name;
 
-        if (this.passphraseInput) {
-            // this.passphraseInput.value = passphraseInputValue;
-            // this.passphraseInput.setAttribute('type', visible || (!visible && !passphraseFocused) ? 'text' : 'password');
-            this.passphraseInput.setAttribute('type', visible ? 'text' : 'password');
-        }
-        if (this.passphraseRevisionInput) {
-            // this.passphraseRevisionInput.value = passphraseRevisionInputValue;
-            // this.passphraseRevisionInput.setAttribute('type', visible || (!visible && !passphraseRevisionFocused) ? 'text' : 'password');
-            this.passphraseRevisionInput.setAttribute('type', visible ? 'text' : 'password');
-        }
-    }
-
-    componentWillUnmount(): void {
-        window.removeEventListener('keydown', this.keyboardHandler, false);
-        // this.passphraseInput.type = 'text';
-        // this.passphraseInput.style.display = 'none';
-        // this.passphraseRevisionInput.type = 'text';
-        // this.passphraseRevisionInput.style.display = 'none';
-    }
-
-
-    onPassphraseChange = (input: string, value: string): void => {
-        // https://codepen.io/MiDri/pen/PGqvrO
-        // or
-        // https://github.com/zakangelle/react-password-mask/blob/master/src/index.js
-        if (input === 'passphrase') {
-            this.setState(previousState => ({
-                match: previousState.singleInput || previousState.passphraseRevision === value,
-                passphrase: value,
-            }));
-
-            if (this.state.visible && this.passphraseRevisionInput) {
-                this.setState({
-                    match: true,
-                    passphraseRevision: value,
-                });
-                this.passphraseRevisionInput.value = value;
+            let doPassphraseInputsMatch = false;
+            if (inputName === 'passphraseInputValue') {
+                // If passphrase is not hidden the second input should get filled automatically
+                // and should be disabled
+                if (this.state.isPassphraseHidden) {
+                    doPassphraseInputsMatch = inputValue === this.state.passphraseCheckInputValue;
+                } else {
+                    // Since both inputs are same they really do match
+                    // see: comment above
+                    this.setState({
+                        passphraseCheckInputValue: inputValue,
+                    });
+                    doPassphraseInputsMatch = true;
+                }
+            } else if (inputName === 'passphraseCheckInputValue') {
+                doPassphraseInputsMatch = inputValue === this.state.passphraseInputValue;
             }
+
+            if (this.state.shouldShowSingleInput) {
+                doPassphraseInputsMatch = true;
+            }
+
+            this.setState({
+                [inputName]: inputValue,
+                doPassphraseInputsMatch,
+            });
+        }
+    }
+
+    handleCheckboxClick() {
+        // If passphrase was visible and now shouldn't be --> delete the value of passphraseCheckInputValue
+        // doPassphraseInputsMatch
+        // - if passphrase was visible and now shouldn't be --> doPassphraseInputsMatch = false
+        //  - because passphraseCheckInputValue will be empty string
+        // - if passphrase wasn't visibe and now should be --> doPassphraseInputsMatch = true
+        //  - because passphraseCheckInputValue will be same as passphraseInputValue
+        let doInputsMatch = false;
+        if (this.state.shouldShowSingleInput || this.state.passphraseInputValue === this.state.passphraseCheckInputValue) {
+            doInputsMatch = true;
         } else {
-            this.setState(previousState => ({
-                match: previousState.passphrase === value,
-                passphraseRevision: value,
-                passphraseRevisionTouched: true,
-            }));
+            doInputsMatch = !!this.state.isPassphraseHidden;
         }
+
+        this.setState(previousState => ({
+            isPassphraseHidden: !previousState.isPassphraseHidden,
+            passphraseInputValue: previousState.isPassphraseHidden ? previousState.passphraseInputValue : '',
+            passphraseCheckInputValue: previousState.isPassphraseHidden ? previousState.passphraseInputValue : '',
+            doPassphraseInputsMatch: doInputsMatch,
+        }));
     }
 
-    onPassphraseFocus = (input: string): void => {
-        if (input === 'passphrase') {
-            this.setState({
-                passphraseFocused: true,
-            });
-        } else {
-            this.setState({
-                passphraseRevisionFocused: true,
-            });
-        }
-    }
-
-    onPassphraseBlur = (input: string): void => {
-        if (input === 'passphrase') {
-            this.setState({
-                passphraseFocused: false,
-            });
-        } else {
-            this.setState({
-                passphraseRevisionFocused: false,
-            });
-        }
-    }
-
-    onPassphraseShow = (): void => {
-        this.setState({
-            visible: true,
-        });
-        if (this.passphraseRevisionInput) {
-            this.passphraseRevisionInput.disabled = true;
-            this.passphraseRevisionInput.value = this.state.passphrase;
-            this.setState(previousState => ({
-                passphraseRevision: previousState.passphrase,
-                match: true,
-            }));
-        }
-    }
-
-    onPassphraseHide = (): void => {
-        this.setState({
-            visible: false,
-        });
-        if (this.passphraseRevisionInput) {
-            const emptyPassphraseRevisionValue = '';
-            this.passphraseRevisionInput.value = emptyPassphraseRevisionValue;
-            this.setState(previousState => ({
-                passphraseRevision: emptyPassphraseRevisionValue,
-                match: emptyPassphraseRevisionValue === previousState.passphrase,
-            }));
-            this.passphraseRevisionInput.disabled = false;
-        }
-    }
-
-    submit = (empty: boolean = false): void => {
+    submitPassphrase(shouldLeavePassphraseBlank: boolean = false) {
         const { onPassphraseSubmit } = this.props.modalActions;
-        const { passphrase, match } = this.state;
-
-        if (!match) return;
-
-        //this.passphraseInput.type = 'text';
-        // this.passphraseInput.style.display = 'none';
-        //this.passphraseInput.setAttribute('readonly', 'readonly');
-        // this.passphraseRevisionInput.type = 'text';
-        //this.passphraseRevisionInput.style.display = 'none';
-        //this.passphraseRevisionInput.setAttribute('readonly', 'readonly');
-
-        // const p = passphrase;
+        const passphrase = this.state.passphraseInputValue;
 
+        // Reset state so same passphrase isn't filled when the modal will be visible again
         this.setState({
-            passphrase: '',
-            passphraseRevision: '',
-            passphraseFocused: false,
-            passphraseRevisionFocused: false,
-            visible: false,
+            passphraseInputValue: '',
+            passphraseCheckInputValue: '',
+            doPassphraseInputsMatch: true,
+            isPassphraseHidden: true,
         });
 
-        raf(() => onPassphraseSubmit(empty ? '' : passphrase));
+        onPassphraseSubmit(shouldLeavePassphraseBlank ? '' : passphrase);
+    }
+
+    handleKeyPress(event: KeyboardEvent) {
+        if (event.key === 'Enter') {
+            event.preventDefault();
+            console.warn('ENTER', this.state);
+            if (this.state.doPassphraseInputsMatch) {
+                this.submitPassphrase();
+            }
+        }
     }
 
     render() {
-        if (!this.props.modal.opened) return null;
+        if (!this.props.modal.opened) {
+            return null;
+        }
 
-        const {
-            device,
-        } = this.props.modal;
-
-        const {
-            deviceLabel,
-            singleInput,
-            passphrase,
-            passphraseRevision,
-            passphraseFocused,
-            passphraseRevisionFocused,
-            visible,
-            match,
-            passphraseRevisionTouched,
-        } = this.state;
-
-        let passphraseInputType: string = visible || (!visible && !passphraseFocused) ? 'text' : 'password';
-        let passphraseRevisionInputType: string = visible || (!visible && !passphraseRevisionFocused) ? 'text' : 'password';
-        passphraseInputType = passphraseRevisionInputType = 'text';
-        //let passphraseInputType: string = visible || passphraseFocused ? "text" : "password";
-        //let passphraseRevisionInputType: string = visible || passphraseRevisionFocused ? "text" : "password";
-
-        const showPassphraseCheckboxFn: Function = visible ? this.onPassphraseHide : this.onPassphraseShow;
         return (
             <Wrapper>
-                <H2>Enter { deviceLabel } passphrase</H2>
+                <H2>Enter {this.state.deviceLabel} passphrase</H2>
                 <P isSmaller>Note that passphrase is case-sensitive.</P>
                 <Row>
                     <Label>Passphrase</Label>
                     <Input
-                        innerRef={(element) => { this.passphraseInput = element; }}
-                        onChange={event => this.onPassphraseChange('passphrase', event.currentTarget.value)}
-                        type={passphraseInputType}
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        data-lpignore="true"
-                        onFocus={() => this.onPassphraseFocus('passphrase')}
-                        onBlur={() => this.onPassphraseBlur('passphrase')}
-                        tabIndex="0"
+                        innerRef={(input) => { this.passphraseInput = input; }}
+                        name="passphraseInputValue"
+                        type={this.state.isPassphraseHidden ? 'password' : 'text'}
+                        autocorrect="off"
+                        autocapitalize="off"
+                        autocomplete="off"
+                        value={this.state.passphraseInputValue}
+                        onChange={event => this.handleInputChange(event)}
                     />
                 </Row>
-                {!singleInput && (
+                {!this.state.shouldShowSingleInput && (
                     <Row>
                         <Label>Re-enter passphrase</Label>
                         <Input
-                            innerRef={(element) => { this.passphraseRevisionInput = element; }}
-                            onChange={event => this.onPassphraseChange('revision', event.currentTarget.value)}
-                            type={passphraseRevisionInputType}
-                            autoComplete="off"
-                            autoCorrect="off"
-                            autoCapitalize="off"
-                            spellCheck="false"
-                            data-lpignore="true"
-                            onFocus={() => this.onPassphraseFocus('revision')}
-                            onBlur={() => this.onPassphraseBlur('revision')}
+                            name="passphraseCheckInputValue"
+                            type={this.state.isPassphraseHidden ? 'password' : 'text'}
+                            autocorrect="off"
+                            autocapitalize="off"
+                            autocomplete="off"
+                            value={this.state.passphraseCheckInputValue}
+                            onChange={event => this.handleInputChange(event)}
+                            isDisabled={!this.state.isPassphraseHidden}
                         />
-                        {!match && passphraseRevisionTouched && <PassphraseError>Passphrases do not match</PassphraseError> }
                     </Row>
-                ) }
+                )}
+
+                {!this.state.doPassphraseInputsMatch && (
+                    <PassphraseError>Passphrases do not match</PassphraseError>
+                )}
+
                 <Row>
-                    <Checkbox onClick={showPassphraseCheckboxFn} checked={visible}>Show passphrase</Checkbox>
+                    <Checkbox
+                        isChecked={!this.state.isPassphraseHidden}
+                        onClick={() => this.handleCheckboxClick()}
+                    >
+                        Show passphrase
+                    </Checkbox>
                 </Row>
                 <Row>
-                    <Button type="button" disabled={!match} onClick={() => this.submit()}>Enter</Button>
+                    <Button
+                        isDisabled={!this.state.doPassphraseInputsMatch}
+                        onClick={() => this.submitPassphrase()}
+                    >Enter
+                    </Button>
                 </Row>
+
                 <Footer>
                     <P isSmaller>If you want to access your default account</P>
                     <P isSmaller>
-                        <Link isGreen onClick={() => this.submit(true)}>Leave passphrase blank</Link>
+                        <LinkButton
+                            isGreen
+                            onClick={() => this.submitPassphrase(true)}
+                        >Leave passphrase blank
+                        </LinkButton>
                     </P>
                 </Footer>
             </Wrapper>
         );
     }
-}
+}
+
+export default Passphrase;

src/components/notifications/Context/components/Account/index.js

@@ -0,0 +1,36 @@
+/* @flow */
+import * as React from 'react';
+import { Notification } from 'components/Notification';
+
+import type { Props } from '../../index';
+
+// There could be only one account notification
+export default (props: Props) => {
+    const { notification } = props.selectedAccount;
+    if (notification) {
+        if (notification.type === 'backend') {
+            // special case: backend is down
+            // TODO: this is a different component with "auto resolve" button
+            
+            return (
+                <Notification
+                    type="error"
+                    title={notification.title}
+                    message={notification.message}
+                    actions={
+                        [{
+                            label: 'Connect',
+                            callback: async () => {
+                                await props.blockchainReconnect('trop');
+                            },
+                        }]
+                    }
+                />
+            );
+          
+           // return (<Notification type="error" title={notification.title} message={notification.message} />);
+        }
+        return (<Notification type={notification.type} title={notification.title} message={notification.message} />);
+    }
+    return null;
+};

src/components/notifications/Context/components/Action/index.js

@@ -0,0 +1,20 @@
+/* @flow */
+import * as React from 'react';
+import { Notification } from 'components/Notification';
+
+import type { Props } from '../../index';
+
+export default (props: Props) => {
+    const { notifications, close } = props;
+    return notifications.map(n => (
+        <Notification
+            key={n.title}
+            type={n.type}
+            title={n.title}
+            message={n.message}
+            cancelable={n.cancelable}
+            actions={n.actions}
+            close={close}
+        />
+    ));
+};

src/components/notifications/Context/components/Static/index.js

@@ -0,0 +1,17 @@
+/* @flow */
+import * as React from 'react';
+import { Notification } from 'components/Notification';
+
+import type { Props } from '../../index';
+
+export default (props: Props) => {
+    const { location } = props.router;
+    if (!location) return null;
+
+    const notifications: Array<Notification> = [];
+    // if (location.state.device) {
+    //     notifications.push(<Notification key="example" type="info" title="Static example" />);
+    // }
+
+    return notifications;
+};

src/components/notifications/Context/index.js

@@ -0,0 +1,55 @@
+/* @flow */
+import * as 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 { reconnect } from 'actions/DiscoveryActions';
+import * as NotificationActions from 'actions/NotificationActions';
+
+import StaticNotifications from './components/Static';
+import AccountNotifications from './components/Account';
+import ActionNotifications from './components/Action';
+
+export type StateProps = {
+    router: $ElementType<State, 'router'>;
+    notifications: $ElementType<State, 'notifications'>;
+    selectedAccount: $ElementType<State, 'selectedAccount'>;
+    wallet: $ElementType<State, 'wallet'>;
+    blockchain: $ElementType<State, 'blockchain'>;
+    children?: React.Node;
+}
+
+export type DispatchProps = {
+    close: typeof NotificationActions.close;
+    blockchainReconnect: typeof reconnect;
+}
+
+export type Props = StateProps & DispatchProps;
+
+type OwnProps = {};
+
+const Notifications = (props: Props) => (
+    <React.Fragment>
+        <StaticNotifications {...props} />
+        <AccountNotifications {...props} />
+        <ActionNotifications {...props} />
+    </React.Fragment>
+);
+
+const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State): StateProps => ({
+    router: state.router,
+    notifications: state.notifications,
+    selectedAccount: state.selectedAccount,
+    wallet: state.wallet,
+    blockchain: state.blockchain,
+});
+
+const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
+    close: bindActionCreators(NotificationActions.close, dispatch),
+    blockchainReconnect: bindActionCreators(reconnect, dispatch),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Notifications);

src/config/colors.js

@@ -32,4 +32,5 @@ export default {
     ERROR_SECONDARY: '#FFE9E9',
 
     LABEL_COLOR: '#A9A9A9',
+    TOOLTIP_BACKGROUND: '#333333',
 };

src/constants/notifications.js

@@ -0,0 +1,8 @@
+export default {
+    PRIORITY: {
+        error: 0,
+        warning: 1,
+        info: 2,
+        success: 3,
+    },
+};

src/index.html

@@ -10,8 +10,29 @@
     <meta name="keywords" content="trezor wallet" />
     <meta name="author" content="satoshilabs s.r.o." />
     <meta name="viewport" content="width=1024, initial-scale=1">
+    <!--[if lt IE 8]>
+        <link media="all" rel="stylesheet" href="/unsupported-browsers/style.css" />
+        <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+    <![endif]-->
 </head>
 <body>
+    <!--[if lt IE 8]>
+     <div class="unsupported-browsers">
+        <div class="header"></div>
+        <h1>Your browser is not supported</h1>
+        <p>Please choose one of the supported browsers</p>
+        <div class="main">
+            <div class="box left">
+                <img src="/unsupported-browsers/browser-chrome.png">
+                <a href="https://www.google.com/chrome/" target="_blank" rel="noreferrer noopener">Get Chrome</a>
+            </div>
+            <div class="box right">
+                <img src="/unsupported-browsers/browser-firefox.png">
+                <a href="https://www.mozilla.org/en-US/firefox/new/" target="_blank" rel="noreferrer noopener">Get Firefox</a>
+            </div>
+        </div>
+    </div>
+    <![endif]-->
     <div id="root"></div>
 </body>
 </html>

src/reducers/DevicesReducer.js

@@ -94,7 +94,6 @@ const addDevice = (state: State, device: Device): State => {
 
     const newDevice: TrezorDevice = device.type === 'acquired' ? {
         ...device,
-        // acquiring: false,
         ...extended,
     } : {
         ...device,
@@ -132,8 +131,8 @@ const addDevice = (state: State, device: Device): State => {
 
         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 extended2: Object = { connected: true, available: true };
+            return mergeDevices(d, { ...device, ...extended2 });
         });
         if (changedDevices.length !== affectedDevices.length) {
             changedDevices.push(newDevice);
@@ -154,7 +153,6 @@ const duplicate = (state: State, device: TrezorDevice): State => {
 
     const newDevice: TrezorDevice = {
         ...device,
-        // acquiring: false,
         remember: false,
         state: null,
         // instance, (instance is already part of device - added in modal)
@@ -199,7 +197,7 @@ const authDevice = (state: State, device: TrezorDevice, deviceState: string): St
 
 
 // Transform JSON form local storage into State
-const devicesFromStorage = (devices: Array<TrezorDevice>): State => devices.map((device: TrezorDevice) => {
+const devicesFromStorage = ($devices: Array<TrezorDevice>): State => $devices.map((device: TrezorDevice) => {
     const extended = {
         connected: false,
         available: false,
@@ -233,14 +231,14 @@ 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) => {
-            if (d.type === 'acquired') {
-                d.connected = false;
-                d.available = false;
-                d.status = 'available';
-                d.path = '';
-            }
-            return d;
+        const acquiredDevices = affectedDevices.filter(d => d.features && d.state).map((d) => { // eslint-disable-line arrow-body-style
+            return d.type === 'acquired' ? {
+                ...d,
+                connected: false,
+                available: false,
+                status: 'available',
+                path: '',
+            } : d;
         });
         return otherDevices.concat(acquiredDevices);
     }
@@ -249,12 +247,18 @@ const disconnectDevice = (state: State, device: Device): State => {
 };
 
 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 state;
+    if (!device) return state;
+
+    const otherDevices: Array<TrezorDevice> = state.filter(d => d !== device);
+    const extended = device.type === 'acquired' ? {
+        ...device,
+        ts: new Date().getTime(),
+    } : {
+        ...device,
+        features: null,
+        ts: new Date().getTime(),
+    };
+    return otherDevices.concat([extended]);
 };
 
 export default function devices(state: State = initialState, action: Action): State {

src/reducers/PendingTxReducer.js

@@ -65,7 +65,7 @@ export default function pending(state: State = initialState, action: Action): St
         //    return add(state, action.payload);
         case PENDING.TX_RESOLVED:
             return remove(state, action.tx.id);
-        case PENDING.TX_NOT_FOUND:
+        case PENDING.TX_REJECTED:
             return reject(state, action.tx.id);
 
         case PENDING.FROM_STORAGE:

src/reducers/SelectedAccountReducer.js

@@ -11,12 +11,18 @@ import type {
 } from 'flowtype';
 
 export type State = {
-    location?: string;
+    location: string;
     account: ?Account;
     network: ?Coin;
     tokens: Array<Token>,
     pending: Array<PendingTx>,
-    discovery: ?Discovery
+    discovery: ?Discovery,
+    notification: ?{
+        type: string,
+        title: string,
+        message?: string,
+    },
+    shouldRender: boolean,
 };
 
 export const initialState: State = {
@@ -26,6 +32,8 @@ export const initialState: State = {
     tokens: [],
     pending: [],
     discovery: null,
+    notification: null,
+    shouldRender: false,
 };
 
 export default (state: State = initialState, action: Action): State => {

src/reducers/TrezorConnectReducer.js

@@ -10,9 +10,7 @@ export type SelectedDevice = {
 }
 
 export type State = {
-    // devices: Array<TrezorDevice>;
-    // selectedDevice: ?SelectedDevice;
-    discoveryComplete: boolean;
+    initialized: boolean;
     error: ?string;
     transport: ?{
         type: string;
@@ -26,54 +24,42 @@ export type State = {
     //     mobile: boolean;
     // } | {};
     browserState: any;
-    acquiring: boolean;
+    acquiringDevice: boolean;
 }
 
-
 const initialState: State = {
-    // devices: [],
-    //selectedDevice: null,
-    discoveryComplete: false,
+    initialized: false,
     error: null,
     transport: null,
     browserState: {},
-    acquiring: false,
+    acquiringDevice: false,
 };
 
 
 export default function connect(state: State = initialState, action: Action): State {
     switch (action.type) {
-        case UI.IFRAME_HANDSHAKE:
-            return {
-                ...state,
-                browserState: action.payload.browser,
-            };
-
-        case CONNECT.START_ACQUIRING:
-            return {
-                ...state,
-                acquiring: true,
-            };
-
-        case CONNECT.STOP_ACQUIRING:
-            return {
-                ...state,
-                acquiring: false,
-            };
-
+        // trezor-connect iframe didn't loaded properly
         case CONNECT.INITIALIZATION_ERROR:
             return {
                 ...state,
                 error: action.error,
             };
-
+        // trezor-connect iframe loaded
+        case UI.IFRAME_HANDSHAKE:
+            return {
+                ...state,
+                initialized: true,
+                browserState: action.payload.browser,
+            };
+        // trezor-connect (trezor-link) initialized
         case TRANSPORT.START:
             return {
                 ...state,
                 transport: action.payload,
                 error: null,
             };
-
+        // trezor-connect (trezor-link)
+        // will be called continuously in interval until connection (bridge/webusb) will be established
         case TRANSPORT.ERROR:
             return {
                 ...state,
@@ -82,6 +68,17 @@ export default function connect(state: State = initialState, action: Action): St
                 transport: null,
             };
 
+        case CONNECT.START_ACQUIRING:
+            return {
+                ...state,
+                acquiringDevice: true,
+            };
+
+        case CONNECT.STOP_ACQUIRING:
+            return {
+                ...state,
+                acquiringDevice: false,
+            };
 
         default:
             return state;

src/reducers/utils/index.js

@@ -116,21 +116,58 @@ export const getWeb3 = (state: State): ?Web3Instance => {
     return state.web3.find(w3 => w3.network === locationState.network);
 };
 
-export const observeChanges = (prev: ?(Object | Array<any>), current: ?(Object | Array<any>), fields?: Array<string>): boolean => {
-    if (prev !== current) {
-        // 1. one of the objects is null/undefined
-        if (!prev || !current) return true;
-        // 2. object are Arrays and they have different length
-        if (Array.isArray(prev) && Array.isArray(current)) return prev.length !== current.length;
-        // 3. no nested field to check
-        if (!Array.isArray(fields)) return true;
-        // 4. validate nested field
-        if (prev instanceof Object && current instanceof Object) {
-            for (let i = 0; i < fields.length; i++) {
-                const key = fields[i];
-                if (prev[key] !== current[key]) return true;
+export const observeChanges = (prev: ?Object, current: ?Object, filter?: {[k: string]: Array<string>}): boolean => {
+    // 1. both objects are the same (solves simple types like string, boolean and number)
+    if (prev === current) return false;
+    // 2. one of the objects is null/undefined
+    if (!prev || !current) return true;
+
+    const prevType = Object.prototype.toString.call(current);
+    const currentType = Object.prototype.toString.call(current);
+    // 3. one of the objects has different type then other
+    if (prevType !== currentType) return true;
+
+    if (currentType === '[object Array]') {
+        // 4. Array length is different
+        if (prev.length !== current.length) return true;
+        // observe array recursive
+        for (let i = 0; i < current.length; i++) {
+            if (observeChanges(prev[i], current[i], filter)) return true;
+        }
+    } else if (currentType === '[object Object]') {
+        const prevKeys = Object.keys(prev);
+        const currentKeys = Object.keys(prev);
+        // 5. simple validation of keys length
+        if (prevKeys.length !== currentKeys.length) return true;
+
+        // 6. "prev" has keys which "current" doesn't have
+        const prevDifference = prevKeys.find(k => currentKeys.indexOf(k) < 0);
+        if (prevDifference) return true;
+
+        // 7. "current" has keys which "prev" doesn't have
+        const currentDifference = currentKeys.find(k => prevKeys.indexOf(k) < 0);
+        if (currentDifference) return true;
+
+        // 8. observe every key recursive
+        for (let i = 0; i < currentKeys.length; i++) {
+            const key = currentKeys[i];
+            if (filter && filter.hasOwnProperty(key) && prev[key] && current[key]) {
+                const prevFiltered = {};
+                const currentFiltered = {};
+                for (let i2 = 0; i2 < filter[key].length; i2++) {
+                    const field = filter[key][i2];
+                    prevFiltered[field] = prev[key][field];
+                    currentFiltered[field] = current[key][field];
+                }
+                if (observeChanges(prevFiltered, currentFiltered)) return true;
+            } else if (observeChanges(prev[key], current[key])) {
+                return true;
             }
         }
+    } else if (prev !== current) {
+        // solve simple types like string, boolean and number
+        return true;
     }
+
     return false;
 };

src/services/LocalStorageService.js

@@ -110,9 +110,12 @@ const LocalStorageService: Middleware = (api: MiddlewareAPI) => (next: Middlewar
 
         case SEND.TX_COMPLETE:
         case PENDING.TX_RESOLVED:
-        case PENDING.TX_NOT_FOUND:
+        case PENDING.TX_REJECTED:
             save(api.dispatch, api.getState);
             break;
+
+        default:
+            return action;
     }
 
     return action;

src/services/WalletService.js

@@ -5,7 +5,6 @@ import * as WALLET from 'actions/constants/wallet';
 import * as CONNECT from 'actions/constants/TrezorConnect';
 
 import * as WalletActions from 'actions/WalletActions';
-import * as RouterActions from 'actions/RouterActions';
 import * as NotificationActions from 'actions/NotificationActions';
 import * as LocalStorageActions from 'actions/LocalStorageActions';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
@@ -22,7 +21,7 @@ import type {
 /**
  * Middleware
  */
-const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispatch) => (action: Action): Action => {
+const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispatch) => async (action: Action): Promise<Action> => {
     const prevState = api.getState();
 
     // Application live cycle starts HERE!
@@ -52,9 +51,6 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
             if (action.device) {
                 // try to authorize device
                 api.dispatch(TrezorConnectActions.getSelectedDeviceState());
-            } else {
-                // try select different device
-                api.dispatch(RouterActions.selectFirstAvailableDevice());
             }
             break;
         case DEVICE.CONNECT:
@@ -92,14 +88,14 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
         api.dispatch(NotificationActions.clear(prevLocation.state, currentLocation.state));
     }
 
-    // observe send form props changes
-    api.dispatch(SendFormActionActions.observe(prevState, action));
-
-    // update common values in WallerReducer
-    api.dispatch(WalletActions.updateSelectedValues(prevState, action));
-
-    // update common values in SelectedAccountReducer
-    api.dispatch(SelectedAccountActions.updateSelectedValues(prevState, action));
+    // observe common values in WallerReducer
+    if (!await api.dispatch(WalletActions.observe(prevState, action))) {
+        // if "selectedDevice" didn't change observe common values in SelectedAccountReducer
+        if (!await api.dispatch(SelectedAccountActions.observe(prevState, action))) {
+            // if "selectedAccount" didn't change observe send form props changes
+            api.dispatch(SendFormActionActions.observe(prevState, action));
+        }
+    }
 
     return action;
 };

src/support/BaseStyles.js

@@ -41,6 +41,10 @@ const baseStyles = () => injectGlobal`
         outline: 0;
     }
 
+    #root {
+        height: 100%;
+    }
+
     /* 
         custom Roboto with Zero without the thing inside, so it's more readable as number
         since 0 doesn't look too similar to 8

src/utils/notification.js

@@ -0,0 +1,31 @@
+import colors from 'config/colors';
+import icons from 'config/icons';
+
+const getColor = (type) => {
+    let color;
+    switch (type) {
+        case 'info':
+            color = colors.INFO_PRIMARY;
+            break;
+        case 'error':
+            color = colors.ERROR_PRIMARY;
+            break;
+        case 'warning':
+            color = colors.WARNING_PRIMARY;
+            break;
+        case 'success':
+            color = colors.SUCCESS_PRIMARY;
+            break;
+        default:
+            color = null;
+    }
+
+    return color;
+};
+
+const getIcon = type => icons[type.toUpperCase()];
+
+export {
+    getColor,
+    getIcon,
+};

src/utils/windowUtils.js

@@ -3,9 +3,19 @@
 
 export const getViewportHeight = (): number => (
     // $FlowIssue
-    window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight // $FlowIssue
+    document.documentElement.clientHeight || document.body.clientHeight // $FlowIssue
 );
 
+export const getScrollX = (): number => {
+    if (window.pageXOffset !== undefined) {
+        return window.pageXOffset;
+    } if (window.scrollLeft !== undefined) {
+        return window.scrollLeft;
+    }
+    // $FlowIssue
+    return (document.documentElement || document.body.parentNode || document.body).scrollLeft; // $FlowIssue
+};
+
 export const getScrollY = (): number => {
     if (window.pageYOffset !== undefined) {
         return window.pageYOffset;

src/views/Landing/components/InitializationError/index.js

@@ -0,0 +1,23 @@
+/* @flow */
+
+import React from 'react';
+import styled from 'styled-components';
+import { Notification } from 'components/Notification';
+
+const Wrapper = styled.div`
+    min-width: 720px;
+    width: 100%;
+`;
+
+const InitializationError = (props: { error: ?string }) => (
+    <Wrapper>
+        <Notification
+            title="Initialization error"
+            message={props.error || ''}
+            type="error"
+            cancelable={false}
+        />
+    </Wrapper>
+);
+
+export default InitializationError;

src/views/Landing/index.js

@@ -14,6 +14,7 @@ import { H2 } from 'components/Heading';
 import { isWebUSB } from 'utils/device';
 import { FONT_SIZE } from 'config/variables';
 
+import InitializationError from './components/InitializationError';
 import BrowserNotSupported from './components/BrowserNotSupported';
 import ConnectDevice from './components/ConnectDevice';
 import InstallBridge from './components/InstallBridge';
@@ -21,7 +22,7 @@ import InstallBridge from './components/InstallBridge';
 import type { Props } from './Container';
 
 const LandingWrapper = styled.div`
-    min-height: 100vh;
+    min-height: 100%;
     min-width: 720px;
 
     display: flex;
@@ -77,13 +78,13 @@ export default (props: Props) => {
     const bridgeRoute: boolean = props.router.location.state.hasOwnProperty('bridge');
     const deviceLabel = props.wallet.disconnectRequest ? props.wallet.disconnectRequest.label : '';
 
-    const shouldShowInstallBridge = connectError || bridgeRoute;
+    const shouldShowInitializationError = connectError && !props.connect.initialized;
+    const shouldShowInstallBridge = props.connect.initialized && (connectError || bridgeRoute);
     const shouldShowConnectDevice = props.wallet.ready && devices.length < 1;
     const shouldShowDisconnectDevice = !!props.wallet.disconnectRequest;
     const shouldShowUnsupportedBrowser = browserState.supported === false;
 
-    const isLoading = !shouldShowInstallBridge && !shouldShowConnectDevice && !shouldShowUnsupportedBrowser && !localStorageError;
-
+    const isLoading = !shouldShowInitializationError && !shouldShowInstallBridge && !shouldShowConnectDevice && !shouldShowUnsupportedBrowser && !localStorageError;
     return (
         <LandingWrapper>
             {isLoading && <LandingLoader text="Loading" size={100} />}
@@ -98,10 +99,9 @@ export default (props: Props) => {
                         />
                     )}
                     <Notifications />
+                    {shouldShowInitializationError && <InitializationError error={connectError} />}
                     <Log />
-
                     <LandingContent>
-
                         {shouldShowUnsupportedBrowser && <BrowserNotSupported />}
                         {shouldShowInstallBridge && <InstallBridge browserState={browserState} />}
 

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

@@ -17,7 +17,7 @@ type OwnProps = {
 
 }
 
-const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State/* , own: OwnProps */): StateProps => ({
+const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State): StateProps => ({
     connect: state.connect,
     accounts: state.accounts,
     router: state.router,
@@ -31,7 +31,6 @@ const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: St
 });
 
 const mapDispatchToProps: MapDispatchToProps<Dispatch, OwnProps, DispatchProps> = (dispatch: Dispatch): DispatchProps => ({
-    //onAccountSelect: bindActionCreators(AccountActions.onAccountSelect, dispatch),
     toggleDeviceDropdown: bindActionCreators(toggleDeviceDropdown, dispatch),
     addAccount: bindActionCreators(TrezorConnectActions.addAccount, dispatch),
     acquireDevice: bindActionCreators(TrezorConnectActions.acquire, dispatch),

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

@@ -1,151 +1,74 @@
 /* @flow */
 
-
-// https://github.com/KyleAMathews/react-headroom/blob/master/src/shouldUpdate.js
-
 import * as React from 'react';
 import raf from 'raf';
-import { getViewportHeight, getScrollY } from 'utils/windowUtils';
+import { getViewportHeight, getScrollX, getScrollY } from 'utils/windowUtils';
 import styled from 'styled-components';
 import colors from 'config/colors';
 
 type Props = {
-    location: string,
-    deviceSelection: boolean,
     children?: React.Node,
 }
 
-const AsideWrapper = styled.aside`
+type State = {
+    prevScrollY: number;
+    asideMinHeight: number,
+    wrapperTopOffset: number,
+    wrapperLeftOffset: number,
+    wrapperBottomPadding: number,
+    footerFixed: boolean,
+}
+
+const AsideWrapper = styled.aside.attrs({
+    style: ({ minHeight }) => ({
+        minHeight,
+    }),
+})`
     position: relative;
-    top: 0;
+    top: 0px;
     width: 320px;
     min-width: 320px;
     overflow: hidden;
     background: ${colors.MAIN};
-    border-right: 1px solid ${colors.BACKGROUND};
-
-    .fixed {
-        border-right: 1px solid ${colors.BACKGROUND};
-        position: fixed;
-    }
-
-    .fixed-bottom {
-        padding-bottom: 60px;
-        .sticky-bottom {
-            position: fixed;
-            bottom: 0;
-            background: ${colors.MAIN};
-        }
-    }
+    border-right: 1px solid ${colors.DIVIDER};
 `;
 
-const StickyContainerWrapper = styled.div`
-    position: relative;
-    top: 0;
+const StickyContainerWrapper = styled.div.attrs({
+    style: ({ top, left, paddingBottom }) => ({
+        top,
+        left,
+        paddingBottom,
+    }),
+})`
+    position: fixed;
+    border-right: 1px solid ${colors.DIVIDER};
     width: 320px;
     overflow: hidden;
 `;
 
-export default class StickyContainer extends React.PureComponent<Props> {
-    // Class variables.
-    currentScrollY: number = 0;
-
-    lastKnownScrollY: number = 0;
-
-    topOffset: number = 0;
-
-    firstRender: boolean = false;
-
-    framePending: boolean = false;
-
-    stickToBottom: boolean = false;
-
-    top: number = 0;
-
-    aside: ?HTMLElement;
-
-    wrapper: ?HTMLElement;
-
-    subscribers = [];
-
-    // handleResize = (event: Event) => {
-
-    // }
-
-    shouldUpdate = () => {
-        const { wrapper, aside }: {wrapper: ?HTMLElement, aside: ?HTMLElement} = this;
-        if (!wrapper || !aside) return;
-        const bottom: ?HTMLElement = wrapper.querySelector('.sticky-bottom');
-        if (!bottom) return;
-
-        const viewportHeight: number = getViewportHeight();
-        const bottomBounds = bottom.getBoundingClientRect();
-        const asideBounds = aside.getBoundingClientRect();
-        const wrapperBounds = wrapper.getBoundingClientRect();
-        const scrollDirection = this.currentScrollY >= this.lastKnownScrollY ? 'down' : 'up';
-        const distanceScrolled = Math.abs(this.currentScrollY - this.lastKnownScrollY);
-
-        if (asideBounds.top < 0) {
-            wrapper.classList.add('fixed');
-            let maxTop: number = 1;
-            if (wrapperBounds.height > viewportHeight) {
-                const bottomOutOfBounds: boolean = (bottomBounds.bottom <= viewportHeight && scrollDirection === 'down');
-                const topOutOfBounds: boolean = (wrapperBounds.top > 0 && scrollDirection === 'up');
-                if (!bottomOutOfBounds && !topOutOfBounds) {
-                    this.topOffset += scrollDirection === 'down' ? -distanceScrolled : distanceScrolled;
-                }
-                maxTop = viewportHeight - wrapperBounds.height;
-            }
-
-            if (this.topOffset > 0) this.topOffset = 0;
-            if (maxTop < 0 && this.topOffset < maxTop) this.topOffset = maxTop;
-            wrapper.style.top = `${this.topOffset}px`;
-        } else {
-            wrapper.classList.remove('fixed');
-            wrapper.style.top = '0px';
-            this.topOffset = 0;
-        }
-
-        if (wrapperBounds.height > viewportHeight) {
-            wrapper.classList.remove('fixed-bottom');
-        } else if (wrapper.classList.contains('fixed-bottom')) {
-            if (bottomBounds.top < wrapperBounds.bottom - bottomBounds.height) {
-                wrapper.classList.remove('fixed-bottom');
-            }
-        } else if (bottomBounds.bottom < viewportHeight) {
-            wrapper.classList.add('fixed-bottom');
-        }
-
-        aside.style.minHeight = `${wrapperBounds.height}px`;
-    }
-
-    update = () => {
-        this.currentScrollY = getScrollY();
-        this.shouldUpdate();
-        this.framePending = false;
-        this.lastKnownScrollY = this.currentScrollY;
+export default class StickyContainer extends React.PureComponent<Props, State> {
+    constructor() {
+        super();
+        this.state = {
+            prevScrollY: 0,
+            asideMinHeight: 0,
+            wrapperTopOffset: 0,
+            wrapperLeftOffset: 0,
+            wrapperBottomPadding: 0,
+            footerFixed: false,
+        };
     }
 
     componentDidMount() {
         window.addEventListener('scroll', this.handleScroll);
         window.addEventListener('resize', this.handleScroll);
-        raf(this.update);
+        this.update();
     }
 
-    componentDidUpdate(prevProps: Props) {
-        if (this.props.location !== prevProps.location && this.aside) {
-            const asideBounds = this.aside.getBoundingClientRect();
-            if (asideBounds.top < 0) {
-                window.scrollTo(0, getScrollY() + asideBounds.top);
-                this.topOffset = 0;
-            }
-            raf(this.update);
-        } else if (this.props.deviceSelection !== prevProps.deviceSelection) {
-            raf(this.update);
-        } else if (!this.firstRender) {
-            raf(this.update);
-            this.firstRender = true;
-        }
+    componentDidUpdate(prevProps: Props, newState: State) {
+        // recalculate view only if props was changed
+        // ignore when state is changed
+        if (this.state === newState) raf(this.update);
     }
 
     componentWillUnmount() {
@@ -153,26 +76,106 @@ export default class StickyContainer extends React.PureComponent<Props> {
         window.removeEventListener('resize', this.handleScroll);
     }
 
-    handleScroll = (/* event: ?Event */) => {
-        if (!this.framePending) {
-            this.framePending = true;
-            raf(this.update);
+    update = () => {
+        this.recalculatePosition();
+    }
+
+    handleScroll = () => raf(this.update);
+
+    asideRefCallback = (element: ?HTMLElement) => {
+        this.aside = element;
+    }
+
+    wrapperRefCallback = (element: ?HTMLElement) => {
+        this.wrapper = element;
+    }
+
+    footerRefCallback = (element: ?HTMLElement) => {
+        this.footer = element;
+    }
+
+    aside: ?HTMLElement;
+
+    wrapper: ?HTMLElement;
+
+    footer: ?HTMLElement;
+
+    recalculatePosition() {
+        const { aside, wrapper, footer } = this;
+        if (!aside || !wrapper || !footer) return;
+
+        const viewportHeight = getViewportHeight();
+        const asideBounds = aside.getBoundingClientRect();
+        const wrapperBounds = wrapper.getBoundingClientRect();
+        const footerBounds = footer.getBoundingClientRect();
+        const isHeaderFixed = asideBounds.top < 0;
+        const isWrapperBiggerThanViewport = wrapperBounds.height > viewportHeight;
+        const state = { ...this.state };
+
+        const scrollX = getScrollX();
+        const scrollY = getScrollY();
+
+        if (isHeaderFixed) {
+            if (isWrapperBiggerThanViewport) {
+                const scrollDirection = scrollY >= state.prevScrollY ? 'down' : 'up';
+                const topOutOfBounds: boolean = (wrapperBounds.top > 0 && scrollDirection === 'up');
+                const bottomOutOfBounds: boolean = (footerBounds.bottom <= viewportHeight && scrollDirection === 'down');
+                if (!topOutOfBounds && !bottomOutOfBounds) {
+                    // neither "top" or "bottom" was reached
+                    // scroll whole wrapper
+                    const distanceScrolled = Math.abs(scrollY - state.prevScrollY);
+                    state.wrapperTopOffset += scrollDirection === 'down' ? -distanceScrolled : distanceScrolled;
+                }
+            }
+            // make sure that wrapper will not be over scrolled
+            if (state.wrapperTopOffset > 0) state.wrapperTopOffset = 0;
+        } else {
+            // update wrapper "top" to be same as "aside" element
+            state.wrapperTopOffset = asideBounds.top;
         }
+
+        if (isWrapperBiggerThanViewport) {
+            state.footerFixed = false;
+        } else if (state.footerFixed) {
+            if (footerBounds.top < wrapperBounds.bottom - footerBounds.height) {
+                state.footerFixed = false;
+            }
+        } else if (footerBounds.bottom < viewportHeight) {
+            state.footerFixed = true;
+        }
+
+        state.prevScrollY = scrollY;
+        state.asideMinHeight = wrapperBounds.height;
+        state.wrapperBottomPadding = state.footerFixed ? footerBounds.height : 0;
+        // update wrapper "left" position
+        state.wrapperLeftOffset = scrollX > 0 ? -scrollX : asideBounds.left;
+
+        this.setState(state);
     }
 
     render() {
         return (
             <AsideWrapper
-                innerRef={(node) => { this.aside = node; }}
+                footerFixed={this.state.footerFixed}
+                minHeight={this.state.asideMinHeight}
+                innerRef={this.asideRefCallback}
                 onScroll={this.handleScroll}
                 onTouchStart={this.handleScroll}
                 onTouchMove={this.handleScroll}
                 onTouchEnd={this.handleScroll}
             >
                 <StickyContainerWrapper
-                    innerRef={(node) => { this.wrapper = node; }}
+                    paddingBottom={this.state.wrapperBottomPadding}
+                    top={this.state.wrapperTopOffset}
+                    left={this.state.wrapperLeftOffset}
+                    innerRef={this.wrapperRefCallback}
                 >
-                    {this.props.children}
+                    {React.Children.map(this.props.children, (child) => { // eslint-disable-line arrow-body-style
+                        return child.key === 'sticky-footer' ? React.cloneElement(child, {
+                            innerRef: this.footerRefCallback,
+                            position: this.state.footerFixed ? 'fixed' : 'relative',
+                        }) : child;
+                    })}
                 </StickyContainerWrapper>
             </AsideWrapper>
         );

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

@@ -1,4 +1,6 @@
-import React, { Component } from 'react';
+/* @flow */
+
+import * as React from 'react';
 import PropTypes from 'prop-types';
 import colors from 'config/colors';
 import Icon from 'components/Icon';
@@ -10,6 +12,7 @@ import AccountMenu from './components/AccountMenu';
 import CoinMenu from './components/CoinMenu';
 import DeviceMenu from './components/DeviceMenu';
 import StickyContainer from './components/StickyContainer';
+import type { Props } from './components/common';
 
 const Header = styled(DeviceHeader)`
     border-right: 1px solid ${colors.BACKGROUND};
@@ -25,8 +28,11 @@ const TransitionContentWrapper = styled.div`
     vertical-align: top;
 `;
 
-const Footer = styled.div`
-    position: relative;
+const Footer = styled.div.attrs({
+    style: ({ position }) => ({
+        position,
+    }),
+})`
     width: 320px;
     bottom: 0;
     background: ${colors.MAIN};
@@ -60,6 +66,13 @@ const A = styled.a`
     }
 `;
 
+type TransitionMenuProps = {
+    animationType: ?string;
+    children?: React.Node;
+}
+
+// TransitionMenu needs to dispatch window.resize event
+// in order to StickyContainer be recalculated
 const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGroup> => (
     <TransitionGroupWrapper component="div" className="transition-container">
         <CSSTransition
@@ -79,28 +92,27 @@ const TransitionMenu = (props: TransitionMenuProps): React$Element<TransitionGro
     </TransitionGroupWrapper>
 );
 
-class LeftNavigation extends Component {
-    constructor(props) {
+type State = {
+    animationType: ?string;
+    shouldRenderDeviceSelection: boolean;
+}
+
+class LeftNavigation extends React.PureComponent<Props, State> {
+    constructor(props: Props) {
         super(props);
+        const { location } = this.props.router;
+        const hasNetwork = location && location.state && location.state.network;
         this.state = {
-            animationType: null,
+            animationType: hasNetwork ? 'slide-left' : null,
             shouldRenderDeviceSelection: false,
         };
     }
 
-    componentDidMount() {
-        this.setState({
-            animationType: null,
-            shouldRenderDeviceSelection: false,
-        });
-    }
-
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: Props) {
         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;
+        const hasNetwork = nextProps.router.location.state && nextProps.router.location.state.network;
+        const deviceReady = selectedDevice && selectedDevice.features && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
         if (deviceDropdownOpened) {
             this.setState({ shouldRenderDeviceSelection: true });
@@ -119,10 +131,11 @@ class LeftNavigation extends Component {
 
     shouldRenderAccounts() {
         const { selectedDevice } = this.props.wallet;
+        const { location } = this.props.router;
         return selectedDevice
-            && this.props.location
-            && this.props.location.state
-            && this.props.location.state.network
+            && location
+            && location.state
+            && location.state.network
             && !this.state.shouldRenderDeviceSelection
             && this.state.animationType === 'slide-left';
     }
@@ -132,7 +145,7 @@ class LeftNavigation extends Component {
     }
 
     shouldRenderCoins() {
-        return !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-right';
+        return !this.state.shouldRenderDeviceSelection && this.state.animationType !== 'slide-left';
     }
 
     render() {
@@ -154,7 +167,7 @@ class LeftNavigation extends Component {
 
         return (
             <StickyContainer
-                location={this.props.location.pathname}
+                location={this.props.router.location.pathname}
                 deviceSelection={this.props.deviceDropdownOpened}
             >
                 <Header
@@ -169,7 +182,7 @@ class LeftNavigation extends Component {
                     {this.state.shouldRenderDeviceSelection && <DeviceMenu {...this.props} />}
                     {menu}
                 </Body>
-                <Footer className="sticky-bottom">
+                <Footer key="sticky-footer">
                     <Help>
                         <A
                             href="https://trezor.io/support/"
@@ -186,9 +199,18 @@ class LeftNavigation extends Component {
 }
 
 LeftNavigation.propTypes = {
-    selectedDevice: PropTypes.object,
-    wallet: PropTypes.object,
+    connect: PropTypes.object,
+    accounts: PropTypes.array,
+    router: PropTypes.object,
     deviceDropdownOpened: PropTypes.bool,
+    fiat: PropTypes.array,
+    localStorage: PropTypes.object,
+    discovery: PropTypes.array,
+    wallet: PropTypes.object,
+    devices: PropTypes.array,
+    pending: PropTypes.array,
+
+    toggleDeviceDropdown: PropTypes.func,
 };
 
 

src/views/Wallet/index.js

@@ -12,13 +12,15 @@ import type { State } from 'flowtype';
 import Header from 'components/Header';
 import Footer from 'components/Footer';
 import ModalContainer from 'components/modals';
-import Notifications from 'components/Notification';
+import ContextNotifications from 'components/notifications/Context';
+
 import Log from 'components/Log';
 
 import LeftNavigation from './components/LeftNavigation/Container';
 import TopNavigationAccount from './components/TopNavigationAccount';
 import TopNavigationDeviceSettings from './components/TopNavigationDeviceSettings';
 
+
 type WalletContainerProps = {
     wallet: $ElementType<State, 'wallet'>,
     children?: React.Node
@@ -30,7 +32,7 @@ type WalletContainerProps = {
 
 const AppWrapper = styled.div`
     position: relative;
-    min-height: 100vh;
+    min-height: 100%;
     min-width: 720px;
     display: flex;
     flex-direction: column;
@@ -89,7 +91,7 @@ const Wallet = (props: WalletContainerProps) => (
                     <Route path="/device/:device/network/:network/account/:account" component={TopNavigationAccount} />
                     <Route path="/device/:device/device-settings" component={TopNavigationDeviceSettings} />
                 </Navigation>
-                <Notifications />
+                <ContextNotifications />
                 <Log />
                 <Body>
                     { props.children }

src/views/Wallet/views/Account/Send/components/AdvancedForm/index.js

@@ -13,6 +13,11 @@ import ICONS from 'config/icons';
 
 import type { Props } from '../../Container';
 
+// TODO: Decide on a small screen width for the whole app
+// and put it inside config/variables.js
+// same variable also in "AccountSend/index.js"
+const SmallScreenWidth = '850px';
+
 const InputRow = styled.div`
     margin-bottom: 20px;
 `;
@@ -38,17 +43,29 @@ const AdvancedSettingsWrapper = styled.div`
 const GasInputRow = styled(InputRow)`
     width: 100%;
     display: flex;
+
+    @media screen and (max-width: ${SmallScreenWidth}) {
+        flex-direction: column;
+    }
 `;
 
 const GasInput = styled(Input)`
+    min-height: 85px;
     &:first-child {
         padding-right: 20px;
     }
+
+    @media screen and (max-width: ${SmallScreenWidth}) {
+        &:first-child {
+            padding-right: 0;
+            margin-bottom: 2px;
+        }
+    }
 `;
 
 const StyledTextarea = styled(Textarea)`
     margin-bottom: 20px;
-    height: 80px;
+    min-height: 80px;
 `;
 
 const AdvancedSettingsSendButtonWrapper = styled.div`
@@ -79,6 +96,17 @@ const getGasPriceInputState = (gasPriceErrors: string, gasPriceWarnings: string)
     return state;
 };
 
+const getDataTextareaState = (dataError: string, dataWarning: string): string => {
+    let state = '';
+    if (dataWarning) {
+        state = 'warning';
+    }
+    if (dataError) {
+        state = 'error';
+    }
+    return state;
+};
+
 // stateless component
 const AdvancedForm = (props: Props) => {
     const {
@@ -89,6 +117,7 @@ const AdvancedForm = (props: Props) => {
         networkSymbol,
         currency,
         recommendedGasPrice,
+        calculatingGasLimit,
         errors,
         warnings,
         infos,
@@ -127,12 +156,13 @@ const AdvancedForm = (props: Props) => {
                             <Tooltip
                                 content={(
                                     <React.Fragment>
-                                        Gas limit is the amount of gas to send with your transaction.<br />
-                                        <GreenSpan>TX fee = gas price * gas limit</GreenSpan> &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 <GreenSpan>{gasLimitTooltipValue}</GreenSpan>
+                                        Gas limit refers to the maximum amount of gas user is willing to spendon a particular transaction.{' '}
+                                        <GreenSpan>Transaction fee = gas limit * gas price</GreenSpan>.{' '}Increasing the gas limit will not get the transaction confirmed sooner.
+                                        Default value for sending {gasLimitTooltipCurrency} is <GreenSpan>{gasLimitTooltipValue}</GreenSpan>.
                                     </React.Fragment>
                                 )}
+                                maxWidth={410}
+                                readMoreLink="https://wiki.trezor.io/Ethereum_Wallet#Gas_limit"
                                 placement="top"
                             >
                                 <Icon
@@ -143,7 +173,7 @@ const AdvancedForm = (props: Props) => {
                             </Tooltip>
                         </InputLabelWrapper>
                     )}
-                    bottomText={errors.gasLimit || warnings.gasLimit || infos.gasLimit}
+                    bottomText={errors.gasLimit || warnings.gasLimit || infos.gasLimit || (calculatingGasLimit ? 'Calculating...' : '')}
                     value={gasLimit}
                     isDisabled={networkSymbol === currency && data.length > 0}
                     onChange={event => onGasLimitChange(event.target.value)}
@@ -161,12 +191,13 @@ const AdvancedForm = (props: Props) => {
                             <Tooltip
                                 content={(
                                     <React.Fragment>
-                                        Gas Price is the amount you pay per unit of gas.<br />
-                                        <GreenSpan>TX fee = gas price * gas limit</GreenSpan> &amp; is paid to miners for including your TX in a block.<br />
-                                        Higher the gas price = faster transaction, but more expensive. Recommended is <GreenSpan>{recommendedGasPrice} GWEI.</GreenSpan><br />
-                                        <Link href="https://myetherwallet.github.io/knowledge-base/gas/what-is-gas-ethereum.html" target="_blank" rel="noreferrer noopener" isGreen>Read more</Link>
+                                        Gas price refers to the amount of ether you are willing to pay for every
+                                        unit of gas, and is usually measured in “Gwei”. <GreenSpan>Transaction fee = gas limit * gas price</GreenSpan>. Increasing the gas price will get the transaction confirmed sooner but
+                                        makes it more expensive. The recommended gas price is <GreenSpan>{recommendedGasPrice} GWEI</GreenSpan>.
                                     </React.Fragment>
                                 )}
+                                maxWidth={400}
+                                readMoreLink="https://wiki.trezor.io/Ethereum_Wallet#Gas_price"
                                 placement="top"
                             >
                                 <Icon
@@ -203,8 +234,9 @@ const AdvancedForm = (props: Props) => {
                         </Tooltip>
                     </InputLabelWrapper>
                 )}
+                state={getDataTextareaState(errors.data, warnings.data)}
                 bottomText={errors.data || warnings.data || infos.data}
-                disabled={networkSymbol !== currency}
+                isDisabled={networkSymbol !== currency}
                 value={networkSymbol !== currency ? '' : data}
                 onChange={event => onDataChange(event.target.value)}
             />

src/views/Wallet/views/Acquire/index.js

@@ -46,7 +46,7 @@ const Acquire = (props: Props) => {
 
 export default connect(
     (state: State) => ({
-        acquiring: state.connect.acquiring,
+        acquiring: state.connect.acquiringDevice,
     }),
     (dispatch: Dispatch) => ({
         acquireDevice: bindActionCreators(TrezorConnectActions.acquire, dispatch),

src/views/Wallet/views/UnreadableDevice/index.js

@@ -1,14 +1,8 @@
 /* @flow */
 
-
 import React from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { Notification } from 'components/Notification';
-import * as TrezorConnectActions from 'actions/TrezorConnectActions';
-
-import type { State, Dispatch } from 'flowtype';
 
 const Wrapper = styled.div``;
 
@@ -23,11 +17,4 @@ const UnreadableDevice = () => (
     </Wrapper>
 );
 
-export default connect(
-    (state: State) => ({
-        acquiring: state.connect.acquiring,
-    }),
-    (dispatch: Dispatch) => ({
-        acquireDevice: bindActionCreators(TrezorConnectActions.acquire, dispatch),
-    }),
-)(UnreadableDevice);
+export default UnreadableDevice;

webpack/dev.babel.js

@@ -25,6 +25,7 @@ module.exports = {
         path: BUILD,
     },
     devServer: {
+        // host: '0.0.0.0',
         contentBase: [
             SRC,
             PUBLIC,

yarn.lock

@@ -9816,15 +9816,14 @@ 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"
+styled-components@^3.4.9:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.4.9.tgz#519abeb351b37be5b7de6a15ff9e4efeb9d772da"
   dependencies:
     buffer "^5.0.3"
     css-to-react-native "^2.0.3"
     fbjs "^0.8.16"
     hoist-non-react-statics "^2.5.0"
-    is-plain-object "^2.0.1"
     prop-types "^15.5.4"
     react-is "^16.3.1"
     stylis "^3.5.0"