fix: allow token selection to finish before popping back

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SelectTokenScreen.kt

@@ -67,6 +67,7 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS
                     .launchIn(this)
             }
 
+            // handle the cases where we are inserted in a flow to select a token
             LaunchedEffect(viewModel) {
                 viewModel.eventFlow
                     .filterIsInstance<SelectTokenViewModel.Event.OnTokenSelected>()
@@ -75,7 +76,7 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS
                     .onEach { token ->
                         when (purpose) {
                             TokenPurpose.Balance -> Unit
-                            TokenPurpose.Select -> navigator.pop()
+                            TokenPurpose.Select -> Unit
                             TokenPurpose.Withdraw -> {
                                 navigator.push(
                                     ScreenRegistry.get(Amount(token))
@@ -89,6 +90,14 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS
                         }
                     }.launchIn(this)
             }
+
+            // handle the case where we are changing the selected token
+            LaunchedEffect(viewModel) {
+                viewModel.eventFlow
+                    .filterIsInstance<SelectTokenViewModel.Event.OnTokenChanged>()
+                    .onEach { navigator.pop() }
+                    .launchIn(this)
+            }
         }
     }
 }

apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt

@@ -66,6 +66,8 @@ class SelectTokenViewModel @Inject constructor(
 
         data class OnTokenSelected(val mint: Mint, val fromUser: Boolean = true): Event
 
+        data object OnTokenChanged: Event
+
         data object OnAddCashClicked: Event
         data object OpenOnRampAmountModal: Event
         data class OpenScreen(val route: AppRoute): Event
@@ -151,6 +153,7 @@ class SelectTokenViewModel @Inject constructor(
             .filter { it.fromUser }
             .map { it.mint }
             .onEach { tokenController.selectToken(it) }
+            .onEach { dispatchEvent(Event.OnTokenChanged) }
             .launchIn(viewModelScope)
     }
 
@@ -166,6 +169,7 @@ class SelectTokenViewModel @Inject constructor(
                 is Event.OnPurposeChanged -> { state -> state.copy(purpose = event.purpose) }
                 is Event.OnTokensUpdated -> { state -> state.copy(tokens = event.tokens) }
                 is Event.OnTokenSelected -> { state -> state.copy(selectedToken = event.mint) }
+                is Event.OnTokenChanged -> { state -> state }
                 is Event.OnAddCashClicked -> { state -> state }
                 is Event.OpenOnRampAmountModal -> { state -> state }
                 is Event.OpenScreen -> { state -> state }