Skip to content

Commit 7c4d8e9

Browse files
committed
fix: navigate to home or transact tab based on the initial flow
1 parent 65ef251 commit 7c4d8e9

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

androidApp/src/main/java/com/blockstream/green/utils/DeepLinkHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object DeepLinkHandler : Loggable() {
3131
private fun handleRedirect(uri: Uri, mainViewModel: MainViewModel): Boolean {
3232
return when (uri.path) {
3333
"/transactions" -> {
34-
mainViewModel.postEvent(Events.EventSideEffect(sideEffect = SideEffects.NavigateToTransactTab))
34+
mainViewModel.postEvent(Events.EventSideEffect(sideEffect = SideEffects.NavigateAfterSendTransaction))
3535
true
3636
}
3737

common/src/commonMain/kotlin/com/blockstream/common/models/send/CreateTransactionViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ abstract class CreateTransactionViewModelAbstract(
477477

478478
session.pendingTransaction = null // clear pending transaction
479479
postSideEffect(SideEffects.Snackbar(StringHolder.create(Res.string.id_transaction_sent)))
480-
postSideEffect(SideEffects.NavigateToTransactTab)
480+
postSideEffect(SideEffects.NavigateAfterSendTransaction)
481481
} else {
482482
postSideEffect(
483483
SideEffects.Dialog(

common/src/commonMain/kotlin/com/blockstream/common/sideeffects/SideEffects.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ object SideEffects {
4848
val supportData: SupportData? = null,
4949
) : SideEffect
5050

51-
data object NavigateToTransactTab : SideEffect
51+
data object NavigateAfterSendTransaction : SideEffect
5252
data class NavigateToRoot(val popTo: PopTo? = null) : SideEffect
5353
object CloseDrawer : SideEffect
5454
data class TransactionSent(val data: ProcessedTransactionDetails) : SideEffect

compose/src/commonMain/kotlin/com/blockstream/compose/utils/SideEffects.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -352,22 +352,14 @@ fun HandleSideEffect(
352352
}
353353
}
354354

355-
is SideEffects.NavigateToTransactTab -> {
355+
is SideEffects.NavigateAfterSendTransaction -> {
356356
viewModel.greenWalletOrNull?.also { greenWallet ->
357357
while (navigator.currentBackStack.value.size > 2 && navigator.currentBackStackEntry?.destination?.hasRoute(
358358
NavigateDestinations.Transact::class
359359
) != true
360360
) {
361361
navigator.navigateUp()
362362
}
363-
364-
if (navigator.currentBackStackEntry?.destination?.hasRoute(NavigateDestinations.Transact::class) != true) {
365-
navigator.navigate(
366-
NavigateDestinations.Transact(
367-
greenWallet = greenWallet
368-
)
369-
)
370-
}
371363
}
372364
}
373365

0 commit comments

Comments
 (0)