Address second round of Sentry Bot comments

Author: 0xadam-brown

sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav2/Nav2ComposeRoutes.kt

@@ -133,10 +133,11 @@ internal fun Nav2ComposeApp(
     shareSheetProductId.value = null
   }
 
-  fun resetToHome() {
-    backStack.resetTo(Home)
+  fun resetToRoot() {
+    val root = if (selectedScenario == Nav2Scenario.CUSTOM) Custom else Home
+    backStack.resetTo(root)
     shareSheetProductId.value = null
-    navController.navigate(Home.route) {
+    navController.navigate(root.route) {
       popUpTo(Home.route) { inclusive = false }
       launchSingleTop = true
     }
@@ -324,7 +325,7 @@ internal fun Nav2ComposeApp(
             Nav2ComposeConfirmationRoute(
               routeSpec = RouteSpecs.confirmation,
               orderId = entry.arguments?.getString(NavArgs.ORDER_ID).orEmpty(),
-              onResetBackStack = { resetToHome() },
+              onResetBackStack = { resetToRoot() },
             )
           }
         }

sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav2/Nav2CustomTransactions.kt

@@ -113,9 +113,9 @@ internal class Nav2CustomTransactionController {
 
   private fun handleWholeFlow(currentRoute: String) {
     if (currentRoute == RouteNames.CUSTOM) {
-      if (activeMode == Nav2CustomTransactionMode.WHOLE_FLOW) {
-        finishActiveTransaction()
-      }
+      finishActiveTransaction()
+      activeMode = Nav2CustomTransactionMode.WHOLE_FLOW
+      activeRouteName = currentRoute
       return
     }