From fa19ed7ffc9cba81fd2c783fafcfa601ed91e497 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 15 Apr 2026 15:48:25 -0400
Subject: [PATCH] Use viewmodel entry scoping in regV5.

---
 .../java/org/signal/registration/RegistrationNavigation.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt
index 38d4df0f89..2422a0c431 100644
--- a/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt
+++ b/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
@@ -219,7 +220,8 @@ fun RegistrationNavHost(
   }
 
   val decorators = listOf(
-    rememberSaveableStateHolderNavEntryDecorator<NavKey>()
+    rememberSaveableStateHolderNavEntryDecorator<NavKey>(),
+    rememberViewModelStoreNavEntryDecorator()
   )
 
   val entries = rememberDecoratedNavEntries(