Merge branch 'development' into nt/editor-settings-modal

This commit is contained in:
noumantahir 2021-12-06 16:06:14 +05:00
commit 1926a6269b

View File

@ -19,14 +19,14 @@ const WalletView = ({ setEstimatedWalletValue, selectedUser, handleOnScroll }) =
const _getUnclaimedText = (walletData, isPreview) => ( const _getUnclaimedText = (walletData, isPreview) => (
<Text style={[isPreview ? styles.unclaimedTextPreview : styles.unclaimedText]}> <Text style={[isPreview ? styles.unclaimedTextPreview : styles.unclaimedText]}>
{walletData.rewardSteemBalance {walletData.rewardHiveBalance
? `${Math.round(walletData.rewardSteemBalance * 1000) / 1000} HIVE` ? `${Math.round(walletData.rewardHiveBalance * 1000) / 1000} HIVE`
: ''} : ''}
{walletData.rewardSbdBalance {walletData.rewardHbdBalance
? ` ${Math.round(walletData.rewardSbdBalance * 1000) / 1000} HBD` ? ` ${Math.round(walletData.rewardHbdBalance * 1000) / 1000} HBD`
: ''} : ''}
{walletData.rewardVestingSteem {walletData.rewardVestingHive
? ` ${Math.round(walletData.rewardVestingSteem * 1000) / 1000} HP` ? ` ${Math.round(walletData.rewardVestingHive * 1000) / 1000} HP`
: ''} : ''}
</Text> </Text>
); );
@ -100,6 +100,7 @@ const WalletView = ({ setEstimatedWalletValue, selectedUser, handleOnScroll }) =
)} )}
</CollapsibleCard> </CollapsibleCard>
)} )}
<CollapsibleCard <CollapsibleCard
titleColor="#788187" titleColor="#788187"
title={intl.formatMessage({ title={intl.formatMessage({