From c47ca11f8bccac41091f46cf0e3440e8c90412f0 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Tue, 9 Apr 2019 14:20:36 +0200 Subject: [PATCH 01/10] prepare empty bitcoin send page, refactor --- public/data/appConfig.json | 7 +++ src/actions/ripple/BlockchainActions.js | 1 + src/reducers/LocalStorageReducer.js | 1 + .../components/CoinMenu/index.js | 1 + .../Send/components/bitcoin/Container.js | 53 +++++++++++++++++++ .../Account/Send/components/bitcoin/index.js | 13 +++++ .../PendingTransactions/index.js | 2 +- .../PendingTransactions/test.data.js | 0 .../{ => components}/ethereum/Container.js | 0 .../ethereum/components/AdvancedForm/index.js | 0 .../components/AdvancedForm/index.messages.js | 0 .../Send/{ => components}/ethereum/index.js | 2 +- .../ethereum/index.messages.js | 0 .../Send/{ => components}/ripple/Container.js | 0 .../ripple/components/AdvancedForm/index.js | 0 .../components/AdvancedForm/index.messages.js | 0 .../Send/{ => components}/ripple/index.js | 2 +- .../{ => components}/ripple/index.messages.js | 0 src/views/Wallet/views/Account/Send/index.js | 7 ++- src/views/Wallet/views/Dashboard/index.js | 22 ++++---- 20 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 src/views/Wallet/views/Account/Send/components/bitcoin/Container.js create mode 100644 src/views/Wallet/views/Account/Send/components/bitcoin/index.js rename src/views/Wallet/views/Account/Send/components/{ => components}/PendingTransactions/index.js (95%) rename src/views/Wallet/views/Account/Send/components/{ => components}/PendingTransactions/test.data.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ethereum/Container.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ethereum/components/AdvancedForm/index.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ethereum/components/AdvancedForm/index.messages.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ethereum/index.js (99%) rename src/views/Wallet/views/Account/Send/{ => components}/ethereum/index.messages.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ripple/Container.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ripple/components/AdvancedForm/index.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ripple/components/AdvancedForm/index.messages.js (100%) rename src/views/Wallet/views/Account/Send/{ => components}/ripple/index.js (99%) rename src/views/Wallet/views/Account/Send/{ => components}/ripple/index.messages.js (100%) 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 => ( + + + + ))} From d547206f6c436c447ba164f2de5c2ed0ac00897d Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Tue, 9 Apr 2019 14:38:16 +0200 Subject: [PATCH 02/10] add empty summary and receive --- .../Account/Receive/bitcoin/Container.js | 48 ++++++++++++++++ .../views/Account/Receive/bitcoin/index.js | 13 +++++ .../views/Account/Receive/ethereum/index.js | 2 +- .../Wallet/views/Account/Receive/index.js | 4 ++ .../views/Account/Receive/ripple/index.js | 2 +- .../{components => }/bitcoin/Container.js | 0 .../Send/{components => }/bitcoin/index.js | 6 +- .../PendingTransactions/index.js | 2 +- .../PendingTransactions/test.data.js | 0 .../{components => }/ethereum/Container.js | 0 .../ethereum/components/AdvancedForm/index.js | 0 .../components/AdvancedForm/index.messages.js | 0 .../Send/{components => }/ethereum/index.js | 2 +- .../ethereum/index.messages.js | 0 src/views/Wallet/views/Account/Send/index.js | 6 +- .../Send/{components => }/ripple/Container.js | 0 .../ripple/components/AdvancedForm/index.js | 0 .../components/AdvancedForm/index.messages.js | 0 .../Send/{components => }/ripple/index.js | 2 +- .../{components => }/ripple/index.messages.js | 0 .../Account/Summary/bitcoin/Container.js | 57 +++++++++++++++++++ .../views/Account/Summary/bitcoin/index.js | 14 +++++ .../Wallet/views/Account/Summary/index.js | 3 + 23 files changed, 150 insertions(+), 11 deletions(-) create mode 100644 src/views/Wallet/views/Account/Receive/bitcoin/Container.js create mode 100644 src/views/Wallet/views/Account/Receive/bitcoin/index.js rename src/views/Wallet/views/Account/Send/{components => }/bitcoin/Container.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/bitcoin/index.js (67%) rename src/views/Wallet/views/Account/Send/components/{components => }/PendingTransactions/index.js (95%) rename src/views/Wallet/views/Account/Send/components/{components => }/PendingTransactions/test.data.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ethereum/Container.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ethereum/components/AdvancedForm/index.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ethereum/components/AdvancedForm/index.messages.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ethereum/index.js (99%) rename src/views/Wallet/views/Account/Send/{components => }/ethereum/index.messages.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ripple/Container.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ripple/components/AdvancedForm/index.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ripple/components/AdvancedForm/index.messages.js (100%) rename src/views/Wallet/views/Account/Send/{components => }/ripple/index.js (99%) rename src/views/Wallet/views/Account/Send/{components => }/ripple/index.messages.js (100%) create mode 100644 src/views/Wallet/views/Account/Summary/bitcoin/Container.js create mode 100644 src/views/Wallet/views/Account/Summary/bitcoin/index.js 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; } From 848d5a3ff3ac4d011297af3db0b10cb6748789b3 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Tue, 9 Apr 2019 14:47:22 +0200 Subject: [PATCH 03/10] hide bitcoin using feature flag --- public/data/appConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/data/appConfig.json b/public/data/appConfig.json index cb729c9e..5d6326e1 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -2,6 +2,7 @@ "networks": [ { "order": 1, + "isHidden": true, "type": "bitcoin", "name": "Bitcoin", "symbol": "BTC", From d7568a7b404bd392eedb68add5ae1cc37a919f70 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Tue, 9 Apr 2019 17:30:30 +0200 Subject: [PATCH 04/10] fix locales --- src/views/Wallet/views/Account/Receive/ethereum/index.js | 2 +- src/views/Wallet/views/Account/Receive/ripple/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js index 90599641..406820db 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/ripple/index.js b/src/views/Wallet/views/Account/Receive/ripple/index.js index 62c2ad89..93480906 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'; From 3b8e12e7ef3147617a927c34a87d6654063bed18 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 10 Apr 2019 11:44:58 +0200 Subject: [PATCH 05/10] add navigation constants --- .../components/TopNavigationAccount/constants/navigation.js | 3 +++ src/views/Wallet/components/TopNavigationAccount/index.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/views/Wallet/components/TopNavigationAccount/constants/navigation.js diff --git a/src/views/Wallet/components/TopNavigationAccount/constants/navigation.js b/src/views/Wallet/components/TopNavigationAccount/constants/navigation.js new file mode 100644 index 00000000..4556a03a --- /dev/null +++ b/src/views/Wallet/components/TopNavigationAccount/constants/navigation.js @@ -0,0 +1,3 @@ +export default { + HAS_SIGN_VERIFY: ['ethereum', 'bitcoin'], +}; diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js index b4847f4f..d25ff210 100644 --- a/src/views/Wallet/components/TopNavigationAccount/index.js +++ b/src/views/Wallet/components/TopNavigationAccount/index.js @@ -8,6 +8,7 @@ import { connect } from 'react-redux'; import { colors } from 'trezor-ui-components'; import type { State } from 'flowtype'; import { FormattedMessage } from 'react-intl'; +import navigationConstants from './constants/navigation'; import l10nMessages from './index.messages'; import Indicator from './components/Indicator'; @@ -108,7 +109,7 @@ class TopNavigationAccount extends React.PureComponent { - {network.type === 'ethereum' && ( + {navigationConstants.HAS_SIGN_VERIFY.includes(network.type) && ( From 43043e2ec2db1349dd5aa1e3d6e2b56c4befcc46 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 12 Apr 2019 15:06:44 +0200 Subject: [PATCH 06/10] moved hasSignVerify constant to global config --- public/data/appConfig.json | 18 ++++++++++++------ .../constants/navigation.js | 3 --- .../components/TopNavigationAccount/index.js | 8 ++++++-- 3 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 src/views/Wallet/components/TopNavigationAccount/constants/navigation.js diff --git a/public/data/appConfig.json b/public/data/appConfig.json index 5d6326e1..ee2fe5b8 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -6,7 +6,8 @@ "type": "bitcoin", "name": "Bitcoin", "symbol": "BTC", - "shortcut": "btc" + "shortcut": "btc", + "hasSignVerify": true }, { "order": 2, @@ -27,7 +28,8 @@ "explorer": { "tx": "https://etherscan.io/tx/", "address": "https://etherscan.io/address/" - } + }, + "hasSignVerify": true }, { "order": 18, @@ -48,7 +50,8 @@ "explorer": { "tx": "https://gastracker.io/tx/", "address": "https://gastracker.io/addr/" - } + }, + "hasSignVerify": true }, { "order": 2, @@ -82,7 +85,8 @@ "explorer": { "tx": "https://ropsten.etherscan.io/tx/", "address": "https://ropsten.etherscan.io/address/" - } + }, + "hasSignVerify": true }, { "order": 3, @@ -103,7 +107,8 @@ "explorer": { "tx": "https://xrpcharts.ripple.com/#/transactions/", "address": "https://xrpcharts.ripple.com/#/graph/" - } + }, + "hasSignVerify": false }, { "order": 3, @@ -125,7 +130,8 @@ "explorer": { "tx": "https://sisyfos.trezor.io/ripple-testnet-explorer/tx/", "address": "https://sisyfos.trezor.io/ripple-testnet-explorer/address/" - } + }, + "hasSignVerify": false } ], diff --git a/src/views/Wallet/components/TopNavigationAccount/constants/navigation.js b/src/views/Wallet/components/TopNavigationAccount/constants/navigation.js deleted file mode 100644 index 4556a03a..00000000 --- a/src/views/Wallet/components/TopNavigationAccount/constants/navigation.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - HAS_SIGN_VERIFY: ['ethereum', 'bitcoin'], -}; diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js index d25ff210..02a514ce 100644 --- a/src/views/Wallet/components/TopNavigationAccount/index.js +++ b/src/views/Wallet/components/TopNavigationAccount/index.js @@ -8,7 +8,6 @@ import { connect } from 'react-redux'; import { colors } from 'trezor-ui-components'; import type { State } from 'flowtype'; import { FormattedMessage } from 'react-intl'; -import navigationConstants from './constants/navigation'; import l10nMessages from './index.messages'; import Indicator from './components/Indicator'; @@ -16,6 +15,7 @@ import Indicator from './components/Indicator'; type Props = { router: $ElementType, selectedAccount: $ElementType, + localStorage: $ElementType, }; type LocalState = { wrapper: ?HTMLElement, @@ -89,10 +89,13 @@ class TopNavigationAccount extends React.PureComponent { wrapper: ?HTMLElement; render() { + const { config } = this.props.localStorage; const { state, pathname } = this.props.router.location; if (!state) return null; const { network } = this.props.selectedAccount; if (!network) return null; + const networkConfig = config.networks.find(c => c.shortcut === network.shortcut); + if (!networkConfig) return null; const basePath = `/device/${state.device}/network/${state.network}/account/${ state.account @@ -109,7 +112,7 @@ class TopNavigationAccount extends React.PureComponent { - {navigationConstants.HAS_SIGN_VERIFY.includes(network.type) && ( + {networkConfig.hasSignVerify && ( @@ -124,6 +127,7 @@ export default connect( (state: State): Props => ({ router: state.router, selectedAccount: state.selectedAccount, + localStorage: state.localStorage, }), null )(TopNavigationAccount); From 98413b68e6b692c9fe445f0ebe887e97658ee60d Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 12 Apr 2019 15:25:29 +0200 Subject: [PATCH 07/10] fix flow --- .../Account/Receive/bitcoin/Container.js | 23 ++++++++----------- .../views/Account/Send/bitcoin/Container.js | 22 ++++++++---------- .../Account/Summary/bitcoin/Container.js | 23 +++++++------------ 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/src/views/Wallet/views/Account/Receive/bitcoin/Container.js b/src/views/Wallet/views/Account/Receive/bitcoin/Container.js index d4a281c8..0b782e1e 100644 --- a/src/views/Wallet/views/Account/Receive/bitcoin/Container.js +++ b/src/views/Wallet/views/Account/Receive/bitcoin/Container.js @@ -4,39 +4,34 @@ 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 = { +type OwnProps = {| intl: any, -}; +|}; -type StateProps = { +type StateProps = {| selectedAccount: $ElementType, receive: $ElementType, modal: $ElementType, wallet: $ElementType, -}; +|}; -type DispatchProps = { +type DispatchProps = {| showAddress: typeof showAddress, -}; +|}; -export type Props = OwnProps & StateProps & DispatchProps; +export type Props = {| ...OwnProps, ...StateProps, ...DispatchProps |}; -const mapStateToProps: MapStateToProps = ( - state: State -): StateProps => ({ +const mapStateToProps = (state: State): StateProps => ({ selectedAccount: state.selectedAccount, receive: state.receive, modal: state.modal, wallet: state.wallet, }); -const mapDispatchToProps: MapDispatchToProps = ( - dispatch: Dispatch -): DispatchProps => ({ +const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ showAddress: bindActionCreators(showAddress, dispatch), }); diff --git a/src/views/Wallet/views/Account/Send/bitcoin/Container.js b/src/views/Wallet/views/Account/Send/bitcoin/Container.js index da85e60e..fd7a1b1d 100644 --- a/src/views/Wallet/views/Account/Send/bitcoin/Container.js +++ b/src/views/Wallet/views/Account/Send/bitcoin/Container.js @@ -6,32 +6,29 @@ import { injectIntl } from 'react-intl'; import SendFormActions from 'actions/ripple/SendFormActions'; import { openQrModal } from 'actions/ModalActions'; -import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import type { State, Dispatch } from 'flowtype'; import AccountSend from './index'; -type OwnProps = { +type OwnProps = {| intl: any, -}; +|}; -export type StateProps = { +export type StateProps = {| selectedAccount: $ElementType, sendForm: $ElementType, wallet: $ElementType, fiat: $ElementType, localStorage: $ElementType, -}; +|}; -export type DispatchProps = { +export type DispatchProps = {| sendFormActions: typeof SendFormActions, openQrModal: typeof openQrModal, -}; +|}; export type Props = OwnProps & StateProps & DispatchProps; -const mapStateToProps: MapStateToProps = ( - state: State -): StateProps => ({ +const mapStateToProps = (state: State): StateProps => ({ selectedAccount: state.selectedAccount, sendForm: state.sendFormRipple, wallet: state.wallet, @@ -39,10 +36,9 @@ const mapStateToProps: MapStateToProps = ( localStorage: state.localStorage, }); -const mapDispatchToProps: MapDispatchToProps = ( - dispatch: Dispatch -): DispatchProps => ({ +const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ sendFormActions: bindActionCreators(SendFormActions, dispatch), + openQrModal: bindActionCreators(openQrModal, dispatch), }); export default injectIntl( diff --git a/src/views/Wallet/views/Account/Summary/bitcoin/Container.js b/src/views/Wallet/views/Account/Summary/bitcoin/Container.js index d2502c3e..09d1840a 100644 --- a/src/views/Wallet/views/Account/Summary/bitcoin/Container.js +++ b/src/views/Wallet/views/Account/Summary/bitcoin/Container.js @@ -2,37 +2,32 @@ 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 = { +type OwnProps = {| intl: any, -}; +|}; -type StateProps = { +type StateProps = {| selectedAccount: $ElementType, summary: $ElementType, wallet: $ElementType, tokens: $ElementType, fiat: $ElementType, localStorage: $ElementType, -}; +|}; -type DispatchProps = { +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 => ({ +const mapStateToProps = (state: State): StateProps => ({ selectedAccount: state.selectedAccount, summary: state.summary, wallet: state.wallet, @@ -41,9 +36,7 @@ const mapStateToProps: MapStateToProps = ( localStorage: state.localStorage, }); -const mapDispatchToProps: MapDispatchToProps = ( - dispatch: Dispatch -): DispatchProps => ({ +const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ addToken: bindActionCreators(TokenActions.add, dispatch), loadTokens: bindActionCreators(TokenActions.load, dispatch), removeToken: bindActionCreators(TokenActions.remove, dispatch), From 62eeb4c7620ed057db939a368fddcdf2c8406934 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 12 Apr 2019 15:29:48 +0200 Subject: [PATCH 08/10] fix eslint --- src/views/Wallet/components/TopNavigationAccount/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js index 9a237f47..426a3781 100644 --- a/src/views/Wallet/components/TopNavigationAccount/index.js +++ b/src/views/Wallet/components/TopNavigationAccount/index.js @@ -102,8 +102,6 @@ class TopNavigationAccount extends React.PureComponent { const networkConfig = config.networks.find(c => c.shortcut === network.shortcut); if (!networkConfig) return null; - const isAccountImported = account && account.imported; - const basePath = `/device/${state.device}/network/${state.network}/account/${ state.account }`; From 024e51f8027d392cf472078bf1ad080f697a7b04 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 12 Apr 2019 15:30:21 +0200 Subject: [PATCH 09/10] turn off integration test for now --- .gitlab-ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eebcbfb3..738fda45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,23 +160,23 @@ delete review: tags: - deploy -integration tests: - image: docker:latest - services: - - docker:dind - stage: integration tests - script: - - 'export SHARED_PATH="$(dirname ${CI_PROJECT_DIR})/shared"' - - rm -r ${SHARED_PATH} || true - - docker build -f Dockerfile.test -t wallet-emulator-bridge-tests . - - mkdir -p ${SHARED_PATH}/trezor-wallet/screenshots - - mkdir -p ${SHARED_PATH}/trezor-wallet/videos - - docker run --volume ${SHARED_PATH}/trezor-wallet/screenshots:/trezor-wallet/test/screenshots --volume ${SHARED_PATH}/trezor-wallet/videos:/trezor-wallet/test/videos --rm wallet-emulator-bridge-tests - - find ${SHARED_PATH} - - mkdir trezor-wallet - - cp -r ${SHARED_PATH}/ trezor-wallet/ - artifacts: - when: always - expire_in: 1 week - paths: - - trezor-wallet/ +# integration tests: +# image: docker:latest +# services: +# - docker:dind +# stage: integration tests +# script: +# - 'export SHARED_PATH="$(dirname ${CI_PROJECT_DIR})/shared"' +# - rm -r ${SHARED_PATH} || true +# - docker build -f Dockerfile.test -t wallet-emulator-bridge-tests . +# - mkdir -p ${SHARED_PATH}/trezor-wallet/screenshots +# - mkdir -p ${SHARED_PATH}/trezor-wallet/videos +# - docker run --volume ${SHARED_PATH}/trezor-wallet/screenshots:/trezor-wallet/test/screenshots --volume ${SHARED_PATH}/trezor-wallet/videos:/trezor-wallet/test/videos --rm wallet-emulator-bridge-tests +# - find ${SHARED_PATH} +# - mkdir trezor-wallet +# - cp -r ${SHARED_PATH}/ trezor-wallet/ +# artifacts: +# when: always +# expire_in: 1 week +# paths: +# - trezor-wallet/ From e85643b2b3bc4370ddd47282e8d92b599097a1b5 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 12 Apr 2019 15:38:18 +0200 Subject: [PATCH 10/10] fix lint again --- src/views/Wallet/components/TopNavigationAccount/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js index 426a3781..39215a8b 100644 --- a/src/views/Wallet/components/TopNavigationAccount/index.js +++ b/src/views/Wallet/components/TopNavigationAccount/index.js @@ -97,7 +97,7 @@ class TopNavigationAccount extends React.PureComponent { const { config } = this.props.localStorage; const { state, pathname } = this.props.router.location; if (!state) return null; - const { network, account } = this.props.selectedAccount; + const { network } = this.props.selectedAccount; if (!network) return null; const networkConfig = config.networks.find(c => c.shortcut === network.shortcut); if (!networkConfig) return null;