android/app/src/main/java/com/fabledsword/minstrel/admin/ui/AdminUsersScreen.kt

@@ -95,24 +95,42 @@ fun AdminUsersScreen(
         }
     }
 
-    resetPasswordFor?.let { user ->
+    PendingDialogs(
-        ResetPasswordDialog(
+        resetPasswordFor = resetPasswordFor,
-            user = user,
+        deleteCandidate = deleteCandidate,
-            onDismiss = { resetPasswordFor = null },
+        onClearReset = { resetPasswordFor = null },
-            onConfirm = { newPassword ->
+        onClearDelete = { deleteCandidate = null },
-                viewModel.resetPassword(user.id, newPassword)
+        onConfirmReset = viewModel::resetPassword,
-                resetPasswordFor = null
+        onConfirmDelete = viewModel::delete,
-            },
     )
 }
 
+@Composable
+private fun PendingDialogs(
+    resetPasswordFor: AdminUserRef?,
+    deleteCandidate: AdminUserRef?,
+    onClearReset: () -> Unit,
+    onClearDelete: () -> Unit,
+    onConfirmReset: (String, String) -> Unit,
+    onConfirmDelete: (String) -> Unit,
+) {
+    resetPasswordFor?.let { user ->
+        ResetPasswordDialog(
+            user = user,
+            onDismiss = onClearReset,
+            onConfirm = { newPassword ->
+                onConfirmReset(user.id, newPassword)
+                onClearReset()
+            },
+        )
+    }
     deleteCandidate?.let { user ->
         DeleteConfirmDialog(
             user = user,
-            onDismiss = { deleteCandidate = null },
+            onDismiss = onClearDelete,
             onConfirm = {
-                viewModel.delete(user.id)
+                onConfirmDelete(user.id)
-                deleteCandidate = null
+                onClearDelete()
             },
         )
     }