diff --git a/public/data/appConfig.json b/public/data/appConfig.json index 09d07ce9..cb729c9e 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -1,5 +1,12 @@ { "networks": [ + { + "order": 1, + "type": "bitcoin", + "name": "Bitcoin", + "symbol": "BTC", + "shortcut": "btc" + }, { "order": 2, "type": "ethereum", diff --git a/src/actions/ripple/BlockchainActions.js b/src/actions/ripple/BlockchainActions.js index cdf15610..06f4b18b 100644 --- a/src/actions/ripple/BlockchainActions.js +++ b/src/actions/ripple/BlockchainActions.js @@ -138,6 +138,7 @@ export const onNotification = ( }, coin: account.network, }); + if (!updatedAccount.success) return; dispatch( diff --git a/src/reducers/LocalStorageReducer.js b/src/reducers/LocalStorageReducer.js index 4c1c81bf..97e2e51c 100644 --- a/src/reducers/LocalStorageReducer.js +++ b/src/reducers/LocalStorageReducer.js @@ -14,6 +14,7 @@ type NetworkFeeLevel = { export type Network = { order: number, + isHidden: ?boolean, type: string, name: string, testnet?: boolean, diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js index 1c041b9c..f3ee7fda 100644 --- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js @@ -80,6 +80,7 @@ class CoinMenu extends PureComponent { return ( {config.networks + .filter(item => !item.isHidden) .sort((a, b) => a.order - b.order) .map(item => ( , + sendForm: $ElementType, + wallet: $ElementType, + fiat: $ElementType, + localStorage: $ElementType, +}; + +export type DispatchProps = { + sendFormActions: typeof SendFormActions, + openQrModal: typeof openQrModal, +}; + +export type Props = OwnProps & StateProps & DispatchProps; + +const mapStateToProps: MapStateToProps = ( + state: State +): StateProps => ({ + selectedAccount: state.selectedAccount, + sendForm: state.sendFormRipple, + wallet: state.wallet, + fiat: state.fiat, + localStorage: state.localStorage, +}); + +const mapDispatchToProps: MapDispatchToProps = ( + dispatch: Dispatch +): DispatchProps => ({ + sendFormActions: bindActionCreators(SendFormActions, dispatch), +}); + +export default injectIntl( + connect( + mapStateToProps, + mapDispatchToProps + )(AccountSend) +); diff --git a/src/views/Wallet/views/Account/Send/components/bitcoin/index.js b/src/views/Wallet/views/Account/Send/components/bitcoin/index.js new file mode 100644 index 00000000..6de8d1f1 --- /dev/null +++ b/src/views/Wallet/views/Account/Send/components/bitcoin/index.js @@ -0,0 +1,13 @@ +import React from 'react'; +import Content from 'views/Wallet/components/Content'; +import Title from 'views/Wallet/components/Title'; + +const AccountSend = () => { + return ( + + bitcoin + + ); +}; + +export default AccountSend; diff --git a/src/views/Wallet/views/Account/Send/components/PendingTransactions/index.js b/src/views/Wallet/views/Account/Send/components/components/PendingTransactions/index.js similarity index 95% rename from src/views/Wallet/views/Account/Send/components/PendingTransactions/index.js rename to src/views/Wallet/views/Account/Send/components/components/PendingTransactions/index.js index 080a61c8..a46f1655 100644 --- a/src/views/Wallet/views/Account/Send/components/PendingTransactions/index.js +++ b/src/views/Wallet/views/Account/Send/components/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/PendingTransactions/test.data.js b/src/views/Wallet/views/Account/Send/components/components/PendingTransactions/test.data.js similarity index 100% rename from src/views/Wallet/views/Account/Send/components/PendingTransactions/test.data.js rename to src/views/Wallet/views/Account/Send/components/components/PendingTransactions/test.data.js diff --git a/src/views/Wallet/views/Account/Send/ethereum/Container.js b/src/views/Wallet/views/Account/Send/components/ethereum/Container.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ethereum/Container.js rename to src/views/Wallet/views/Account/Send/components/ethereum/Container.js diff --git a/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js rename to src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.js diff --git a/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.messages.js b/src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.messages.js rename to src/views/Wallet/views/Account/Send/components/ethereum/components/AdvancedForm/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/ethereum/index.js b/src/views/Wallet/views/Account/Send/components/ethereum/index.js similarity index 99% rename from src/views/Wallet/views/Account/Send/ethereum/index.js rename to src/views/Wallet/views/Account/Send/components/ethereum/index.js index 73fd4000..6b7eb9c7 100644 --- a/src/views/Wallet/views/Account/Send/ethereum/index.js +++ b/src/views/Wallet/views/Account/Send/components/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/ethereum/index.messages.js b/src/views/Wallet/views/Account/Send/components/ethereum/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ethereum/index.messages.js rename to src/views/Wallet/views/Account/Send/components/ethereum/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/ripple/Container.js b/src/views/Wallet/views/Account/Send/components/ripple/Container.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ripple/Container.js rename to src/views/Wallet/views/Account/Send/components/ripple/Container.js diff --git a/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js rename to src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.js diff --git a/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.messages.js b/src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.messages.js rename to src/views/Wallet/views/Account/Send/components/ripple/components/AdvancedForm/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/ripple/index.js b/src/views/Wallet/views/Account/Send/components/ripple/index.js similarity index 99% rename from src/views/Wallet/views/Account/Send/ripple/index.js rename to src/views/Wallet/views/Account/Send/components/ripple/index.js index d3e144d0..e6404927 100644 --- a/src/views/Wallet/views/Account/Send/ripple/index.js +++ b/src/views/Wallet/views/Account/Send/components/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/ripple/index.messages.js b/src/views/Wallet/views/Account/Send/components/ripple/index.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/ripple/index.messages.js rename to src/views/Wallet/views/Account/Send/components/ripple/index.messages.js diff --git a/src/views/Wallet/views/Account/Send/index.js b/src/views/Wallet/views/Account/Send/index.js index 2fee704f..b81ec4c2 100644 --- a/src/views/Wallet/views/Account/Send/index.js +++ b/src/views/Wallet/views/Account/Send/index.js @@ -3,8 +3,9 @@ import React from 'react'; import { connect } from 'react-redux'; import type { State } from 'flowtype'; -import EthereumTypeSendForm from './ethereum/Container'; -import RippleTypeSendForm from './ripple/Container'; +import EthereumTypeSendForm from './components/ethereum/Container'; +import RippleTypeSendForm from './components/ripple/Container'; +import BitcoinTypeSendForm from './components/bitcoin/Container'; export type BaseProps = { selectedAccount: $ElementType, @@ -25,6 +26,8 @@ export default connect( return ; case 'ripple': return ; + case 'bitcoin': + return ; default: return null; } diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index 4d1a9579..cbc38daa 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -74,16 +74,18 @@ const Dashboard = (props: Props) => ( - {props.localStorage.config.networks.map(network => ( - - - - ))} + {props.localStorage.config.networks + .filter(item => !item.isHidden) + .map(network => ( + + + + ))}