From 11efd69a21f69f30a6a75968e34af6d85e3bbc3c Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Fri, 11 Jan 2019 18:27:38 +0100 Subject: [PATCH] add reserve to Account Summary --- .../ripple/components/Balance/index.js | 161 ++++++++++++++++++ .../views/Account/Summary/ripple/index.js | 4 +- 2 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js diff --git a/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js b/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js new file mode 100644 index 00000000..f31a9c5e --- /dev/null +++ b/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js @@ -0,0 +1,161 @@ +/* @flow */ +import React, { PureComponent } from 'react'; +import BigNumber from 'bignumber.js'; +import styled from 'styled-components'; +import Icon from 'components/Icon'; +import colors from 'config/colors'; +import ICONS from 'config/icons'; +import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; + +import type { Network, State as ReducersState } from 'flowtype'; + +type Props = { + network: Network, + balance: string, + reserve: string, + fiat: $ElementType, +} + +type State = { + isHidden: boolean, + canAnimateHideBalanceIcon: boolean, +}; + +const Wrapper = styled.div` + padding-bottom: 28px; + position: relative; + display: flex; + + border-bottom: 1px solid ${colors.DIVIDER}; +`; + +const HideBalanceIconWrapper = styled.div` + display: flex; + align-items: center; + justify-content: center; + + width: 40px; + height: 40px; + position: absolute; + margin-left: -20px; + left: 50%; + bottom: -20px; + + cursor: pointer; + background: ${colors.WHITE}; + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.04); + border-radius: 50%; + transition: all 0.3s; + &:hover { + background: ${colors.DIVIDER}; + } +`; + +const FiatValue = styled.div` + font-weight: ${FONT_WEIGHT.SEMIBOLD}; + font-size: ${FONT_SIZE.BIGGER}; + margin: 7px 0; + min-height: 25px; + color: ${colors.TEXT_PRIMARY}; +`; + +const FiatValueRate = styled.div` + font-weight: ${FONT_WEIGHT.SEMIBOLD}; + font-size: ${FONT_SIZE.BIG}; + min-height: 25px; + margin: 7px 0; + display: flex; + align-items: center; + color: ${colors.TEXT_PRIMARY}; +`; + +const BalanceWrapper = styled.div` + margin-right: 48px; +`; + +const BalanceRateWrapper = styled(BalanceWrapper)` + padding-left: 50px; +`; + +const CoinBalance = styled.div` + font-size: ${FONT_SIZE.SMALL}; + color: ${colors.TEXT_SECONDARY}; +`; + +const Label = styled.div` + font-size: ${FONT_SIZE.SMALL}; + color: ${colors.TEXT_SECONDARY}; +`; + + +class AccountBalance extends PureComponent { + constructor(props: Props) { + super(props); + this.state = { + isHidden: false, + canAnimateHideBalanceIcon: false, + }; + } + + handleHideBalanceIconClick() { + this.setState(previousState => ({ + isHidden: !previousState.isHidden, + canAnimateHideBalanceIcon: true, + })); + } + + render() { + const { network } = this.props; + const fiatRate = this.props.fiat.find(f => f.network === network.shortcut); + let accountBalance = ''; + let fiatRateValue = ''; + let fiat = ''; + if (fiatRate) { + accountBalance = new BigNumber(this.props.balance); + fiatRateValue = new BigNumber(fiatRate.value).toFixed(2); + fiat = accountBalance.times(fiatRateValue).toFixed(2); + } + + return ( + + this.handleHideBalanceIconClick()} + > + + + {!this.state.isHidden && ( + + + + {fiatRate && ( + ${fiat} + )} + {this.props.balance} {network.symbol} + + {this.props.reserve !== '0' && ( + + + {this.props.reserve} {network.symbol} + + )} + {fiatRate && ( + + + ${fiatRateValue} + 1.00 {network.symbol} + + )} + + )} + + ); + } +} + +export default AccountBalance; diff --git a/src/views/Wallet/views/Account/Summary/ripple/index.js b/src/views/Wallet/views/Account/Summary/ripple/index.js index dc8e4070..01242056 100644 --- a/src/views/Wallet/views/Account/Summary/ripple/index.js +++ b/src/views/Wallet/views/Account/Summary/ripple/index.js @@ -13,7 +13,7 @@ import CoinLogo from 'components/images/CoinLogo'; import * as stateUtils from 'reducers/utils'; import Link from 'components/Link'; import { FONT_WEIGHT, FONT_SIZE } from 'config/variables'; -import AccountBalance from '../components/Balance'; +import AccountBalance from './components/Balance'; import type { Props } from './Container'; @@ -77,6 +77,7 @@ const AccountSummary = (props: Props) => { const explorerLink: string = `${network.explorer.address}${account.descriptor}`; const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol); const balance: string = new BigNumber(account.balance).minus(pendingAmount).toString(10); + const reserve: string = account.networkType === 'ripple' && !account.empty ? account.reserve : '0'; const TMP_SHOW_HISTORY = false; @@ -93,6 +94,7 @@ const AccountSummary = (props: Props) => { { TMP_SHOW_HISTORY && (