navigation back crash fixed

app/build.gradle.kts

@@ -43,8 +43,8 @@ android {
             dimension = "env"
             applicationIdSuffix = ".uat"
             versionNameSuffix = "-UAT"
-            versionCode = 11
+            versionCode = 12
-            versionName = "2.9"
+            versionName = "3.0"
             buildConfigField("String", "ENV", "\"UAT\"")
             resValue("string", "app_name", "MOB-UAT")
         }

app/src/main/java/com/mob/utsmyanmar/ui/components/appbar/AppBar.kt

@@ -5,14 +5,14 @@ import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.dropUnlessResumed
 import com.mob.utsmyanmar.ui.theme.Color
-import com.mob.utsmyanmar.ui.theme.Primary
 import com.mob.utsmyanmar.ui.theme.White
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -35,7 +35,7 @@ fun AppBar(
         navigationIcon = {
             if (icon != null && onIconClick != null) {
                 IconButton(
-                    onClick = onIconClick
+                    onClick = dropUnlessResumed { onIconClick() }
                 ) {
                     Icon(
                         imageVector = icon,

app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt

@@ -130,7 +130,7 @@ fun buildMenuItems(
             )
         }) { onNavigateAction("Pre-Auth Complete Void") },
     DashboardMenuItem(
-        "Cash Out",
+        "Cash Adv",
         {
             Icon(
                 Icons.Default.AccountBalanceWallet,
@@ -138,5 +138,5 @@ fun buildMenuItems(
                 modifier = Modifier.size(32.dp),
                 tint = Color.LegacyRed
             )
-        }) { onNavigateAmount("Cash Out") },
+        }) { onNavigateAmount("Cash Adv") },
 )

app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt

@@ -115,7 +115,7 @@ private fun formatTypeLabel(raw: String): String = when {
     raw.contains("REFUND", ignoreCase = true) -> "Refund"
     raw.contains("SETTLEMENT", ignoreCase = true) -> "Settlement"
     raw.contains("PRE", ignoreCase = true) -> "Pre-Auth"
-    raw.contains("CASH", ignoreCase = true) -> "Cash Out"
+    raw.contains("CASH", ignoreCase = true) -> "Cash Adv"
     raw.contains("WAVE", ignoreCase = true) -> "Wave Pay"
     else -> raw.lowercase().replaceFirstChar { it.uppercaseChar() }
 }

app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt

@@ -51,7 +51,7 @@ fun SeeMoreScreen(
         SeeMoreItem("Pre-Auth Void", Icons.Default.LockOpen),
         SeeMoreItem("Pre-Auth Complete", Icons.Default.CreditCard),
         SeeMoreItem("Pre-Auth Complete Void", Icons.Default.SwapHoriz),
-        SeeMoreItem("Cash Out", Icons.Default.AccountBalanceWallet)
+        SeeMoreItem("Cash Adv", Icons.Default.AccountBalanceWallet)
     )
 
     Scaffold(

app/src/main/java/com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt

@@ -74,7 +74,7 @@ private fun String.toTransactionConfig(): TransactionConfig {
             processCode = ProcessCode.PRE_AUTH_COMPLETE_VOID + ProcessCode.SMART + ProcessCode.TO_ACCOUNT
         )
 
-        "cash out" -> TransactionConfig(
+        "cash adv" -> TransactionConfig(
             transactionName = "CASH_OUT",
             transactionType = TransactionsType.CASH_OUT,
             processCode = ProcessCode.CASH_ADVANCE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT

app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt

@@ -150,7 +150,7 @@ fun AppNavGraph(
                 onNavigateAmount = { action ->
                     when (action) {
                         "Pre-Auth",
-                        "Cash Out",
+                        "Cash Adv",
                         "Sale" -> {
                             navController.navigate(Routes.Amount.createRoute(action)) {
                                 launchSingleTop = true
@@ -158,7 +158,7 @@ fun AppNavGraph(
                         }
 
                         "Pre-Auth",
-                        "Cash Out" -> {
+                        "Cash Adv" -> {
                             navController.navigate(Routes.Amount.createRoute(action)) {
                                 launchSingleTop = true
                             }
@@ -191,7 +191,7 @@ fun AppNavGraph(
                         }
 
                         "Pre-Auth",
-                        "Cash Out" -> {
+                        "Cash Adv" -> {
                             sharedViewModel.transactionsType.value = when (action) {
                                 "Pre-Auth" -> TransactionsType.PRE_AUTH_SALE
                                 else -> TransactionsType.CASH_OUT
@@ -286,7 +286,7 @@ fun AppNavGraph(
                         }
 
                         "Pre-Auth",
-                        "Cash Out" -> {
+                        "Cash Adv" -> {
                             sharedViewModel.transactionsType.value = when (action) {
                                 "Pre-Auth" -> TransactionsType.PRE_AUTH_SALE
                                 else -> TransactionsType.CASH_OUT

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java

@@ -38,8 +38,8 @@ public class SystemParamsSettings implements Serializable {
 
     private boolean checkExpSwitch = false;
 
-    private String tmsAddress = "http://posuat.myanmarorientalbank.com:5033/api/v1";
+//    private String tmsAddress = "https://posmgmt.myanmarorientalbank.com/api/v1";
-//    private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1";
+    private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1";
 //    private String tmsAddress = "http://128.199.170.203";
 
     private String terminalCapability = "E0E8C8";
@@ -55,6 +55,7 @@ public class SystemParamsSettings implements Serializable {
 
     private String merchantName = "";
 
+
     private String receiptHeader = "";
 
     private String merchantAddress = "";