Skip to content

Commit 420c9d8

Browse files
committed
Merge remote-tracking branch 'origin/develop' into HEAD
* origin/develop: fix(bill/exit): await for full settle before enabling cancel
2 parents 0ed5487 + a68ba83 commit 420c9d8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • app/src/main/java/com/getcode/view/main/home

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ private fun BillContainer(
450450

451451
LaunchedEffect(transition.isRunning, transition.targetState) {
452452
// wait for spring settle to enable cancel to not prematurely cancel
453-
// the enter. doing so causing the exit of the bill to not run
454-
if (transition.targetState == EnterExitState.Visible && !transition.isRunning) {
453+
// the enter. doing so causing the exit of the bill to not run, or run its own dismiss animation
454+
if (transition.targetState == EnterExitState.Visible && transition.currentState == transition.targetState) {
455455
delay(300)
456456
canCancel = true
457457
}

0 commit comments

Comments
 (0)