From f3ee2aef4cd90baa806c7705f9f6265b5c865755 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Sun, 28 Jun 2026 23:05:59 +0630 Subject: [PATCH] re-connected route without password currently --- .../ui/dashboard/DashboardScreen.kt | 18 ++++---- .../utsmyanmar/ui/navigation/AppNavGraph.kt | 41 ++++++++++++++++--- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt index 2a56317..4fe334a 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt @@ -690,15 +690,15 @@ private fun buildMenuItems( tint = Color.LegacyRed ) }) { onNavigateAmount("Sale") }, - DashboardMenuItem( - "MMQR", - { - Image( - painter = painterResource(R.drawable.ic_mmqr_logo), - contentDescription = null, - modifier = Modifier.height(48.dp) - ) - }) { }, +// DashboardMenuItem( +// "MMQR", +// { +// Image( +// painter = painterResource(R.drawable.ic_mmqr_logo), +// contentDescription = null, +// modifier = Modifier.height(48.dp) +// ) +// }) { }, DashboardMenuItem( "History", { diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt b/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt index efb3ef1..dfb5352 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt @@ -82,15 +82,44 @@ fun AppNavGraph( transProcessViewModel.resetTransactionStatus() DashboardScreen2( onNavigateAmount = { action -> - if(action == "Sale"){ - sharedViewModel.transactionsType.value = TransactionsType.SALE; - sharedViewModel.processCode.value = ProcessCode.SALE_PURCHASE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT; - } + when (action) { + "Sale" -> { + sharedViewModel.transactionsType.value = TransactionsType.SALE + sharedViewModel.processCode.value = ProcessCode.SALE_PURCHASE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT + navController.navigate(Routes.Amount.createRoute(action)) { + launchSingleTop = true + } + } - navController.navigate(Routes.Amount.createRoute(action)) { - launchSingleTop = true + else -> { + navController.navigate(Routes.Amount.createRoute(action)) { + launchSingleTop = true + } + } } + }, + onNavigateAction = { action -> + when (action) { + "Void" -> { + sharedViewModel.transactionsType.value = TransactionsType.VOID + navController.navigate(Routes.VoidTrace.route) { + launchSingleTop = true + } + } + "Pre-Auth Complete Void" -> { + sharedViewModel.transactionsType.value = TransactionsType.PRE_AUTH_COMPLETE_VOID + navController.navigate(Routes.VoidTrace.route) { + launchSingleTop = true + } + } + + else -> { + navController.navigate(Routes.Amount.createRoute(action)) { + launchSingleTop = true + } + } + } }, onNavigateSignOn = { navController.navigate(Routes.SignOn.route) {