diff options
author | Torsten Grote <t@grobox.de> | 2023-07-11 14:06:51 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-07-11 14:06:51 -0300 |
commit | c4ee1c719d2b31e59be6788d7b2ccec95d39548a (patch) | |
tree | 4e7b4647d7742c335f1b041cfcd048717c1b2bff /wallet/src/main/java/net/taler/wallet/transactions | |
parent | 469360fb851236e4773a020b0938eca591d4f5f6 (diff) | |
download | taler-android-c4ee1c719d2b31e59be6788d7b2ccec95d39548a.tar.gz taler-android-c4ee1c719d2b31e59be6788d7b2ccec95d39548a.tar.bz2 taler-android-c4ee1c719d2b31e59be6788d7b2ccec95d39548a.zip |
[wallet] fix refund transaction after API change
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/transactions')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt | 12 | ||||
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt index 306febc..cd50be7 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt @@ -23,7 +23,6 @@ import android.view.ViewGroup import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.platform.ComposeView import net.taler.wallet.compose.TalerSurface -import net.taler.wallet.launchInAppBrowser import net.taler.wallet.refund.TransactionRefundComposable class TransactionRefundFragment : TransactionDetailFragment() { @@ -36,14 +35,9 @@ class TransactionRefundFragment : TransactionDetailFragment() { setContent { TalerSurface { val t = transactionManager.selectedTransaction.observeAsState().value - if (t is TransactionRefund) TransactionRefundComposable(t, devMode, - onFulfill = { url -> - launchInAppBrowser(requireContext(), url) - }, - onTransition = { - onTransitionButtonClicked(t, it) - } - ) + if (t is TransactionRefund) TransactionRefundComposable(t, devMode) { + onTransitionButtonClicked(t, it) + } } } } diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt index b6b3587..c6be73a 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt @@ -42,6 +42,7 @@ import net.taler.wallet.TAG import net.taler.wallet.backend.TalerErrorCode import net.taler.wallet.backend.TalerErrorInfo import net.taler.wallet.cleanExchange +import net.taler.wallet.refund.RefundPaymentInfo import net.taler.wallet.transactions.TransactionMajorState.None import net.taler.wallet.transactions.TransactionMajorState.Pending import net.taler.wallet.transactions.WithdrawalDetails.ManualTransfer @@ -254,7 +255,7 @@ class TransactionRefund( override val txState: TransactionState, override val txActions: List<TransactionAction>, val refundedTransactionId: String, - val info: TransactionInfo, + val paymentInfo: RefundPaymentInfo? = null, override val error: TalerErrorInfo? = null, override val amountRaw: Amount, override val amountEffective: Amount, @@ -265,7 +266,8 @@ class TransactionRefund( @Transient override val amountType = AmountType.Positive override fun getTitle(context: Context): String { - return context.getString(R.string.transaction_refund_from, info.merchant.name) + val merchantName = paymentInfo?.merchant?.name ?: "null" + return context.getString(R.string.transaction_refund_from, merchantName) } override val generalTitleRes = R.string.refund_title |