Merge branch 'styled-components-refactor' of https://github.com/satoshilabs/trezor-wallet into styled-components-refactor

src/js/components/Log/index.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import * as LogActions from 'actions/LogActions';
 import type { State, Dispatch } from 'flowtype';

src/js/components/Notification/index.js

@@ -2,14 +2,14 @@
 
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as NOTIFICATION from 'actions/constants/notification';
 import * as NotificationActions from 'actions/NotificationActions';
 import type { Action, State, Dispatch } from 'flowtype';
-import Loader from './LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 type Props = {
     notifications: $ElementType<State, 'notifications'>,

src/js/components/modal/RememberDevice.js

@@ -2,7 +2,7 @@
 
 
 import React, { Component } from 'react';
-import Loader from '../common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 import type { Props } from './index';
 

src/js/components/wallet/pages/Acquire.js

@@ -2,7 +2,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
 import type { State, Dispatch } from 'flowtype';

src/js/components/wallet/pages/Bootloader.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 

src/js/components/wallet/pages/Dashboard.js

@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
 
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import DashboardImg from 'images/dashboard.png';
 
 const Wrapper = styled.div`

src/js/components/wallet/pages/DeviceSettings.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
-import Icon from 'components/common/Icon';
+import { H2 } from 'components/Heading';
+import Icon from 'components/Icon';
 import colors from 'config/colors';
-import Button from 'components/common/Button';
+import Button from 'components/Button';
 import ICONS from 'config/icons';
 import { connect } from 'react-redux';
 

src/js/components/wallet/pages/Initialize.js

@@ -1,5 +1,5 @@
 /* @flow */
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

src/js/components/wallet/pages/UnreadableDevice.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
 import type { State, Dispatch } from 'flowtype';

src/js/views/Landing/components/ConnectDevice.js

@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import type { State, TrezorDevice } from 'flowtype';
 

src/js/views/Landing/components/Preloader.js

@@ -2,7 +2,7 @@
 
 
 import React from 'react';
-import Loader from 'components/common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 export default (props: {}): React$Element<string> => (
     <section className="landing">

src/js/views/Landing/index.js

@@ -1,11 +1,11 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
-import Header from 'components/common/Header';
-import Footer from 'components/common/Footer';
-import Log from 'components/common/Log';
-import Notifications, { Notification } from 'components/common/Notification';
+import { H2 } from 'components/Heading';
+import Header from 'components/Header';
+import Footer from 'components/Footer';
+import Log from 'components/Log';
+import Notifications, { Notification } from 'components/Notification';
 
 import Preloader from './components/Preloader';
 import ConnectDevice from './components/ConnectDevice';

src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js

@@ -1,7 +1,7 @@
 /* @flow */
 import BigNumber from 'bignumber.js';
 import colors from 'config/colors';
-import Loader from 'components/common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 import PropTypes from 'prop-types';
 import React from 'react';
 import styled, { css } from 'styled-components';

src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js

@@ -1,7 +1,7 @@
 /* @flow */
 import coins from 'constants/coins';
 import colors from 'config/colors';
-import Icon from 'components/common/Icon';
+import Icon from 'components/Icon';
 import ICONS from 'config/icons';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';

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

@@ -1,12 +1,12 @@
 /* @flow */
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import Tooltip from 'rc-tooltip';
 import { QRCode } from 'react-qr-svg';
 
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import SelectedAccount from '../SelectedAccount';
 
 import type { Props } from './index';

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

@@ -2,7 +2,7 @@
 
 
 import * as React from 'react';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 
 import type {
     State, TrezorDevice, Action, ThunkAction,

src/js/views/Wallet/components/Send/components/PendingTransactions.js

@@ -3,7 +3,7 @@
 
 import React from 'react';
 import ColorHash from 'color-hash';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import ScaleText from 'react-scale-text';
 
 import { findAccountTokens } from 'reducers/TokensReducer';

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

@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import Select from 'react-select';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { calculate, validation } from 'actions/SendFormActions';
 import type { Token } from 'flowtype';
 import AdvancedForm from './components/AdvancedForm';

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import colors from 'config/colors';
 
 const Wrapper = styled.div`

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

@@ -1,13 +1,13 @@
 /* @flow */
 import styled from 'styled-components';
 import React, { Component } from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import BigNumber from 'bignumber.js';
 import { Async as AsyncSelect } from 'react-select';
 import Tooltip from 'rc-tooltip';
 
 import { resolveAfter } from 'utils/promiseUtils';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as stateUtils from 'reducers/utils';
 import type { NetworkToken } from 'reducers/LocalStorageReducer';
 import SelectedAccount from '../SelectedAccount';

src/js/views/Wallet/index.js

@@ -7,12 +7,12 @@ import { Route, withRouter } from 'react-router-dom';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
-import Header from 'components/common/Header';
-import Footer from 'components/common/Footer';
+import Header from 'components/Header';
+import Footer from 'components/Footer';
 import DeviceSettingsTabs from 'components/wallet/pages/DeviceSettingsTabs';
 import ModalContainer from 'components/modal';
-import Notifications from 'components/common/Notification';
-import Log from 'components/common/Log';
+import Notifications from 'components/Notification';
+import Log from 'components/Log';
 
 import LeftNavigation from './components/LeftNavigation/Container';
 import AccountTabs from './components/Tabs';

src/js/views/index.js

@@ -6,7 +6,7 @@ import { ConnectedRouter } from 'react-router-redux';
 
 import ErrorBoundary from 'support/ErrorBoundary';
 
-import WalletContainer from 'views/Device';
+import WalletContainer from 'views/Wallet';
 import BootloaderContainer from 'components/wallet/pages/Bootloader';
 import InitializeContainer from 'components/wallet/pages/Initialize';
 import AcquireContainer from 'components/wallet/pages/Acquire';
@@ -18,10 +18,10 @@ import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
 import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
 import LandingContainer from 'views/Landing/Container';
 
-import SignVerifyContainer from './Device/components/Sign';
-import ReceiveContainer from './Device/components/Receive/Container';
-import SendFormContainer from './Device/components/Send/Container';
-import SummaryContainer from './Device/components/Summary/Container';
+import SignVerifyContainer from './Wallet/components/Sign';
+import ReceiveContainer from './Wallet/components/Receive/Container';
+import SendFormContainer from './Wallet/components/Send/Container';
+import SummaryContainer from './Wallet/components/Summary/Container';
 
 import store, { history } from '../store';