diff --git a/src/views/Wallet/views/Account/Receive/bitcoin/Container.js b/src/views/Wallet/views/Account/Receive/bitcoin/Container.js new file mode 100644 index 00000000..d4a281c8 --- /dev/null +++ b/src/views/Wallet/views/Account/Receive/bitcoin/Container.js @@ -0,0 +1,48 @@ +/* @flow */ +import { bindActionCreators } from 'redux'; +import { connect } from 'react-redux'; +import { injectIntl } from 'react-intl'; + +import { showAddress } from 'actions/ReceiveActions'; +import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; +import type { State, Dispatch } from 'flowtype'; +import Receive from './index'; + +type OwnProps = { + intl: any, +}; + +type StateProps = { + selectedAccount: $ElementType, + receive: $ElementType, + modal: $ElementType, + wallet: $ElementType, +}; + +type DispatchProps = { + showAddress: typeof showAddress, +}; + +export type Props = OwnProps & StateProps & DispatchProps; + +const mapStateToProps: MapStateToProps = ( + state: State +): StateProps => ({ + selectedAccount: state.selectedAccount, + receive: state.receive, + modal: state.modal, + wallet: state.wallet, +}); + +const mapDispatchToProps: MapDispatchToProps = ( + dispatch: Dispatch +): DispatchProps => ({ + showAddress: bindActionCreators(showAddress, dispatch), +}); + +export default injectIntl( + connect( + mapStateToProps, + mapDispatchToProps + )(Receive) +); diff --git a/src/views/Wallet/views/Account/Receive/bitcoin/index.js b/src/views/Wallet/views/Account/Receive/bitcoin/index.js new file mode 100644 index 00000000..2646c8ce --- /dev/null +++ b/src/views/Wallet/views/Account/Receive/bitcoin/index.js @@ -0,0 +1,13 @@ +import React from 'react'; +import Title from 'views/Wallet/components/Title'; +import Content from 'views/Wallet/components/Content'; + +const BitcoinReceive = () => { + return ( + + Receive bitcoin + + ); +}; + +export default BitcoinReceive; diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js index 406820db..90599641 100644 --- a/src/views/Wallet/views/Account/Receive/ethereum/index.js +++ b/src/views/Wallet/views/Account/Receive/ethereum/index.js @@ -11,7 +11,7 @@ import { CONTEXT_DEVICE } from 'actions/constants/modal'; import l10nCommonMessages from 'views/common.messages'; import VerifyAddressTooltip from '../components/VerifyAddressTooltip'; import l10nMessages from './index.messages'; -import l10nReceiveMessages from '../common.messages'; +import l10nReceiveMessages from '../../common.messages'; import type { Props } from './Container'; diff --git a/src/views/Wallet/views/Account/Receive/index.js b/src/views/Wallet/views/Account/Receive/index.js index 2a88846b..94354052 100644 --- a/src/views/Wallet/views/Account/Receive/index.js +++ b/src/views/Wallet/views/Account/Receive/index.js @@ -3,8 +3,10 @@ import React from 'react'; import { connect } from 'react-redux'; import type { State } from 'flowtype'; + import EthereumTypeReceiveForm from './ethereum/Container'; import RippleTypeReceiveForm from './ripple/Container'; +import BitcoinTypeReceiveForm from './bitcoin/Container'; export type BaseProps = { selectedAccount: $ElementType, @@ -25,6 +27,8 @@ export default connect( return ; case 'ripple': return ; + case 'bitcoin': + return ; default: return null; } diff --git a/src/views/Wallet/views/Account/Receive/ripple/index.js b/src/views/Wallet/views/Account/Receive/ripple/index.js index 93480906..62c2ad89 100644 --- a/src/views/Wallet/views/Account/Receive/ripple/index.js +++ b/src/views/Wallet/views/Account/Receive/ripple/index.js @@ -15,7 +15,7 @@ import l10nCommonMessages from 'views/common.messages'; import VerifyAddressTooltip from '../components/VerifyAddressTooltip'; import l10nMessages from './index.messages'; -import l10nReceiveMessages from '../common.messages'; +import l10nReceiveMessages from '../../common.messages'; import type { Props } from './Container'; diff --git a/src/views/Wallet/views/Account/Send/components/bitcoin/Container.js b/src/views/Wallet/views/Account/Send/bitcoin/Container.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/bitcoin/Container.js rename to src/views/Wallet/views/Account/Send/bitcoin/Container.js diff --git a/src/views/Wallet/views/Account/Send/components/bitcoin/index.js b/src/views/Wallet/views/Account/Send/bitcoin/index.js similarity index 67% rename from src/views/Wallet/views/Account/Send/components/bitcoin/index.js rename to src/views/Wallet/views/Account/Send/bitcoin/index.js index 6de8d1f1..a724d67c 100644 --- a/src/views/Wallet/views/Account/Send/components/bitcoin/index.js +++ b/src/views/Wallet/views/Account/Send/bitcoin/index.js @@ -2,12 +2,12 @@ import React from 'react'; import Content from 'views/Wallet/components/Content'; import Title from 'views/Wallet/components/Title'; -const AccountSend = () => { +const BitcoinSend = () => { return ( - bitcoin + Send bitcoin ); }; -export default AccountSend; +export default BitcoinSend; diff --git a/src/views/Wallet/views/Account/Send/components/components/PendingTransactions/index.js b/src/views/Wallet/views/Account/Send/components/PendingTransactions/index.js similarity index 95% rename from src/views/Wallet/views/Account/Send/components/components/PendingTransactions/index.js rename to src/views/Wallet/views/Account/Send/components/PendingTransactions/index.js index a46f1655..080a61c8 100644 --- a/src/views/Wallet/views/Account/Send/components/components/PendingTransactions/index.js +++ b/src/views/Wallet/views/Account/Send/components/PendingTransactions/index.js @@ -5,7 +5,7 @@ import { colors, H5 } from 'trezor-ui-components'; import Transaction from 'components/Transaction'; import type { Network } from 'reducers/LocalStorageReducer'; -import type { BaseProps } from '../../../index'; +import type { BaseProps } from '../../index'; // import testData from './test.data'; type Props = { diff --git a/src/views/Wallet/views/Account/Send/components/components/PendingTransactions/test.data.js b/src/views/Wallet/views/Account/Send/components/PendingTransactions/test.data.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/components/PendingTransactions/test.data.js rename to src/views/Wallet/views/Account/Send/components/PendingTransactions/test.data.js diff --git a/src/views/Wallet/views/Account/Send/components/ethereum/Container.js b/src/views/Wallet/views/Account/Send/ethereum/Container.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ethereum/Container.js rename to src/views/Wallet/views/Account/Send/ethereum/Container.js diff --git a/src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.js rename to src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js diff --git a/src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.messages.js b/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.messages.js rename to src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/components/ethereum/index.js b/src/views/Wallet/views/Account/Send/ethereum/index.js similarity index 99% rename from src/views/Wallet/views/Account/Send/components/ethereum/index.js rename to src/views/Wallet/views/Account/Send/ethereum/index.js index 6b7eb9c7..73fd4000 100644 --- a/src/views/Wallet/views/Account/Send/components/ethereum/index.js +++ b/src/views/Wallet/views/Account/Send/ethereum/index.js @@ -16,7 +16,7 @@ import AdvancedForm from './components/AdvancedForm'; import PendingTransactions from '../components/PendingTransactions'; import l10nMessages from './index.messages'; -import l10nSendMessages from '../../../common.messages'; +import l10nSendMessages from '../../common.messages'; import type { Props } from './Container'; const AmountInputLabelWrapper = styled.div` diff --git a/src/views/Wallet/views/Account/Send/components/ethereum/index.messages.js b/src/views/Wallet/views/Account/Send/ethereum/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ethereum/index.messages.js rename to src/views/Wallet/views/Account/Send/ethereum/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/index.js b/src/views/Wallet/views/Account/Send/index.js index b81ec4c2..fd5e6b1b 100644 --- a/src/views/Wallet/views/Account/Send/index.js +++ b/src/views/Wallet/views/Account/Send/index.js @@ -3,9 +3,9 @@ import React from 'react'; import { connect } from 'react-redux'; import type { State } from 'flowtype'; -import EthereumTypeSendForm from './components/ethereum/Container'; -import RippleTypeSendForm from './components/ripple/Container'; -import BitcoinTypeSendForm from './components/bitcoin/Container'; +import EthereumTypeSendForm from './ethereum/Container'; +import RippleTypeSendForm from './ripple/Container'; +import BitcoinTypeSendForm from './bitcoin/Container'; export type BaseProps = { selectedAccount: $ElementType, diff --git a/src/views/Wallet/views/Account/Send/components/ripple/Container.js b/src/views/Wallet/views/Account/Send/ripple/Container.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ripple/Container.js rename to src/views/Wallet/views/Account/Send/ripple/Container.js diff --git a/src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.js rename to src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js diff --git a/src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.messages.js b/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.messages.js rename to src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/components/ripple/index.js b/src/views/Wallet/views/Account/Send/ripple/index.js similarity index 99% rename from src/views/Wallet/views/Account/Send/components/ripple/index.js rename to src/views/Wallet/views/Account/Send/ripple/index.js index e6404927..d3e144d0 100644 --- a/src/views/Wallet/views/Account/Send/components/ripple/index.js +++ b/src/views/Wallet/views/Account/Send/ripple/index.js @@ -14,7 +14,7 @@ import PendingTransactions from '../components/PendingTransactions'; import AdvancedForm from './components/AdvancedForm'; import l10nMessages from './index.messages'; -import l10nSendMessages from '../../../common.messages'; +import l10nSendMessages from '../../common.messages'; import type { Props } from './Container'; diff --git a/src/views/Wallet/views/Account/Send/components/ripple/index.messages.js b/src/views/Wallet/views/Account/Send/ripple/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/ripple/index.messages.js rename to src/views/Wallet/views/Account/Send/ripple/index.messages.js diff --git a/src/views/Wallet/views/Account/Summary/bitcoin/Container.js b/src/views/Wallet/views/Account/Summary/bitcoin/Container.js new file mode 100644 index 00000000..d2502c3e --- /dev/null +++ b/src/views/Wallet/views/Account/Summary/bitcoin/Container.js @@ -0,0 +1,57 @@ +/* @flow */ +import { bindActionCreators } from 'redux'; +import { connect } from 'react-redux'; +import { injectIntl } from 'react-intl'; + +import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; +import * as TokenActions from 'actions/TokenActions'; + +import type { State, Dispatch } from 'flowtype'; +import Summary from './index'; + +type OwnProps = { + intl: any, +}; + +type StateProps = { + selectedAccount: $ElementType, + summary: $ElementType, + wallet: $ElementType, + tokens: $ElementType, + fiat: $ElementType, + localStorage: $ElementType, +}; + +type DispatchProps = { + addToken: typeof TokenActions.add, + loadTokens: typeof TokenActions.load, + removeToken: typeof TokenActions.remove, +}; + +export type Props = OwnProps & StateProps & DispatchProps; + +const mapStateToProps: MapStateToProps = ( + state: State +): StateProps => ({ + selectedAccount: state.selectedAccount, + summary: state.summary, + wallet: state.wallet, + tokens: state.tokens, + fiat: state.fiat, + localStorage: state.localStorage, +}); + +const mapDispatchToProps: MapDispatchToProps = ( + dispatch: Dispatch +): DispatchProps => ({ + addToken: bindActionCreators(TokenActions.add, dispatch), + loadTokens: bindActionCreators(TokenActions.load, dispatch), + removeToken: bindActionCreators(TokenActions.remove, dispatch), +}); + +export default injectIntl( + connect( + mapStateToProps, + mapDispatchToProps + )(Summary) +); diff --git a/src/views/Wallet/views/Account/Summary/bitcoin/index.js b/src/views/Wallet/views/Account/Summary/bitcoin/index.js new file mode 100644 index 00000000..fc0b9e9f --- /dev/null +++ b/src/views/Wallet/views/Account/Summary/bitcoin/index.js @@ -0,0 +1,14 @@ +/* @flow */ +import React from 'react'; +import Content from 'views/Wallet/components/Content'; +import Title from 'views/Wallet/components/Title'; + +const BitcoinSummary = () => { + return ( + + Summary Bitcoin + + ); +}; + +export default BitcoinSummary; diff --git a/src/views/Wallet/views/Account/Summary/index.js b/src/views/Wallet/views/Account/Summary/index.js index 54eda26b..4766bcf9 100644 --- a/src/views/Wallet/views/Account/Summary/index.js +++ b/src/views/Wallet/views/Account/Summary/index.js @@ -5,6 +5,7 @@ import { connect } from 'react-redux'; import type { State } from 'flowtype'; import EthereumTypeSummary from './ethereum/Container'; import RippleTypeSummary from './ripple/Container'; +import BitcoinTypeSummary from './bitcoin/Container'; type WrapperProps = { selectedAccount: $ElementType, @@ -25,6 +26,8 @@ export default connect( return ; case 'ripple': return ; + case 'bitcoin': + return ; default: return null; }