From be0c9365170cc502330fba4f7df0bf85292b8c8d Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Fri, 18 May 2018 18:54:21 +0200 Subject: [PATCH] flowtype moved level up. to ./src directory --- .flowconfig | 21 ++++++------ src/{js => }/flowtype/css.js | 0 src/{js => }/flowtype/index.js | 34 +++++++++---------- .../flowtype => flowtype/npm}/bignumber.js | 0 .../npm}/ethereum-types.js | 0 .../npm}/react-redux_v5.x.x.js | 0 .../npm}/react-router-dom_v4.x.x.js | 0 .../npm}/react-router-redux.js | 0 .../npm}/react-router_v4.x.x.js | 0 .../flowtype => flowtype/npm}/redux_v3.x.x.js | 0 src/{js/flowtype => flowtype/npm}/web3.js | 0 src/{js => }/flowtype/trezor-connect.js | 0 src/js/actions/AbstractAccountActions.js | 2 +- src/js/actions/AccountsActions.js | 2 +- src/js/actions/DiscoveryActions.js | 2 +- src/js/actions/LocalStorageActions.js | 2 +- src/js/actions/LogActions.js | 2 +- src/js/actions/ModalActions.js | 2 +- src/js/actions/NotificationActions.js | 2 +- src/js/actions/ReceiveActions.js | 2 +- src/js/actions/SendFormActions.js | 2 +- src/js/actions/SummaryActions.js | 2 +- src/js/actions/TokenActions.js | 2 +- src/js/actions/TrezorConnectActions.js | 2 +- src/js/actions/WalletActions.js | 2 +- src/js/actions/Web3Actions.js | 2 +- src/js/components/common/Footer.js | 2 +- src/js/components/common/Log.js | 2 +- src/js/components/common/Notification.js | 2 +- src/js/components/landing/ConnectDevice.js | 2 +- src/js/components/landing/index.js | 2 +- src/js/components/modal/index.js | 2 +- .../wallet/account/AbstractAccount.js | 2 +- .../wallet/account/receive/index.js | 2 +- .../components/wallet/account/send/index.js | 2 +- .../wallet/account/summary/Summary.js | 2 +- .../wallet/account/summary/index.js | 2 +- .../wallet/aside/AccountSelection.js | 2 +- src/js/components/wallet/aside/Aside.js | 2 +- .../components/wallet/aside/CoinSelection.js | 2 +- .../wallet/aside/DeviceSelection.js | 2 +- src/js/components/wallet/aside/index.js | 2 +- src/js/components/wallet/index.js | 2 +- src/js/components/wallet/pages/Acquire.js | 2 +- src/js/reducers/AbstractAccountReducer.js | 2 +- src/js/reducers/AccountsReducer.js | 2 +- src/js/reducers/DiscoveryReducer.js | 2 +- src/js/reducers/FiatRateReducer.js | 2 +- src/js/reducers/LocalStorageReducer.js | 2 +- src/js/reducers/LogReducer.js | 2 +- src/js/reducers/ModalReducer.js | 2 +- src/js/reducers/NotificationReducer.js | 2 +- src/js/reducers/PendingTxReducer.js | 2 +- src/js/reducers/ReceiveReducer.js | 2 +- src/js/reducers/SendFormReducer.js | 2 +- src/js/reducers/SummaryReducer.js | 2 +- src/js/reducers/TokensReducer.js | 2 +- src/js/reducers/TrezorConnectReducer.js | 2 +- src/js/reducers/WalletReducer.js | 2 +- src/js/reducers/Web3Reducer.js | 2 +- src/js/services/CoinmarketcapService.js | 2 +- src/js/services/LocalStorageService.js | 4 +-- src/js/services/LogService.js | 2 +- src/js/services/RouterService.js | 2 +- src/js/services/SessionStorageService.js | 4 +-- src/js/services/TrezorConnectService.js | 2 +- src/js/store/index.js | 2 +- 67 files changed, 85 insertions(+), 84 deletions(-) rename src/{js => }/flowtype/css.js (100%) rename src/{js => }/flowtype/index.js (69%) rename src/{js/flowtype => flowtype/npm}/bignumber.js (100%) rename src/{js/flowtype => flowtype/npm}/ethereum-types.js (100%) rename src/{js/flowtype => flowtype/npm}/react-redux_v5.x.x.js (100%) rename src/{js/flowtype => flowtype/npm}/react-router-dom_v4.x.x.js (100%) rename src/{js/flowtype => flowtype/npm}/react-router-redux.js (100%) rename src/{js/flowtype => flowtype/npm}/react-router_v4.x.x.js (100%) rename src/{js/flowtype => flowtype/npm}/redux_v3.x.x.js (100%) rename src/{js/flowtype => flowtype/npm}/web3.js (100%) rename src/{js => }/flowtype/trezor-connect.js (100%) diff --git a/.flowconfig b/.flowconfig index 3d2c87d5..0f497fc2 100644 --- a/.flowconfig +++ b/.flowconfig @@ -10,16 +10,17 @@ .*/src/solidity/.* [libs] -./src/js/flowtype/redux_v3.x.x.js -./src/js/flowtype/react-redux_v5.x.x.js -./src/js/flowtype/react-router_v4.x.x.js -./src/js/flowtype/react-router-dom_v4.x.x.js -./src/js/flowtype/react-router-redux.js -./src/js/flowtype/css.js -./src/js/flowtype/trezor-connect.js -./src/js/flowtype/bignumber.js -./src/js/flowtype/ethereum-types.js -./src/js/flowtype/web3.js +./src/flowtype/npm/redux_v3.x.x.js +./src/flowtype/npm/react-redux_v5.x.x.js +./src/flowtype/npm/react-router_v4.x.x.js +./src/flowtype/npm/react-router-dom_v4.x.x.js +./src/flowtype/npm/react-router-redux.js +./src/flowtype/npm/bignumber.js +./src/flowtype/npm/ethereum-types.js +./src/flowtype/npm/web3.js +./src/flowtype/css.js +./src/flowtype/trezor-connect.js + [options] diff --git a/src/js/flowtype/css.js b/src/flowtype/css.js similarity index 100% rename from src/js/flowtype/css.js rename to src/flowtype/css.js diff --git a/src/js/flowtype/index.js b/src/flowtype/index.js similarity index 69% rename from src/js/flowtype/index.js rename to src/flowtype/index.js index 8a914a62..e6254d7e 100644 --- a/src/js/flowtype/index.js +++ b/src/flowtype/index.js @@ -12,25 +12,25 @@ import type { PlainDispatch as ReduxPlainDispatch } from 'redux'; -import type { Reducers, ReducersState } from '../reducers'; +import type { Reducers, ReducersState } from '~/js/reducers'; // Actions -import type { AbstractAccountAction } from '../actions/AbstractAccountActions'; -import type { AccountAction } from '../actions/AccountsActions'; -import type { DiscoveryAction } from '../actions/DiscoveryActions'; -import type { StorageAction } from '../actions/LocalStorageActions'; -import type { LogAction } from '../actions/LogActions'; -import type { ModalAction } from '../actions/ModalActions'; -import type { NotificationAction } from '../actions/NotificationActions'; -import type { PendingTxAction } from '../actions/PendingTxActions'; -import type { ReceiveAction } from '../actions/ReceiveActions'; -import type { SendFormAction } from '../actions/SendFormActions'; -import type { SummaryAction } from '../actions/SummaryActions'; -import type { TokenAction } from '../actions/TokenActions'; -import type { TrezorConnectAction } from '../actions/TrezorConnectActions'; -import type { WalletAction } from '../actions/WalletActions'; -import type { Web3Action } from '../actions/Web3Actions'; -import type { FiatRateAction } from '../services/CoinmarketcapService'; // this service has no action file, all is written inside one file +import type { AbstractAccountAction } from '~/js/actions/AbstractAccountActions'; +import type { AccountAction } from '~/js/actions/AccountsActions'; +import type { DiscoveryAction } from '~/js/actions/DiscoveryActions'; +import type { StorageAction } from '~/js/actions/LocalStorageActions'; +import type { LogAction } from '~/js/actions/LogActions'; +import type { ModalAction } from '~/js/actions/ModalActions'; +import type { NotificationAction } from '~/js/actions/NotificationActions'; +import type { PendingTxAction } from '~/js/actions/PendingTxActions'; +import type { ReceiveAction } from '~/js/actions/ReceiveActions'; +import type { SendFormAction } from '~/js/actions/SendFormActions'; +import type { SummaryAction } from '~/js/actions/SummaryActions'; +import type { TokenAction } from '~/js/actions/TokenActions'; +import type { TrezorConnectAction } from '~/js/actions/TrezorConnectActions'; +import type { WalletAction } from '~/js/actions/WalletActions'; +import type { Web3Action } from '~/js/actions/Web3Actions'; +import type { FiatRateAction } from '~/js/services/CoinmarketcapService'; // this service has no action file, all is written inside one file import type { Device, diff --git a/src/js/flowtype/bignumber.js b/src/flowtype/npm/bignumber.js similarity index 100% rename from src/js/flowtype/bignumber.js rename to src/flowtype/npm/bignumber.js diff --git a/src/js/flowtype/ethereum-types.js b/src/flowtype/npm/ethereum-types.js similarity index 100% rename from src/js/flowtype/ethereum-types.js rename to src/flowtype/npm/ethereum-types.js diff --git a/src/js/flowtype/react-redux_v5.x.x.js b/src/flowtype/npm/react-redux_v5.x.x.js similarity index 100% rename from src/js/flowtype/react-redux_v5.x.x.js rename to src/flowtype/npm/react-redux_v5.x.x.js diff --git a/src/js/flowtype/react-router-dom_v4.x.x.js b/src/flowtype/npm/react-router-dom_v4.x.x.js similarity index 100% rename from src/js/flowtype/react-router-dom_v4.x.x.js rename to src/flowtype/npm/react-router-dom_v4.x.x.js diff --git a/src/js/flowtype/react-router-redux.js b/src/flowtype/npm/react-router-redux.js similarity index 100% rename from src/js/flowtype/react-router-redux.js rename to src/flowtype/npm/react-router-redux.js diff --git a/src/js/flowtype/react-router_v4.x.x.js b/src/flowtype/npm/react-router_v4.x.x.js similarity index 100% rename from src/js/flowtype/react-router_v4.x.x.js rename to src/flowtype/npm/react-router_v4.x.x.js diff --git a/src/js/flowtype/redux_v3.x.x.js b/src/flowtype/npm/redux_v3.x.x.js similarity index 100% rename from src/js/flowtype/redux_v3.x.x.js rename to src/flowtype/npm/redux_v3.x.x.js diff --git a/src/js/flowtype/web3.js b/src/flowtype/npm/web3.js similarity index 100% rename from src/js/flowtype/web3.js rename to src/flowtype/npm/web3.js diff --git a/src/js/flowtype/trezor-connect.js b/src/flowtype/trezor-connect.js similarity index 100% rename from src/js/flowtype/trezor-connect.js rename to src/flowtype/trezor-connect.js diff --git a/src/js/actions/AbstractAccountActions.js b/src/js/actions/AbstractAccountActions.js index f00ff6bf..c6d7d2e1 100644 --- a/src/js/actions/AbstractAccountActions.js +++ b/src/js/actions/AbstractAccountActions.js @@ -6,7 +6,7 @@ import * as ACCOUNT from './constants/account'; import { initialState } from '../reducers/AbstractAccountReducer'; import { findSelectedDevice } from '../reducers/TrezorConnectReducer'; -import type { AsyncAction, ThunkAction, Action, GetState, Dispatch, TrezorDevice } from '../flowtype'; +import type { AsyncAction, ThunkAction, Action, GetState, Dispatch, TrezorDevice } from '~/flowtype'; import type { State } from '../reducers/AbstractAccountReducer'; import type { Coin } from '../reducers/LocalStorageReducer'; diff --git a/src/js/actions/AccountsActions.js b/src/js/actions/AccountsActions.js index e8772397..74b8a99e 100644 --- a/src/js/actions/AccountsActions.js +++ b/src/js/actions/AccountsActions.js @@ -2,7 +2,7 @@ 'use strict'; import * as ACCOUNT from './constants/account'; -import type { Action, TrezorDevice } from '../flowtype'; +import type { Action, TrezorDevice } from '~/flowtype'; import type { State } from '../reducers/AccountsReducer'; export type AccountAction = diff --git a/src/js/actions/DiscoveryActions.js b/src/js/actions/DiscoveryActions.js index 8a5d26bc..dacff461 100644 --- a/src/js/actions/DiscoveryActions.js +++ b/src/js/actions/DiscoveryActions.js @@ -14,7 +14,7 @@ import EthereumjsUtil from 'ethereumjs-util'; import { getNonceAsync, getBalanceAsync, getTokenBalanceAsync } from './Web3Actions'; import { setBalance as setTokenBalance } from './TokenActions'; -import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice } from '../flowtype'; +import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice } from '~/flowtype'; import type { Discovery, State } from '../reducers/DiscoveryReducer'; export type DiscoveryAction = { diff --git a/src/js/actions/LocalStorageActions.js b/src/js/actions/LocalStorageActions.js index a6809c0f..b84f0582 100644 --- a/src/js/actions/LocalStorageActions.js +++ b/src/js/actions/LocalStorageActions.js @@ -9,7 +9,7 @@ import * as STORAGE from './constants/localStorage'; import * as PENDING from '../actions/constants/pendingTx'; import { JSONRequest, httpRequest } from '../utils/networkUtils'; -import type { ThunkAction, AsyncAction, GetState, Dispatch, TrezorDevice } from '../flowtype'; +import type { ThunkAction, AsyncAction, GetState, Dispatch, TrezorDevice } from '~/flowtype'; import type { Config, Coin, TokensCollection } from '../reducers/LocalStorageReducer'; import AppConfigJSON from '~/data/appConfig.json'; diff --git a/src/js/actions/LogActions.js b/src/js/actions/LogActions.js index 9409c5ca..d645fe9d 100644 --- a/src/js/actions/LogActions.js +++ b/src/js/actions/LogActions.js @@ -3,7 +3,7 @@ import * as LOG from './constants/log'; -import type { Action, ThunkAction, GetState, Dispatch } from '../flowtype'; +import type { Action, ThunkAction, GetState, Dispatch } from '~/flowtype'; import type { LogEntry } from '../reducers/LogReducer'; export type LogAction = { diff --git a/src/js/actions/ModalActions.js b/src/js/actions/ModalActions.js index 662fed47..c51974fa 100644 --- a/src/js/actions/ModalActions.js +++ b/src/js/actions/ModalActions.js @@ -5,7 +5,7 @@ import TrezorConnect, { UI, UI_EVENT } from 'trezor-connect'; import * as MODAL from './constants/modal'; import * as CONNECT from './constants/TrezorConnect'; -import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice } from '../flowtype'; +import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice } from '~/flowtype'; import type { State } from '../reducers/ModalReducer'; export type ModalAction = { diff --git a/src/js/actions/NotificationActions.js b/src/js/actions/NotificationActions.js index 39a219ab..e199cd14 100644 --- a/src/js/actions/NotificationActions.js +++ b/src/js/actions/NotificationActions.js @@ -3,7 +3,7 @@ import * as NOTIFICATION from './constants/notification'; -import type { Action, AsyncAction, GetState, Dispatch, RouterLocationState } from '../flowtype'; +import type { Action, AsyncAction, GetState, Dispatch, RouterLocationState } from '~/flowtype'; import type { CallbackAction } from '../reducers/NotificationReducer'; export type NotificationAction = { diff --git a/src/js/actions/ReceiveActions.js b/src/js/actions/ReceiveActions.js index 489f9edf..4fc18428 100644 --- a/src/js/actions/ReceiveActions.js +++ b/src/js/actions/ReceiveActions.js @@ -9,7 +9,7 @@ import { initialState } from '../reducers/ReceiveReducer'; import type { State } from '../reducers/ReceiveReducer'; import { findSelectedDevice } from '../reducers/TrezorConnectReducer'; -import type { TrezorDevice, ThunkAction, AsyncAction, Action, GetState, Dispatch } from '../flowtype'; +import type { TrezorDevice, ThunkAction, AsyncAction, Action, GetState, Dispatch } from '~/flowtype'; export type ReceiveAction = { type: typeof RECEIVE.INIT, diff --git a/src/js/actions/SendFormActions.js b/src/js/actions/SendFormActions.js index 0d255d6d..e3c9645c 100644 --- a/src/js/actions/SendFormActions.js +++ b/src/js/actions/SendFormActions.js @@ -27,7 +27,7 @@ import type { AsyncAction, RouterLocationState, TrezorDevice -} from '../flowtype'; +} from '~/flowtype'; import type { State as AccountState } from '../reducers/AbstractAccountReducer'; import type { Web3Instance } from '../reducers/Web3Reducer'; import type { Config, Coin } from '../reducers/LocalStorageReducer'; diff --git a/src/js/actions/SummaryActions.js b/src/js/actions/SummaryActions.js index c9352352..486723bb 100644 --- a/src/js/actions/SummaryActions.js +++ b/src/js/actions/SummaryActions.js @@ -8,7 +8,7 @@ import { resolveAfter } from '../utils/promiseUtils'; import { initialState } from '../reducers/SummaryReducer'; import { findSelectedDevice } from '../reducers/TrezorConnectReducer'; -import type { ThunkAction, AsyncAction, Action, GetState, Dispatch } from '../flowtype'; +import type { ThunkAction, AsyncAction, Action, GetState, Dispatch } from '~/flowtype'; import type { State } from '../reducers/SummaryReducer'; import type { Token } from '../reducers/TokensReducer'; diff --git a/src/js/actions/TokenActions.js b/src/js/actions/TokenActions.js index 76f22a2a..c6f37d9f 100644 --- a/src/js/actions/TokenActions.js +++ b/src/js/actions/TokenActions.js @@ -4,7 +4,7 @@ import * as TOKEN from './constants/token'; import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions'; -import type { GetState, AsyncAction, Action, Dispatch } from '../flowtype'; +import type { GetState, AsyncAction, Action, Dispatch } from '~/flowtype'; import type { State, Token } from '../reducers/TokensReducer'; import type { Account } from '../reducers/AccountsReducer'; import type { NetworkToken } from '../reducers/LocalStorageReducer'; diff --git a/src/js/actions/TrezorConnectActions.js b/src/js/actions/TrezorConnectActions.js index 02c830ad..a9225ffd 100644 --- a/src/js/actions/TrezorConnectActions.js +++ b/src/js/actions/TrezorConnectActions.js @@ -32,7 +32,7 @@ import type { AsyncAction, TrezorDevice, RouterLocationState -} from '../flowtype'; +} from '~/flowtype'; export type TrezorConnectAction = { diff --git a/src/js/actions/WalletActions.js b/src/js/actions/WalletActions.js index b7aaf6d6..99bd2be3 100644 --- a/src/js/actions/WalletActions.js +++ b/src/js/actions/WalletActions.js @@ -3,7 +3,7 @@ import * as WALLET from './constants/wallet'; -import type { RouterLocationState, ThunkAction, Dispatch, GetState } from '../flowtype'; +import type { RouterLocationState, ThunkAction, Dispatch, GetState } from '~/flowtype'; export type WalletAction = { type: typeof WALLET.SET_INITIAL_URL, diff --git a/src/js/actions/Web3Actions.js b/src/js/actions/Web3Actions.js index 6ba3ff13..e6b28c9e 100644 --- a/src/js/actions/Web3Actions.js +++ b/src/js/actions/Web3Actions.js @@ -18,7 +18,7 @@ import type { GetState, Action, AsyncAction, -} from '../flowtype'; +} from '~/flowtype'; import type { ContractFactory, EstimateGasOptions } from 'web3'; import type BigNumber from 'bignumber.js'; diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js index 441319db..c32a6159 100644 --- a/src/js/components/common/Footer.js +++ b/src/js/components/common/Footer.js @@ -6,7 +6,7 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import * as LogActions from '~/js/actions/LogActions'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; type Props = { toggle: typeof LogActions.toggle diff --git a/src/js/components/common/Log.js b/src/js/components/common/Log.js index 83acda9c..dbfdc7a0 100644 --- a/src/js/components/common/Log.js +++ b/src/js/components/common/Log.js @@ -6,7 +6,7 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import * as LogActions from '~/js/actions/LogActions'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; type Props = { log: $ElementType, diff --git a/src/js/components/common/Notification.js b/src/js/components/common/Notification.js index 05cc3e3c..29d2b57d 100644 --- a/src/js/components/common/Notification.js +++ b/src/js/components/common/Notification.js @@ -7,7 +7,7 @@ import { connect } from 'react-redux'; import * as NOTIFICATION from '~/js/actions/constants/notification'; import * as NotificationActions from '~/js/actions/NotificationActions'; -import type { Action, State, Dispatch } from '~/js/flowtype'; +import type { Action, State, Dispatch } from '~/flowtype'; type Props = { notifications: $ElementType, diff --git a/src/js/components/landing/ConnectDevice.js b/src/js/components/landing/ConnectDevice.js index 177acb30..34ba6a2f 100644 --- a/src/js/components/landing/ConnectDevice.js +++ b/src/js/components/landing/ConnectDevice.js @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import TrezorConnect from 'trezor-connect'; -import type { State, TrezorDevice } from '~/js/flowtype'; +import type { State, TrezorDevice } from '~/flowtype'; type Props = { transport: $PropertyType<$ElementType, 'transport'>; diff --git a/src/js/components/landing/index.js b/src/js/components/landing/index.js index e1bbb9a4..d2812ad7 100644 --- a/src/js/components/landing/index.js +++ b/src/js/components/landing/index.js @@ -8,7 +8,7 @@ import { connect } from 'react-redux'; import LandingPage from './LandingPage'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; export type StateProps = { localStorage: $ElementType, diff --git a/src/js/components/modal/index.js b/src/js/components/modal/index.js index 2dc69948..78be82a5 100644 --- a/src/js/components/modal/index.js +++ b/src/js/components/modal/index.js @@ -27,7 +27,7 @@ import * as MODAL from '~/js/actions/constants/modal'; import * as CONNECT from '~/js/actions/constants/TrezorConnect'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; type OwnProps = { } diff --git a/src/js/components/wallet/account/AbstractAccount.js b/src/js/components/wallet/account/AbstractAccount.js index cacbe6ec..4920de0b 100644 --- a/src/js/components/wallet/account/AbstractAccount.js +++ b/src/js/components/wallet/account/AbstractAccount.js @@ -8,7 +8,7 @@ import { findDevice } from '~/js/reducers/TrezorConnectReducer'; // import * as AbstractAccountActions from '~/js/actions/AbstractAccountActions'; import { default as AbstractAccountActions } from '~/js/actions/AbstractAccountActions'; -import type { State, TrezorDevice, Action, ThunkAction } from '~/js/flowtype'; +import type { State, TrezorDevice, Action, ThunkAction } from '~/flowtype'; import type { Account } from '~/js/reducers/AccountsReducer'; import type { Discovery } from '~/js/reducers/DiscoveryReducer'; diff --git a/src/js/components/wallet/account/receive/index.js b/src/js/components/wallet/account/receive/index.js index 90ba15c2..f62400b0 100644 --- a/src/js/components/wallet/account/receive/index.js +++ b/src/js/components/wallet/account/receive/index.js @@ -11,7 +11,7 @@ import * as TokenActions from '~/js/actions/TokenActions'; import Receive from './Receive'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps diff --git a/src/js/components/wallet/account/send/index.js b/src/js/components/wallet/account/send/index.js index 45aa9945..f2755af4 100644 --- a/src/js/components/wallet/account/send/index.js +++ b/src/js/components/wallet/account/send/index.js @@ -10,7 +10,7 @@ import { default as AbstractAccountActions } from '~/js/actions/AbstractAccountA import SendForm from './SendForm'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../AbstractAccount'; type OwnProps = { } diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js index 705d95e1..461537a7 100644 --- a/src/js/components/wallet/account/summary/Summary.js +++ b/src/js/components/wallet/account/summary/Summary.js @@ -15,7 +15,7 @@ import SummaryTokens from './SummaryTokens.js'; import type { Props } from './index'; import type { AccountState } from '../AbstractAccount'; -import type { TrezorDevice } from '~/js/flowtype'; +import type { TrezorDevice } from '~/flowtype'; import type { NetworkToken } from '~/js/reducers/LocalStorageReducer'; import type { Account } from '~/js/reducers/AccountsReducer'; import type { Discovery } from '~/js/reducers/DiscoveryReducer'; diff --git a/src/js/components/wallet/account/summary/index.js b/src/js/components/wallet/account/summary/index.js index 76fefd97..aaaea19d 100644 --- a/src/js/components/wallet/account/summary/index.js +++ b/src/js/components/wallet/account/summary/index.js @@ -11,7 +11,7 @@ import * as SummaryActions from '~/js/actions/SummaryActions'; import * as TokenActions from '~/js/actions/TokenActions'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../AbstractAccount'; type OwnProps = { } diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js index 64f4e811..3e210302 100644 --- a/src/js/components/wallet/aside/AccountSelection.js +++ b/src/js/components/wallet/aside/AccountSelection.js @@ -11,7 +11,7 @@ import Loader from '~/js/components/common/LoaderCircle'; import Tooltip from 'rc-tooltip'; import type { Props } from './index'; -import type { TrezorDevice } from '~/js/flowtype'; +import type { TrezorDevice } from '~/flowtype'; const AccountSelection = (props: Props): ?React$Element => { diff --git a/src/js/components/wallet/aside/Aside.js b/src/js/components/wallet/aside/Aside.js index ddb548ab..78bda006 100644 --- a/src/js/components/wallet/aside/Aside.js +++ b/src/js/components/wallet/aside/Aside.js @@ -13,7 +13,7 @@ import StickyContainer from './StickyContainer'; import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; import type { Props } from './index'; -import type { TrezorDevice } from '~/js/flowtype'; +import type { TrezorDevice } from '~/flowtype'; type TransitionMenuProps = { diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js index a6f12fa0..d2d3114c 100644 --- a/src/js/components/wallet/aside/CoinSelection.js +++ b/src/js/components/wallet/aside/CoinSelection.js @@ -5,7 +5,7 @@ import React from 'react'; import { Link, NavLink } from 'react-router-dom'; import type { Props } from './index'; -import type { TrezorDevice } from '~/js/flowtype'; +import type { TrezorDevice } from '~/flowtype'; const CoinSelection = (props: Props): React$Element => { const { location } = props.router; diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js index 7285aa31..bc7d71f5 100644 --- a/src/js/components/wallet/aside/DeviceSelection.js +++ b/src/js/components/wallet/aside/DeviceSelection.js @@ -8,7 +8,7 @@ import TrezorConnect from 'trezor-connect'; import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; import type { Props } from './index'; -import type { TrezorDevice } from '~/js/flowtype'; +import type { TrezorDevice } from '~/flowtype'; export const DeviceSelect = (props: Props) => { diff --git a/src/js/components/wallet/aside/index.js b/src/js/components/wallet/aside/index.js index f5838230..a08a381c 100644 --- a/src/js/components/wallet/aside/index.js +++ b/src/js/components/wallet/aside/index.js @@ -12,7 +12,7 @@ import { toggleDeviceDropdown } from '~/js/actions/WalletActions'; import Aside from './Aside'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; type OwnProps = { diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js index 4c2f17c0..9dc701c0 100644 --- a/src/js/components/wallet/index.js +++ b/src/js/components/wallet/index.js @@ -16,7 +16,7 @@ import Notifications from '../common/Notification'; import Log from '../common/Log'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; type WalletContainerProps = { wallet: $ElementType, diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js index 4b337751..1412f3b1 100644 --- a/src/js/components/wallet/pages/Acquire.js +++ b/src/js/components/wallet/pages/Acquire.js @@ -7,7 +7,7 @@ import { connect } from 'react-redux'; import { Notification } from '~/js/components/common/Notification'; import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions'; -import type { State, Dispatch } from '~/js/flowtype'; +import type { State, Dispatch } from '~/flowtype'; type Props = { connect: $ElementType, acquireDevice: typeof TrezorConnectActions.acquire diff --git a/src/js/reducers/AbstractAccountReducer.js b/src/js/reducers/AbstractAccountReducer.js index 5c816696..a1e5ba92 100644 --- a/src/js/reducers/AbstractAccountReducer.js +++ b/src/js/reducers/AbstractAccountReducer.js @@ -4,7 +4,7 @@ import * as ACCOUNT from '../actions/constants/account'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; import type { Coin } from './LocalStorageReducer'; export type State = { diff --git a/src/js/reducers/AccountsReducer.js b/src/js/reducers/AccountsReducer.js index b9c3e4c2..4f255ee5 100644 --- a/src/js/reducers/AccountsReducer.js +++ b/src/js/reducers/AccountsReducer.js @@ -4,7 +4,7 @@ import * as CONNECT from '../actions/constants/TrezorConnect'; import * as ACCOUNT from '../actions/constants/account'; -import type { Action, TrezorDevice } from '../flowtype'; +import type { Action, TrezorDevice } from '~/flowtype'; import type { AccountCreateAction, AccountSetBalanceAction, diff --git a/src/js/reducers/DiscoveryReducer.js b/src/js/reducers/DiscoveryReducer.js index 53773cea..8fb0dd72 100644 --- a/src/js/reducers/DiscoveryReducer.js +++ b/src/js/reducers/DiscoveryReducer.js @@ -7,7 +7,7 @@ import * as DISCOVERY from '../actions/constants/discovery'; import * as ACCOUNT from '../actions/constants/account'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action, TrezorDevice } from '../flowtype'; +import type { Action, TrezorDevice } from '~/flowtype'; import type { DiscoveryStartAction, DiscoveryWaitingAction, diff --git a/src/js/reducers/FiatRateReducer.js b/src/js/reducers/FiatRateReducer.js index 8d99caed..e6fce27a 100644 --- a/src/js/reducers/FiatRateReducer.js +++ b/src/js/reducers/FiatRateReducer.js @@ -3,7 +3,7 @@ import { RATE_UPDATE } from '../services/CoinmarketcapService'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; import type { FiatRateAction } from '../services/CoinmarketcapService'; export type Fiat = { diff --git a/src/js/reducers/LocalStorageReducer.js b/src/js/reducers/LocalStorageReducer.js index e7e6b133..2f8df178 100644 --- a/src/js/reducers/LocalStorageReducer.js +++ b/src/js/reducers/LocalStorageReducer.js @@ -3,7 +3,7 @@ import * as STORAGE from '../actions/constants/localStorage'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; export type Coin = { name: string; diff --git a/src/js/reducers/LogReducer.js b/src/js/reducers/LogReducer.js index 2655579d..f08f4887 100644 --- a/src/js/reducers/LogReducer.js +++ b/src/js/reducers/LogReducer.js @@ -2,7 +2,7 @@ 'use strict'; import * as LOG from '../actions/constants/log'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; export type LogEntry = { time: number; diff --git a/src/js/reducers/ModalReducer.js b/src/js/reducers/ModalReducer.js index 077acaf3..21cfbd0e 100644 --- a/src/js/reducers/ModalReducer.js +++ b/src/js/reducers/ModalReducer.js @@ -6,7 +6,7 @@ import * as RECEIVE from '../actions/constants/receive'; import * as MODAL from '../actions/constants/modal'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action, TrezorDevice } from '../flowtype'; +import type { Action, TrezorDevice } from '~/flowtype'; export type State = { opened: false; diff --git a/src/js/reducers/NotificationReducer.js b/src/js/reducers/NotificationReducer.js index f46e9024..87bacfe8 100644 --- a/src/js/reducers/NotificationReducer.js +++ b/src/js/reducers/NotificationReducer.js @@ -5,7 +5,7 @@ import { LOCATION_CHANGE } from 'react-router-redux'; import * as NOTIFICATION from '../actions/constants/notification'; import { DEVICE } from 'trezor-connect'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; export type CallbackAction = { label: string; diff --git a/src/js/reducers/PendingTxReducer.js b/src/js/reducers/PendingTxReducer.js index 98c61ea8..42950360 100644 --- a/src/js/reducers/PendingTxReducer.js +++ b/src/js/reducers/PendingTxReducer.js @@ -5,7 +5,7 @@ import * as PENDING from '../actions/constants/pendingTx'; import * as SEND from '../actions/constants/send'; import * as WEB3 from '../actions/constants/web3'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; import type { SendTxAction } from '../actions/SendFormActions'; export type PendingTx = { diff --git a/src/js/reducers/ReceiveReducer.js b/src/js/reducers/ReceiveReducer.js index 71eee86c..c88667d8 100644 --- a/src/js/reducers/ReceiveReducer.js +++ b/src/js/reducers/ReceiveReducer.js @@ -2,7 +2,7 @@ 'use strict'; import * as RECEIVE from '../actions/constants/receive'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; export type State = { addressVerified: boolean; diff --git a/src/js/reducers/SendFormReducer.js b/src/js/reducers/SendFormReducer.js index 6dd0b22a..b5a38714 100644 --- a/src/js/reducers/SendFormReducer.js +++ b/src/js/reducers/SendFormReducer.js @@ -8,7 +8,7 @@ import EthereumjsUnits from 'ethereumjs-units'; import BigNumber from 'bignumber.js'; import { getFeeLevels } from '../actions/SendFormActions'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; import type { Web3CreateAction, Web3UpdateBlockAction, diff --git a/src/js/reducers/SummaryReducer.js b/src/js/reducers/SummaryReducer.js index 92e8c75f..17303048 100644 --- a/src/js/reducers/SummaryReducer.js +++ b/src/js/reducers/SummaryReducer.js @@ -2,7 +2,7 @@ 'use strict'; import * as SUMMARY from '../actions/constants/summary'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; import type { NetworkToken } from './LocalStorageReducer'; export type State = { diff --git a/src/js/reducers/TokensReducer.js b/src/js/reducers/TokensReducer.js index 3edaf681..66c5e073 100644 --- a/src/js/reducers/TokensReducer.js +++ b/src/js/reducers/TokensReducer.js @@ -4,7 +4,7 @@ import * as CONNECT from '../actions/constants/TrezorConnect'; import * as TOKEN from '../actions/constants/token'; -import type { Action, TrezorDevice } from '../flowtype'; +import type { Action, TrezorDevice } from '~/flowtype'; import type { Account } from './AccountsReducer'; export type Token = { diff --git a/src/js/reducers/TrezorConnectReducer.js b/src/js/reducers/TrezorConnectReducer.js index 12af17c9..a9a80faf 100644 --- a/src/js/reducers/TrezorConnectReducer.js +++ b/src/js/reducers/TrezorConnectReducer.js @@ -4,7 +4,7 @@ import { TRANSPORT, DEVICE } from 'trezor-connect'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action, TrezorDevice } from '../flowtype'; +import type { Action, TrezorDevice } from '~/flowtype'; import type { Device } from 'trezor-connect'; export type SelectedDevice = { diff --git a/src/js/reducers/WalletReducer.js b/src/js/reducers/WalletReducer.js index cc6dbd0a..b1d67f6c 100644 --- a/src/js/reducers/WalletReducer.js +++ b/src/js/reducers/WalletReducer.js @@ -9,7 +9,7 @@ import * as WALLET from '../actions/constants/wallet'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action, RouterLocationState, TrezorDevice } from '../flowtype'; +import type { Action, RouterLocationState, TrezorDevice } from '~/flowtype'; type State = { ready: boolean; diff --git a/src/js/reducers/Web3Reducer.js b/src/js/reducers/Web3Reducer.js index 25ab7b8c..ff47a311 100644 --- a/src/js/reducers/Web3Reducer.js +++ b/src/js/reducers/Web3Reducer.js @@ -6,7 +6,7 @@ import Web3 from 'web3'; import * as STORAGE from '../actions/constants/localStorage'; import * as WEB3 from '../actions/constants/web3'; -import type { Action } from '../flowtype'; +import type { Action } from '~/flowtype'; import type { Web3CreateAction, Web3UpdateBlockAction, diff --git a/src/js/services/CoinmarketcapService.js b/src/js/services/CoinmarketcapService.js index 18d5c739..219a1882 100644 --- a/src/js/services/CoinmarketcapService.js +++ b/src/js/services/CoinmarketcapService.js @@ -14,7 +14,7 @@ import type { Action, AsyncAction, GetState -} from '../flowtype'; +} from '~/flowtype'; import type { Config, FiatValueTicker } from '../reducers/LocalStorageReducer'; export const RATE_UPDATE: 'rate__update' = 'rate__update'; diff --git a/src/js/services/LocalStorageService.js b/src/js/services/LocalStorageService.js index 3fbe7071..8254a015 100644 --- a/src/js/services/LocalStorageService.js +++ b/src/js/services/LocalStorageService.js @@ -25,9 +25,9 @@ import type { Action, AsyncAction, GetState -} from '../flowtype'; +} from '~/flowtype'; -import type { TrezorDevice } from '../flowtype'; +import type { TrezorDevice } from '~/flowtype'; import type { Account } from '../reducers/AccountsReducer'; import type { Token } from '../reducers/TokensReducer'; import type { PendingTx } from '../reducers/PendingTxReducer'; diff --git a/src/js/services/LogService.js b/src/js/services/LogService.js index f2c19899..e25daa9a 100644 --- a/src/js/services/LogService.js +++ b/src/js/services/LogService.js @@ -15,7 +15,7 @@ import type { Action, AsyncAction, GetState -} from '../flowtype'; +} from '~/flowtype'; const exclude: Array = [ ADD, OPEN, CLOSE, diff --git a/src/js/services/RouterService.js b/src/js/services/RouterService.js index c073716f..23bf3370 100644 --- a/src/js/services/RouterService.js +++ b/src/js/services/RouterService.js @@ -19,7 +19,7 @@ import type { GetState, RouterLocationState, TrezorDevice -} from '../flowtype'; +} from '~/flowtype'; /** * Middleware used for init application and managing router path. diff --git a/src/js/services/SessionStorageService.js b/src/js/services/SessionStorageService.js index 95f3631d..0cccbb04 100644 --- a/src/js/services/SessionStorageService.js +++ b/src/js/services/SessionStorageService.js @@ -25,9 +25,9 @@ import type { Action, AsyncAction, GetState -} from '../flowtype'; +} from '~/flowtype'; -import type { TrezorDevice } from '../flowtype'; +import type { TrezorDevice } from '~/flowtype'; import type { Account } from '../reducers/AccountsReducer'; import type { Token } from '../reducers/TokensReducer'; import type { PendingTx } from '../reducers/PendingTxReducer'; diff --git a/src/js/services/TrezorConnectService.js b/src/js/services/TrezorConnectService.js index 0b9e302b..d11c9c67 100644 --- a/src/js/services/TrezorConnectService.js +++ b/src/js/services/TrezorConnectService.js @@ -24,7 +24,7 @@ import type { AsyncAction, GetState, RouterLocationState -} from '../flowtype'; +} from '~/flowtype'; const TrezorConnectService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispatch) => (action: Action): Action => { diff --git a/src/js/store/index.js b/src/js/store/index.js index 42ad5585..e312d6fb 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -14,7 +14,7 @@ import services from '../services'; import Raven from 'raven-js'; import RavenMiddleware from 'redux-raven-middleware'; -import type { Action, GetState, Store } from '../flowtype'; +import type { Action, GetState, Store } from '~/flowtype'; export const history: History = createHistory( { queryKey: false } );