feat(ui): add total balance conversion

synonymdev · Nov 7, 2024 · e140bab · e140bab
1 parent 3927859
commit e140bab
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 26 deletions.
diff --git a/src/components/ActivityHeader.tsx b/src/components/ActivityHeader.tsx
@@ -7,7 +7,6 @@ import {
 	ViewStyle,
 } from 'react-native';
 
-import { Caption13Up } from '../styles/text';
 import { EyeIcon } from '../styles/icons';
 import Money from './Money';
 import DetectSwipe from './DetectSwipe';
@@ -21,11 +20,9 @@ import {
 
 const ActivityHeader = ({
 	balance,
-	label,
 	style,
 }: {
 	balance: number;
-	label?: string;
 	style?: StyleProp<ViewStyle>;
 }): ReactElement => {
 	const dispatch = useAppDispatch();
@@ -40,7 +37,14 @@ const ActivityHeader = ({
 	return (
 		<View style={style}>
 			<View style={styles.label}>
-				<Caption13Up color="secondary">{label}</Caption13Up>
+				<Money
+					sats={balance}
+					unitType="secondary"
+					color="secondary"
+					size="caption13Up"
+					enableHide={true}
+					symbol={true}
+				/>
 			</View>
 
 			<DetectSwipe

diff --git a/src/components/BalanceHeader.tsx b/src/components/BalanceHeader.tsx
@@ -27,25 +27,33 @@ const BalanceHeader = (): ReactElement => {
 	return (
 		<View style={styles.container}>
 			<View style={styles.label}>
-				{pendingPaymentsBalance ? (
+				<Money
+					sats={totalBalance}
+					unitType="secondary"
+					color="secondary"
+					size="caption13Up"
+					enableHide={true}
+					symbol={true}
+				/>
+
+				{pendingPaymentsBalance !== 0 && (
 					<Trans
 						t={t}
 						i18nKey="balance_total_pending"
 						components={{
 							text: <Caption13Up color="secondary" />,
 							pending: (
 								<Money
+									sats={pendingPaymentsBalance}
+									unitType="secondary"
 									color="secondary"
 									size="caption13Up"
-									sats={pendingPaymentsBalance}
 									enableHide={true}
 									symbol={false}
 								/>
 							),
 						}}
 					/>
-				) : (
-					<Caption13Up color="secondary">{t('balance_total')}</Caption13Up>
 				)}
 			</View>
 

diff --git a/src/screens/Activity/ActivitySavings.tsx b/src/screens/Activity/ActivitySavings.tsx
@@ -71,10 +71,7 @@ const ActivitySavings = ({
 			</View>
 
 			<View style={styles.content}>
-				<ActivityHeader
-					label={t('activity_transfer_savings')}
-					balance={onchainBalance}
-				/>
+				<ActivityHeader balance={onchainBalance} />
 
 				{balanceInTransferToSavings !== 0 && (
 					<View style={styles.transfer}>

diff --git a/src/screens/Activity/ActivitySpending.tsx b/src/screens/Activity/ActivitySpending.tsx
@@ -59,10 +59,7 @@ const ActivitySpending = ({
 			</View>
 
 			<View style={styles.content}>
-				<ActivityHeader
-					label={t('activity_transfer_spending')}
-					balance={lightningBalance}
-				/>
+				<ActivityHeader balance={lightningBalance} />
 
 				{balanceInTransferToSpending !== 0 && (
 					<View style={styles.transfer}>

diff --git a/src/utils/i18n/locales/en/wallet.json b/src/utils/i18n/locales/en/wallet.json
@@ -5,11 +5,8 @@
 	"receive": {
 		"string": "Receive"
 	},
-	"balance_total": {
-		"string": "Total balance"
-	},
 	"balance_total_pending": {
-		"string": "<text>Total balance (</text><pending/><text> pending)</text>"
+		"string": "<text> (</text><pending/><text> pending)</text>"
 	},
 	"create_wallet_error": {
 		"string": "Please reopen the app and try again."
@@ -380,12 +377,6 @@
 	"activity_transfer": {
 		"string": "Transfer"
 	},
-	"activity_transfer_spending": {
-		"string": "Spending Balance"
-	},
-	"activity_transfer_savings": {
-		"string": "Savings Balance"
-	},
 	"activity_transfer_savings_pending": {
 		"string": "From Spending (±{duration})"
 	},