From 5d966deedd579da64797d9317199a9da6a1ccf2e Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Fri, 20 Dec 2024 15:13:54 +0800 Subject: [PATCH] fix: ensure proper cleanup of TransactionStateFragment (#5206) --- .../one/mixin/android/ui/home/web3/stake/UnstakeFragment.kt | 3 +++ .../java/one/mixin/android/ui/home/web3/swap/SwapFragment.kt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/stake/UnstakeFragment.kt b/app/src/main/java/one/mixin/android/ui/home/web3/stake/UnstakeFragment.kt index c0edd34ae2..e5a88e6ddc 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/stake/UnstakeFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/stake/UnstakeFragment.kt @@ -103,6 +103,9 @@ class UnstakeFragment : BaseFragment() { setCloseAction { parentFragmentManager.popBackStackImmediate() parentFragmentManager.popBackStackImmediate() + parentFragmentManager.findFragmentByTag(TransactionStateFragment.TAG)?.let { fragment -> + parentFragmentManager.beginTransaction().remove(fragment).commitNowAllowingStateLoss() + } } } navTo(txStateFragment, TransactionStateFragment.TAG) diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/swap/SwapFragment.kt b/app/src/main/java/one/mixin/android/ui/home/web3/swap/SwapFragment.kt index 0f57f6d455..036b13e0e0 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/swap/SwapFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/swap/SwapFragment.kt @@ -339,6 +339,9 @@ class SwapFragment : BaseFragment() { setCloseAction { navigateUp(navController) parentFragmentManager.popBackStackImmediate() + parentFragmentManager.findFragmentByTag(TransactionStateFragment.TAG)?.let { fragment -> + parentFragmentManager.beginTransaction().remove(fragment).commitNowAllowingStateLoss() + } } } navTo(txStateFragment, TransactionStateFragment.TAG)