fix(send): allow to nav back from pin to confirm screen

Author: ovitrif

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt

@@ -25,6 +25,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -95,9 +96,9 @@ fun SendConfirmScreen(
     onNavigateToPin: () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
-    // TODO handle loading via uiState?
     var isLoading by rememberSaveable { mutableStateOf(false) }
     var showBiometrics by remember { mutableStateOf(false) }
+    val currentOnEvent by rememberUpdatedState(onEvent)
 
     val settings = settingsViewModel ?: return
     val isPinEnabled by settings.isPinEnabled.collectAsStateWithLifecycle()
@@ -115,18 +116,22 @@ fun SendConfirmScreen(
             }
     }
 
-    // Handle pay confirm with auth check if needed
+    // Confirm with pin or bio if required
     LaunchedEffect(uiState.shouldConfirmPay) {
-        if (uiState.shouldConfirmPay) {
-            if (isPinEnabled && pinForPayments) {
-                if (isBiometricEnabled && isBiometrySupported) {
-                    showBiometrics = true
-                } else {
-                    onNavigateToPin()
-                }
+        if (!uiState.shouldConfirmPay) {
+            isLoading = false
+            return@LaunchedEffect
+        }
+
+        if (isPinEnabled && pinForPayments) {
+            currentOnEvent(SendEvent.ClearPayConfirmation)
+            if (isBiometricEnabled && isBiometrySupported) {
+                showBiometrics = true
             } else {
-                onEvent(SendEvent.PayConfirmed)
+                onNavigateToPin()
             }
+        } else {
+            currentOnEvent(SendEvent.PayConfirmed)
         }
     }
 

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -294,6 +294,7 @@ class AppViewModel @Inject constructor(
                     is SendEvent.ConfirmAmountWarning -> onConfirmAmountWarning(it.warning)
                     SendEvent.DismissAmountWarning -> onDismissAmountWarning()
                     SendEvent.PayConfirmed -> onConfirmPay()
+                    SendEvent.ClearPayConfirmation -> _sendUiState.update { it.copy(shouldConfirmPay = false) }
                     SendEvent.BackToAmount -> setSendEffect(SendEffect.PopBack(SendRoute.Amount))
                     SendEvent.NavToAddress -> setSendEffect(SendEffect.NavigateToAddress)
                 }
@@ -1586,6 +1587,7 @@ sealed interface SendEvent {
     data class ConfirmAmountWarning(val warning: SanityWarning) : SendEvent
     data object DismissAmountWarning : SendEvent
     data object PayConfirmed : SendEvent
+    data object ClearPayConfirmation : SendEvent
     data object BackToAmount : SendEvent
     data object NavToAddress : SendEvent
 }