refactor: replace backStackEntry with it

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -736,14 +736,14 @@ private fun NavGraphBuilder.shop(
             }
         )
     }
-    composableWithDefaultTransitions<Routes.ShopWebView> { backStackEntry ->
+    composableWithDefaultTransitions<Routes.ShopWebView> {
         ShopWebViewScreen (
             onClose = { navController.navigateToHome() },
             onBack = { navController.popBackStack() },
-            page = backStackEntry.toRoute<Routes.ShopWebView>().page,
-            title = backStackEntry.toRoute<Routes.ShopWebView>().title,
+            page = it.toRoute<Routes.ShopWebView>().page,
+            title = it.toRoute<Routes.ShopWebView>().title,
             onPaymentIntent = { data ->
-               appViewModel.onScanSuccess(data)
+                appViewModel.onScanSuccess(data)
             }
         )
     }
@@ -831,8 +831,8 @@ private fun NavGraphBuilder.changePinNew(navController: NavHostController) {
 }
 
 private fun NavGraphBuilder.changePinConfirm(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.ChangePinConfirm> { backStackEntry ->
-        val route = backStackEntry.toRoute<Routes.ChangePinConfirm>()
+    composableWithDefaultTransitions<Routes.ChangePinConfirm> {
+        val route = it.toRoute<Routes.ChangePinConfirm>()
         ChangePinConfirmScreen(
             newPin = route.newPin,
             navController = navController,
@@ -895,9 +895,9 @@ private fun NavGraphBuilder.channelOrdersSettings(
 private fun NavGraphBuilder.orderDetailSettings(
     navController: NavHostController,
 ) {
-    composableWithDefaultTransitions<Routes.OrderDetail> { backStackEntry ->
+    composableWithDefaultTransitions<Routes.OrderDetail> {
         OrderDetailScreen(
-            orderItem = backStackEntry.toRoute(),
+            orderItem = it.toRoute(),
             onBackClick = { navController.popBackStack() },
         )
     }
@@ -906,9 +906,9 @@ private fun NavGraphBuilder.orderDetailSettings(
 private fun NavGraphBuilder.cjitDetailSettings(
     navController: NavHostController,
 ) {
-    composableWithDefaultTransitions<Routes.CjitDetail> { backStackEntry ->
+    composableWithDefaultTransitions<Routes.CjitDetail> {
         CJitDetailScreen(
-            cjitItem = backStackEntry.toRoute(),
+            cjitItem = it.toRoute(),
             onBackClick = { navController.popBackStack() },
         )
     }
@@ -948,19 +948,19 @@ private fun NavGraphBuilder.activityItem(
     activityListViewModel: ActivityListViewModel,
     navController: NavHostController,
 ) {
-    composableWithDefaultTransitions<Routes.ActivityDetail> { backStackEntry ->
+    composableWithDefaultTransitions<Routes.ActivityDetail> {
         ActivityDetailScreen(
             listViewModel = activityListViewModel,
-            route = backStackEntry.toRoute(),
+            route = it.toRoute(),
             onExploreClick = { id -> navController.navigateToActivityExplore(id) },
             onBackClick = { navController.popBackStack() },
             onCloseClick = { navController.navigateToHome() },
         )
     }
-    composableWithDefaultTransitions<Routes.ActivityExplore> { backStackEntry ->
+    composableWithDefaultTransitions<Routes.ActivityExplore> {
         ActivityExploreScreen(
             listViewModel = activityListViewModel,
-            route = backStackEntry.toRoute(),
+            route = it.toRoute(),
             onBackClick = { navController.popBackStack() },
             onCloseClick = { navController.navigateToHome() },
         )
@@ -987,8 +987,8 @@ private fun NavGraphBuilder.qrScanner(
 private fun NavGraphBuilder.authCheck(
     navController: NavHostController,
 ) {
-    composable<Routes.AuthCheck> { backStackEntry ->
-        val route = backStackEntry.toRoute<Routes.AuthCheck>()
+    composable<Routes.AuthCheck> {
+        val route = it.toRoute<Routes.AuthCheck>()
         AuthCheckScreen(
             route = route,
             navController = navController,
@@ -1002,8 +1002,8 @@ private fun NavGraphBuilder.logs(
     composableWithDefaultTransitions<Routes.Logs> {
         LogsScreen(navController)
     }
-    composableWithDefaultTransitions<Routes.LogDetail> { backStackEntry ->
-        val route = backStackEntry.toRoute<Routes.LogDetail>()
+    composableWithDefaultTransitions<Routes.LogDetail> {
+        val route = it.toRoute<Routes.LogDetail>()
         LogDetailScreen(
             navController = navController,
             fileName = route.fileName,

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

@@ -128,13 +128,13 @@ fun SendOptionsView(
                     onContinue = { utxos -> appViewModel.setSendEvent(SendEvent.CoinSelectionContinue(utxos)) },
                 )
             }
-            composableWithDefaultTransitions<SendRoute.ReviewAndSend> { backStackEntry ->
+            composableWithDefaultTransitions<SendRoute.ReviewAndSend> {
                 val uiState by appViewModel.sendUiState.collectAsStateWithLifecycle()
                 SendAndReviewScreen(
-                    savedStateHandle = backStackEntry.savedStateHandle,
+                    savedStateHandle = it.savedStateHandle,
                     uiState = uiState,
                     onBack = { navController.popBackStack() },
-                    onEvent = { appViewModel.setSendEvent(it) },
+                    onEvent = { e -> appViewModel.setSendEvent(e) },
                     onClickAddTag = { navController.navigate(SendRoute.AddTag) },
                     onClickTag = { tag -> appViewModel.removeTag(tag) },
                     onNavigateToPin = { navController.navigate(SendRoute.PinCheck) },
@@ -182,7 +182,7 @@ fun SendOptionsView(
                     },
                 )
             }
-            composableWithDefaultTransitions<SendRoute.QuickPay> { backStackEntry ->
+            composableWithDefaultTransitions<SendRoute.QuickPay> {
                 val quickPayData by appViewModel.quickPayData.collectAsStateWithLifecycle()
                 QuickPaySendScreen(
                     quickPayData = requireNotNull(quickPayData),
@@ -194,8 +194,8 @@ fun SendOptionsView(
                     }
                 )
             }
-            composableWithDefaultTransitions<SendRoute.Error> { backStackEntry ->
-                val route = backStackEntry.toRoute<SendRoute.Error>()
+            composableWithDefaultTransitions<SendRoute.Error> {
+                val route = it.toRoute<SendRoute.Error>()
                 SendErrorScreen(
                     errorMessage = route.errorMessage,
                     onRetry = {

app/src/main/java/to/bitkit/ui/settings/pin/PinNavigationSheet.kt

@@ -43,13 +43,11 @@ fun PinNavigationSheet(
                     onBack = { navController.popBackStack() },
                 )
             }
-            composable<PinRoute.ConfirmPin> { backStackEntry ->
-                val route = backStackEntry.toRoute<PinRoute.ConfirmPin>()
+            composable<PinRoute.ConfirmPin> {
+                val route = it.toRoute<PinRoute.ConfirmPin>()
                 ConfirmPinScreen(
                     originalPin = route.pin,
-                    onPinConfirmed = {
-                        navController.navigate(PinRoute.AskForBiometrics)
-                    },
+                    onPinConfirmed = { navController.navigate(PinRoute.AskForBiometrics) },
                     onBack = { navController.popBackStack() },
                 )
             }
@@ -62,8 +60,8 @@ fun PinNavigationSheet(
                     onBack = onDismiss,
                 )
             }
-            composable<PinRoute.Result> { backStackEntry ->
-                val route = backStackEntry.toRoute<PinRoute.Result>()
+            composable<PinRoute.Result> {
+                val route = it.toRoute<PinRoute.Result>()
                 PinResultScreen(
                     isBioOn = route.isBioOn,
                     onDismiss = onDismiss,