From 42377a9d3dae70ff6bbbc447d15fcb590fda554e Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Tue, 20 Jun 2023 21:42:51 -0600 Subject: [wallet] DD37 fixes --- .../java/net/taler/wallet/transactions/TransactionDetailFragment.kt | 3 +++ .../taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt | 6 +++++- wallet/src/main/res/values/strings.xml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'wallet') diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt index d18d525..8f618ed 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt @@ -68,18 +68,21 @@ abstract class TransactionDetailFragment : Fragment() { private fun dialogTitle(t: TransactionAction): Int? = when (t) { Delete -> R.string.transactions_delete_dialog_title Abort -> R.string.transactions_abort_dialog_title + Fail -> R.string.transactions_fail_dialog_title else -> null } private fun dialogMessage(t: TransactionAction): Int? = when (t) { Delete -> R.string.transactions_delete_dialog_message Abort -> R.string.transactions_abort_dialog_message + Fail -> R.string.transactions_fail_dialog_message else -> null } private fun dialogButton(t: TransactionAction): Int? = when (t) { Delete -> R.string.transactions_delete Abort -> R.string.transactions_abort + Fail -> R.string.transactions_fail else -> null } diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt index 3102123..3b9b4a5 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt @@ -18,6 +18,7 @@ package net.taler.wallet.withdraw.manual import android.content.Intent import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -28,6 +29,7 @@ import androidx.navigation.fragment.findNavController import net.taler.common.startActivitySafe import net.taler.wallet.MainViewModel import net.taler.wallet.R +import net.taler.wallet.TAG import net.taler.wallet.compose.TalerSurface import net.taler.wallet.withdraw.WithdrawStatus @@ -51,7 +53,9 @@ class ManualWithdrawSuccessFragment : Fragment() { val tid = status.transactionId val onCancelClick = if (tid == null) null else { { - transactionManager.deleteTransaction(tid) + transactionManager.deleteTransaction(tid) { + Log.e(TAG, "Error deleteTransaction $it") + } findNavController().navigate(R.id.action_nav_exchange_manual_withdrawal_success_to_nav_main) } } diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index 4facfc8..d2ae879 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -96,6 +96,8 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card Are you sure you want to remove the selected transactions from your wallet? Abort Transaction Are you sure you want to abort this transaction? Funds still in transit might get lost. + Fail Transaction + Are you sure you want to fail this transaction? Funds still in transit might get lost. Are you sure you want to cancel this withdrawal? Funds still in transit might get lost. -- cgit v1.2.3