Remove remember ViewModel (#6618)

Author: david-livefront

.claude/CLAUDE.md

@@ -106,7 +106,6 @@ User Request (UI Action)
 In addition to the Key Principles above, follow these rules:
 
 ### DO
-- Use `remember(viewModel)` for lambdas passed to composables
 - Map async results to internal actions before updating state
 - Inject `Clock` for time-dependent operations
 - Return early to reduce nesting

.claude/skills/implementing-android-code/SKILL.md

@@ -148,9 +148,7 @@ fun ExampleScreen(
             BitwardenTopAppBar(
                 title = stringResource(R.string.title),
                 navigationIcon = rememberVectorPainter(BitwardenDrawable.ic_back),
-                onNavigationIconClick = remember(viewModel) {
-                    { viewModel.trySendAction(ExampleAction.BackClick) }
-                },
+                onNavigationIconClick = { viewModel.trySendAction(ExampleAction.BackClick) },
             )
         },
     ) {
@@ -165,7 +163,6 @@ fun ExampleScreen(
 - ✅ Use `hiltViewModel()` for dependency injection
 - ✅ Use `collectAsStateWithLifecycle()` for state (not `collectAsState()`)
 - ✅ Use `EventsEffect(viewModel)` for one-shot events
-- ✅ Use `remember(viewModel) { }` for stable callbacks to prevent recomposition
 - ✅ Use `Bitwarden*` prefixed components from `:ui` module
 
 **State Hoisting Rules:**

.claude/skills/implementing-android-code/templates.md

@@ -342,9 +342,7 @@ fun ExampleScreen(
     // Dialogs
     ExampleDialogs(
         dialogState = state.dialogState,
-        onDismissRequest = remember(viewModel) {
-            { viewModel.trySendAction(ExampleAction.ErrorDialogDismiss) }
-        },
+        onDismissRequest = { viewModel.trySendAction(ExampleAction.ErrorDialogDismiss) },
     )
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
@@ -357,20 +355,14 @@ fun ExampleScreen(
                 title = stringResource(id = BitwardenString.example),
                 scrollBehavior = scrollBehavior,
                 navigationIcon = rememberVectorPainter(id = BitwardenDrawable.ic_back),
-                onNavigationIconClick = remember(viewModel) {
-                    { viewModel.trySendAction(ExampleAction.BackClick) }
-                },
+                onNavigationIconClick = { viewModel.trySendAction(ExampleAction.BackClick) },
             )
         },
     ) {
         ExampleScreenContent(
             state = state,
-            onInputChanged = remember(viewModel) {
-                { viewModel.trySendAction(ExampleAction.InputChanged(it)) }
-            },
-            onSubmitClick = remember(viewModel) {
-                { viewModel.trySendAction(ExampleAction.SubmitClick) }
-            },
+            onInputChanged = { viewModel.trySendAction(ExampleAction.InputChanged(it)) },
+            onSubmitClick = { viewModel.trySendAction(ExampleAction.SubmitClick) },
             modifier = Modifier
                 .fillMaxSize(),
         )

app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt

@@ -17,7 +17,6 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -128,10 +127,8 @@ fun SetupAutoFillScreen(
                         navigationIconContentDescription = stringResource(
                             id = BitwardenString.close,
                         ),
-                        onNavigationIconClick = remember(viewModel) {
-                            {
-                                viewModel.trySendAction(SetupAutoFillAction.CloseClick)
-                            }
+                        onNavigationIconClick = {
+                            viewModel.trySendAction(SetupAutoFillAction.CloseClick)
                         },
                     )
                 },

app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupBrowserAutofillScreen.kt

@@ -14,7 +14,6 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -76,11 +75,9 @@ fun SetupBrowserAutofillScreen(
     }
     SetupBrowserAutofillDialogs(
         dialogState = state.dialogState,
-        onDismissDialog = remember(viewModel) {
-            { viewModel.trySendAction(SetupBrowserAutofillAction.DismissDialog) }
-        },
-        onTurnOnLaterConfirm = remember(viewModel) {
-            { viewModel.trySendAction(SetupBrowserAutofillAction.TurnOnLaterConfirmClick) }
+        onDismissDialog = { viewModel.trySendAction(SetupBrowserAutofillAction.DismissDialog) },
+        onTurnOnLaterConfirm = {
+            viewModel.trySendAction(SetupBrowserAutofillAction.TurnOnLaterConfirmClick)
         },
     )
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -104,8 +101,8 @@ fun SetupBrowserAutofillScreen(
                     NavigationIcon(
                         navigationIcon = rememberVectorPainter(id = BitwardenDrawable.ic_close),
                         navigationIconContentDescription = stringResource(BitwardenString.close),
-                        onNavigationIconClick = remember(viewModel) {
-                            { viewModel.trySendAction(SetupBrowserAutofillAction.CloseClick) }
+                        onNavigationIconClick = {
+                            viewModel.trySendAction(SetupBrowserAutofillAction.CloseClick)
                         },
                     )
                 },
@@ -114,17 +111,15 @@ fun SetupBrowserAutofillScreen(
     ) {
         SetupBrowserAutofillContent(
             state = state,
-            onWhyIsThisStepRequiredClick = remember(viewModel) {
-                { viewModel.trySendAction(SetupBrowserAutofillAction.WhyIsThisStepRequiredClick) }
-            },
-            onBrowserClick = remember(viewModel) {
-                { viewModel.trySendAction(SetupBrowserAutofillAction.BrowserIntegrationClick(it)) }
+            onWhyIsThisStepRequiredClick = {
+                viewModel.trySendAction(SetupBrowserAutofillAction.WhyIsThisStepRequiredClick)
             },
-            onContinueClick = remember(viewModel) {
-                { viewModel.trySendAction(SetupBrowserAutofillAction.ContinueClick) }
+            onBrowserClick = {
+                viewModel.trySendAction(SetupBrowserAutofillAction.BrowserIntegrationClick(it))
             },
-            onTurnOnLaterClick = remember(viewModel) {
-                { viewModel.trySendAction(SetupBrowserAutofillAction.TurnOnLaterClick) }
+            onContinueClick = { viewModel.trySendAction(SetupBrowserAutofillAction.ContinueClick) },
+            onTurnOnLaterClick = {
+                viewModel.trySendAction(SetupBrowserAutofillAction.TurnOnLaterClick)
             },
             modifier = Modifier.fillMaxSize(),
         )

app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreen.kt

@@ -15,7 +15,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -41,10 +40,8 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
 fun SetupCompleteScreen(
     viewModel: SetupCompleteViewModel = hiltViewModel(),
 ) {
-    val setupCompleteAction: () -> Unit = remember(viewModel) {
-        {
-            viewModel.trySendAction(SetupCompleteAction.CompleteSetup)
-        }
+    val setupCompleteAction: () -> Unit = {
+        viewModel.trySendAction(SetupCompleteAction.CompleteSetup)
     }
 
     // Handle system back action to complete the setup.

app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt

@@ -93,9 +93,7 @@ fun SetupUnlockScreen(
 
     SetupUnlockScreenDialogs(
         dialogState = state.dialogState,
-        onDismissRequest = remember(viewModel) {
-            { viewModel.trySendAction(SetupUnlockAction.DismissDialog) }
-        },
+        onDismissRequest = { viewModel.trySendAction(SetupUnlockAction.DismissDialog) },
     )
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
@@ -121,10 +119,8 @@ fun SetupUnlockScreen(
                         navigationIconContentDescription = stringResource(
                             id = BitwardenString.close,
                         ),
-                        onNavigationIconClick = remember(viewModel) {
-                            {
-                                viewModel.trySendAction(SetupUnlockAction.CloseClick)
-                            }
+                        onNavigationIconClick = {
+                            viewModel.trySendAction(SetupUnlockAction.CloseClick)
                         },
                     )
                 },

app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt

@@ -14,7 +14,6 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -83,15 +82,13 @@ fun EnterpriseSignOnScreen(
 
     EnterpriseSignOnDialogs(
         dialogState = state.dialogState,
-        onConfirmKeyConnectorDomain = remember(viewModel) {
-            { viewModel.trySendAction(EnterpriseSignOnAction.ConfirmKeyConnectorDomainClick) }
+        onConfirmKeyConnectorDomain = {
+            viewModel.trySendAction(EnterpriseSignOnAction.ConfirmKeyConnectorDomainClick)
         },
-        onDismissKeyConnectorDomain = remember(viewModel) {
-            { viewModel.trySendAction(EnterpriseSignOnAction.CancelKeyConnectorDomainClick) }
-        },
-        onDismissRequest = remember(viewModel) {
-            { viewModel.trySendAction(EnterpriseSignOnAction.DialogDismiss) }
+        onDismissKeyConnectorDomain = {
+            viewModel.trySendAction(EnterpriseSignOnAction.CancelKeyConnectorDomainClick)
         },
+        onDismissRequest = { viewModel.trySendAction(EnterpriseSignOnAction.DialogDismiss) },
     )
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
@@ -105,15 +102,13 @@ fun EnterpriseSignOnScreen(
                 scrollBehavior = scrollBehavior,
                 navigationIcon = rememberVectorPainter(id = BitwardenDrawable.ic_close),
                 navigationIconContentDescription = stringResource(id = BitwardenString.close),
-                onNavigationIconClick = remember(viewModel) {
-                    { viewModel.trySendAction(EnterpriseSignOnAction.CloseButtonClick) }
+                onNavigationIconClick = {
+                    viewModel.trySendAction(EnterpriseSignOnAction.CloseButtonClick)
                 },
                 actions = {
                     BitwardenTextButton(
                         label = stringResource(id = BitwardenString.log_in_verb),
-                        onClick = remember(viewModel) {
-                            { viewModel.trySendAction(EnterpriseSignOnAction.LogInClick) }
-                        },
+                        onClick = { viewModel.trySendAction(EnterpriseSignOnAction.LogInClick) },
                         modifier = Modifier.testTag("LoginButton"),
                     )
                 },
@@ -122,8 +117,8 @@ fun EnterpriseSignOnScreen(
     ) {
         EnterpriseSignOnScreenContent(
             state = state,
-            onOrgIdentifierInputChange = remember(viewModel) {
-                { viewModel.trySendAction(EnterpriseSignOnAction.OrgIdentifierInputChange(it)) }
+            onOrgIdentifierInputChange = {
+                viewModel.trySendAction(EnterpriseSignOnAction.OrgIdentifierInputChange(it))
             },
             modifier = Modifier.fillMaxSize(),
         )