File tree Expand file tree Collapse file tree 1 file changed +23
-3
lines changed
app/src/main/java/to/bitkit/ui/screens/wallets/activity/components Expand file tree Collapse file tree 1 file changed +23
-3
lines changed Original file line number Diff line number Diff line change @@ -96,14 +96,34 @@ fun ActivityRow(
9696 is Activity .Lightning -> item.v1.message.ifEmpty { formattedTime(timestamp) }
9797 is Activity .Onchain -> {
9898 when {
99- isTransfer && isSent -> stringResource(R .string.wallet__activity_transfer_spending_done)
100- isTransfer && ! isSent -> stringResource(R .string.wallet__activity_transfer_savings_done)
99+ isTransfer && isSent -> {
100+ if (item.v1.confirmed) {
101+ stringResource(R .string.wallet__activity_transfer_spending_done)
102+ } else {
103+ stringResource(R .string.wallet__activity_transfer_spending_pending)
104+ .replace(" {duration}" , " 1h" ) // TODO: calculate confirmsIn text
105+ }
106+ }
107+
108+ isTransfer && ! isSent -> {
109+ if (item.v1.confirmed) {
110+ stringResource(R .string.wallet__activity_transfer_savings_done)
111+ } else {
112+ stringResource(R .string.wallet__activity_transfer_savings_pending)
113+ .replace(" {duration}" , " 1h" ) // TODO: calculate confirmsIn text
114+ }
115+ }
116+
101117 confirmed == true -> {
102118 formattedTime(timestamp)
103119 }
120+
104121 else -> {
105122 // TODO: calculate confirmsIn text
106- stringResource(R .string.wallet__activity_confirms_in).replace(" {feeRateDescription}" , " ± 1h" )
123+ stringResource(R .string.wallet__activity_confirms_in).replace(
124+ " {feeRateDescription}" ,
125+ " ± 1h"
126+ )
107127 }
108128 }
109129 }
You can’t perform that action at this time.
0 commit comments