From ee9ebd29160d0f1fcf6680a68e8a6e5745b10b61 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Tue, 23 Apr 2019 14:35:07 +0200 Subject: [PATCH] smaller switch in settings, add show all --- src/actions/LocalStorageActions.js | 2 + .../Wallet/views/WalletSettings/Container.js | 5 ++ .../WalletSettings/components/Coins/index.js | 66 ++++++++++++++----- .../Wallet/views/WalletSettings/index.js | 5 ++ 4 files changed, 61 insertions(+), 17 deletions(-) diff --git a/src/actions/LocalStorageActions.js b/src/actions/LocalStorageActions.js index 7f242269..74e5d6f5 100644 --- a/src/actions/LocalStorageActions.js +++ b/src/actions/LocalStorageActions.js @@ -380,6 +380,8 @@ export const handleCoinVisibility = ( }); }; +// export const handleAllCoinsVisibility => (); + export const getHiddenCoins = (): Array => { const coinsConfig: ?string = storageUtils.get(TYPE, KEY_HIDDEN_COINS); if (coinsConfig) { diff --git a/src/views/Wallet/views/WalletSettings/Container.js b/src/views/Wallet/views/WalletSettings/Container.js index 3d30be05..70ff7869 100644 --- a/src/views/Wallet/views/WalletSettings/Container.js +++ b/src/views/Wallet/views/WalletSettings/Container.js @@ -23,6 +23,7 @@ type DispatchProps = {| setLocalCurrency: typeof WalletActions.setLocalCurrency, setHideBalance: typeof WalletActions.setHideBalance, handleCoinVisibility: typeof LocalStorageActions.handleCoinVisibility, + // handleAllCoinsVisibility: typeof LocalStorageActions.handleAllCoinsVisibility, |}; export type Props = {| ...OwnProps, ...StateProps, ...DispatchProps |}; @@ -37,6 +38,10 @@ const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ setLocalCurrency: bindActionCreators(WalletActions.setLocalCurrency, dispatch), setHideBalance: bindActionCreators(WalletActions.setHideBalance, dispatch), handleCoinVisibility: bindActionCreators(LocalStorageActions.handleCoinVisibility, dispatch), + // handleAllCoinsVisibility: bindActionCreators( + // LocalStorageActions.handleAllCoinsVisibility, + // dispatch + // ), }); export default injectIntl( diff --git a/src/views/Wallet/views/WalletSettings/components/Coins/index.js b/src/views/Wallet/views/WalletSettings/components/Coins/index.js index 7d3ae0ef..f95e3b42 100644 --- a/src/views/Wallet/views/WalletSettings/components/Coins/index.js +++ b/src/views/Wallet/views/WalletSettings/components/Coins/index.js @@ -35,6 +35,7 @@ const Content = styled.div` const Label = styled.div` display: flex; padding: 10px 0; + justify-content: space-between; color: ${colors.TEXT_SECONDARY}; align-items: center; `; @@ -66,7 +67,10 @@ const Left = styled.div` align-items: center; `; -const Right = styled.div``; +const Right = styled.div` + display: flex; + align-items: center; +`; const Name = styled.div` display: flex; @@ -86,14 +90,23 @@ const CoinsSettings = (props: Props) => ( {props.networks .filter(network => !network.isHidden) @@ -107,6 +120,11 @@ const CoinsSettings = (props: Props) => ( { props.handleCoinVisibility(network.shortcut, visible); }} @@ -118,14 +136,23 @@ const CoinsSettings = (props: Props) => ( {coins .sort((a, b) => a.order - b.order) @@ -139,6 +166,11 @@ const CoinsSettings = (props: Props) => ( { props.handleCoinVisibility(network.id, visible); }} diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js index 33929d38..a9a6e020 100644 --- a/src/views/Wallet/views/WalletSettings/index.js +++ b/src/views/Wallet/views/WalletSettings/index.js @@ -103,6 +103,11 @@ const WalletSettings = (props: Props) => ( { props.setHideBalance(checked); }}