diff --git a/src/components/wallet/view/walletView.js b/src/components/wallet/view/walletView.js index 2cd4dceda..26e4ebd01 100644 --- a/src/components/wallet/view/walletView.js +++ b/src/components/wallet/view/walletView.js @@ -59,13 +59,13 @@ class WalletView extends PureComponent { + refreshing={isRefreshing} + onRefresh={handleOnWalletRefresh} + progressBackgroundColor="#357CE6" + tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'} + titleColor="#fff" + colors={['#fff']} + /> } style={styles.scrollView} > diff --git a/src/components/walletDetails/container/walletDetailsContainer.js b/src/components/walletDetails/container/walletDetailsContainer.js index 423d49ef8..67b4738a0 100644 --- a/src/components/walletDetails/container/walletDetailsContainer.js +++ b/src/components/walletDetails/container/walletDetailsContainer.js @@ -37,6 +37,12 @@ class WalletContainer extends PureComponent { case 'SBD': balance = Math.round(walletData.sbdBalance * 1000) / 1000; break; + case 'SAVING_STEEM': + balance = Math.round(walletData.savingBalance * 1000) / 1000; + break; + case 'SAVING_SBD': + balance = Math.round(walletData.savingBalanceSbd * 1000) / 1000; + break; default: break; } diff --git a/src/components/walletDetails/view/walletDetailsView.js b/src/components/walletDetails/view/walletDetailsView.js index 1985131a4..144c25dc5 100644 --- a/src/components/walletDetails/view/walletDetailsView.js +++ b/src/components/walletDetails/view/walletDetailsView.js @@ -1,8 +1,6 @@ import React, { PureComponent } from 'react'; import { View } from 'react-native'; -// Constants - // Components import { GrayWrapper, WalletLineItem } from '../../basicUIElements'; @@ -10,20 +8,9 @@ import { GrayWrapper, WalletLineItem } from '../../basicUIElements'; import { vestsToSp } from '../../../utils/conversions'; // Styles -// eslint-disable-next-line import styles from './walletDetailsStyles'; class WalletDetailsView extends PureComponent { - /* Props - * ------------------------------------------------ - * @prop { type } name - Description.... - */ - - constructor(props) { - super(props); - this.state = {}; - } - // Component Life Cycles // Component Functions @@ -33,6 +20,8 @@ class WalletDetailsView extends PureComponent { const steemDropdown = ['transfer_token', 'transfer_to_saving', 'powerUp']; const sbdDropdown = ['transfer_token', 'transfer_to_saving']; + const savingSteemDropdown = ['withdraw_steem']; + const savingSbdDropdown = ['withdraw_sbd']; return ( @@ -98,7 +87,7 @@ class WalletDetailsView extends PureComponent { isBoldText isHasdropdown={isShowDropdowns} dropdownOptions={sbdDropdown.map(item => intl.formatMessage({ id: `transfer.${item}` }))} - onDropdownSelect={a => navigate(steemDropdown[a], 'SBD')} + onDropdownSelect={a => navigate(sbdDropdown[a], 'SBD')} /> + intl.formatMessage({ id: `transfer.${item}` }), + )} + onDropdownSelect={a => navigate(savingSteemDropdown[a], 'SAVING_STEEM')} /> + intl.formatMessage({ id: `transfer.${item}` }), + )} + onDropdownSelect={a => navigate(savingSbdDropdown[a], 'SAVING_SBD')} /> {walletData.showPowerDown && ( diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index cd2fbc4fd..7c7750620 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -288,6 +288,8 @@ "powerUp": "Power Up", "withdraw_to_saving": "Withdraw To Saving", "steemconnect_title": "Steemconnect Transfer", - "next": "NEXT" + "next": "NEXT", + "withdraw_steem": "Withdraw Steem", + "withdraw_sbd": "Withdraw Steem Dollar" } }