From 79a85db7e41940ac8d58732027d1ac7ec27779a5 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 19 Jan 2021 18:00:52 -0500 Subject: [PATCH] potential language changes --- static/app-strings.json | 11 +++++++++++ ui/component/walletBalance/view.jsx | 23 ++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/static/app-strings.json b/static/app-strings.json index 2a040b97f..4447f59d2 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -1558,5 +1558,16 @@ "Your wallet has a lot of change lying around. Consolidating will speed up your transactions. This could take some time. %now%%help%": "Your wallet has a lot of change lying around. Consolidating will speed up your transactions. This could take some time. %now%%help%", "Consolidating": "Consolidating", "Theater mode": "Theater mode", + "View more": "View more", + "Your total balance. Some of the %lbc% is in use on your channels and content right now.": "Your total balance. Some of the %lbc% is in use on your channels and content right now.", + "%lbc_amount% available balance": "%lbc_amount% available balance", + "%lbc_amount% currently in use": "%lbc_amount% currently in use", + "View less": "View less", + "Your total balance.": "Your total balance.", + "%lbc_amount% immediately spendable": "%lbc_amount% immediately spendable", + "%lbc_amount% contributing to content": "%lbc_amount% contributing to content", + "...earned from others (unlock to spend)": "...earned from others (unlock to spend)", + "...on initial publishes (delete or edit past content to spend)": "...on initial publishes (delete or edit past content to spend)", + "...supporting content (delete supports to spend)": "...supporting content (delete supports to spend)", "--end--": "--end--" } diff --git a/ui/component/walletBalance/view.jsx b/ui/component/walletBalance/view.jsx index 420b46071..0fcf56a9e 100644 --- a/ui/component/walletBalance/view.jsx +++ b/ui/component/walletBalance/view.jsx @@ -48,6 +48,7 @@ const WalletBalance = (props: Props) => { const { other: otherCount = 0 } = utxoCounts || {}; const totalBalance = balance + tipsBalance + supportsBalance + claimsBalance; + const totalLocked = tipsBalance + claimsBalance + supportsBalance; React.useEffect(() => { if (balance > LARGE_WALLET_BALANCE) { @@ -59,25 +60,29 @@ const WalletBalance = (props: Props) => { } subtitle={ - }}> - This is your total balance. Some of the %lbc% is in use on your channels and content right now. - + totalLocked > 0 ? ( + }}> + Your total balance. All of this is yours, but some %lbc% is in use on channels and content right now. + + ) : ( + {__('Your total balance.')} + ) } actions={ <>

}}> - %lbc_amount% available balance + %lbc_amount% immediately spendable

, + lbc_amount: , }} > - %lbc_amount% currently in use + %lbc_amount% contributing to content