amounts-without-currency-specification.diff (7692B)
1 diff --git a/wallet/src/main/java/net/taler/wallet/transfer/ScreenTransfer.kt b/wallet/src/main/java/net/taler/wallet/transfer/ScreenTransfer.kt 2 index 940fc43a..5ba1db28 100644 3 --- a/wallet/src/main/java/net/taler/wallet/transfer/ScreenTransfer.kt 4 +++ b/wallet/src/main/java/net/taler/wallet/transfer/ScreenTransfer.kt 5 @@ -135,17 +135,20 @@ fun ScreenTransfer( 6 transfer = transfer, 7 transactionAmountEffective = transfer.amountEffective.withSpec(spec), 8 transferContext = transferContext, 9 + spec = spec, 10 ) 11 12 is TransferData.IBAN -> TransferIBAN( 13 transfer = transfer, 14 transactionAmountEffective = transfer.amountEffective.withSpec(spec), 15 transferContext = transferContext, 16 + spec = spec, 17 ) 18 19 is TransferData.Cyclos -> TransferCyclos( 20 transfer = transfer, 21 transactionAmountEffective = transfer.amountEffective.withSpec(spec), 22 + spec = spec, 23 ) 24 25 is TransferData.Bitcoin -> TransferBitcoin( 26 diff --git a/wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt b/wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt 27 index 159fa43c..e1c72909 100644 28 --- a/wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt 29 +++ b/wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt 30 @@ -27,6 +27,7 @@ import androidx.compose.ui.Modifier 31 import androidx.compose.ui.res.stringResource 32 import androidx.compose.ui.unit.dp 33 import net.taler.common.Amount 34 +import net.taler.common.CurrencySpecification 35 import net.taler.wallet.R 36 import net.taler.wallet.compose.WarningLabel 37 import net.taler.wallet.withdraw.TransferData 38 @@ -36,6 +37,7 @@ fun TransferCyclos( 39 transfer: TransferData.Cyclos, 40 transactionAmountEffective: Amount, 41 // TODO: transferContext? 42 + spec: CurrencySpecification?, 43 ) { 44 Column( 45 modifier = Modifier.padding(all = 16.dp), 46 @@ -44,7 +46,7 @@ fun TransferCyclos( 47 Text( 48 stringResource( 49 R.string.withdraw_manual_ready_intro, 50 - transfer.transferAmount, 51 + transfer.transferAmount.withSpec(spec), 52 transactionAmountEffective, 53 ), 54 style = MaterialTheme.typography.bodyLarge, 55 @@ -72,7 +74,7 @@ fun TransferCyclos( 56 ) 57 58 WithdrawalAmountTransfer( 59 - conversionAmountRaw = transfer.transferAmount, 60 + conversionAmountRaw = transfer.transferAmount.withSpec(spec), 61 ) 62 63 TransferStep(2, stringResource(R.string.withdraw_manual_step_subject)) 64 @@ -94,7 +96,7 @@ fun TransferCyclos( 65 TransferStep(3, 66 stringResource( 67 R.string.withdraw_manual_step_finish, 68 - transfer.transferAmount, 69 + transfer.transferAmount.withSpec(spec), 70 ), 71 ) 72 } 73 diff --git a/wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt b/wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt 74 index dc9ad5c8..dfc11ea6 100644 75 --- a/wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt 76 +++ b/wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt 77 @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier 78 import androidx.compose.ui.res.stringResource 79 import androidx.compose.ui.unit.dp 80 import net.taler.common.Amount 81 +import net.taler.common.CurrencySpecification 82 import net.taler.common.TalerUtils 83 import net.taler.wallet.R 84 import net.taler.wallet.accounts.PaytoUri 85 @@ -44,6 +45,7 @@ fun TransferIBAN( 86 transfer: TransferData.IBAN, 87 transactionAmountEffective: Amount, 88 transferContext: TransferContext, 89 + spec: CurrencySpecification?, 90 ) { 91 Column( 92 modifier = Modifier.padding(all = 16.dp), 93 @@ -53,7 +55,7 @@ fun TransferIBAN( 94 text = when(transferContext) { 95 ManualWithdrawal -> stringResource( 96 R.string.withdraw_manual_ready_intro, 97 - transfer.transferAmount, 98 + transfer.transferAmount.withSpec(spec), 99 transactionAmountEffective, 100 ) 101 102 @@ -62,7 +64,7 @@ fun TransferIBAN( 103 if (paytoIban !is PaytoUriIban) return@Column // TODO: render error 104 stringResource( 105 R.string.send_deposit_kyc_auth_intro_bank, 106 - transfer.transferAmount, 107 + transfer.transferAmount.withSpec(spec), 108 paytoIban.iban, 109 ) 110 } 111 @@ -123,7 +125,7 @@ fun TransferIBAN( 112 } 113 114 WithdrawalAmountTransfer( 115 - conversionAmountRaw = transfer.transferAmount, 116 + conversionAmountRaw = transfer.transferAmount.withSpec(spec), 117 ) 118 119 TransferStep(2, stringResource(R.string.withdraw_manual_step_subject)) 120 @@ -149,12 +151,12 @@ fun TransferIBAN( 121 when (transferContext) { 122 ManualWithdrawal -> stringResource( 123 R.string.withdraw_manual_step_finish, 124 - transfer.transferAmount, 125 + transfer.transferAmount.withSpec(spec), 126 ) 127 128 is DepositKycAuth -> stringResource( 129 R.string.send_deposit_kyc_auth_step_finish, 130 - transfer.transferAmount, 131 + transfer.transferAmount.withSpec(spec), 132 transfer.iban, 133 ) 134 } 135 diff --git a/wallet/src/main/java/net/taler/wallet/transfer/TransferTaler.kt b/wallet/src/main/java/net/taler/wallet/transfer/TransferTaler.kt 136 index 6bcfaf98..5a36cb9d 100644 137 --- a/wallet/src/main/java/net/taler/wallet/transfer/TransferTaler.kt 138 +++ b/wallet/src/main/java/net/taler/wallet/transfer/TransferTaler.kt 139 @@ -27,6 +27,7 @@ import androidx.compose.ui.Modifier 140 import androidx.compose.ui.res.stringResource 141 import androidx.compose.ui.unit.dp 142 import net.taler.common.Amount 143 +import net.taler.common.CurrencySpecification 144 import net.taler.wallet.R 145 import net.taler.wallet.accounts.PaytoUri 146 import net.taler.wallet.accounts.PaytoUriTalerBank 147 @@ -40,6 +41,7 @@ fun TransferTaler( 148 transfer: TransferData.Taler, 149 transactionAmountEffective: Amount, 150 transferContext: TransferContext, 151 + spec: CurrencySpecification?, 152 ) { 153 Column( 154 modifier = Modifier.padding(all = 16.dp), 155 @@ -49,7 +51,7 @@ fun TransferTaler( 156 text = when (transferContext) { 157 ManualWithdrawal -> stringResource( 158 R.string.withdraw_manual_ready_intro, 159 - transfer.transferAmount, 160 + transfer.transferAmount.withSpec(spec), 161 transactionAmountEffective, 162 ) 163 164 @@ -58,7 +60,7 @@ fun TransferTaler( 165 if (paytoTaler !is PaytoUriTalerBank) return@Column // TODO: render error 166 stringResource( 167 R.string.send_deposit_kyc_auth_intro_bank, 168 - transfer.transferAmount, 169 + transfer.transferAmount.withSpec(spec), 170 paytoTaler.account, 171 ) 172 } 173 @@ -108,7 +110,7 @@ fun TransferTaler( 174 DetailRow(stringResource(R.string.withdraw_exchange), cleanExchange(transfer.exchangeBaseUrl)) 175 176 WithdrawalAmountTransfer( 177 - conversionAmountRaw = transfer.transferAmount, 178 + conversionAmountRaw = transfer.transferAmount.withSpec(spec), 179 ) 180 } 181 } 182 \ No newline at end of file