add one more check to compare current and target state

wireapp · Jul 10, 2024 · 02d742a · 02d742a
1 parent 93bfb0e
commit 02d742a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/navigation/WaitUntilTransitionEndsWrapper.kt b/app/src/main/kotlin/com/wire/android/navigation/WaitUntilTransitionEndsWrapper.kt
@@ -40,8 +40,10 @@ object WaitUntilTransitionEndsWrapper : DestinationWrapper {
     override fun <T> DestinationScope<T>.Wrap(screenContent: @Composable () -> Unit) {
         (this as? AnimatedDestinationScope<T>)?.let {
             var transitionComplete by remember { mutableStateOf(false) }
-            LaunchedEffect(transition.isRunning, transition.currentState) {
-                transitionComplete = !transition.isRunning && transition.currentState == EnterExitState.Visible
+            LaunchedEffect(transition.isRunning, transition.currentState, transition.targetState) {
+                with(transition) {
+                    transitionComplete = !isRunning && currentState == targetState && currentState == EnterExitState.Visible
+                }
             }
             screenContent()
             if (!transitionComplete) {