fix: ensure proper cleanup of TransactionStateFragment (#5206)

MixinNetwork · Dec 20, 2024 · 5d966de · 5d966de
1 parent 0c6e76a
commit 5d966de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
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
@@ -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
@@ -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)