fix: ensure request focus is called once after the first composition …

…is done [WPB-10571] 🍒 (#3324) Co-authored-by: Mohamad Jaara <[email protected]> Co-authored-by: Yamil Medina <[email protected]>
wireapp · Aug 14, 2024 · 8d14713 · 8d14713
1 parent 25e4ff2
commit 8d14713
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt b/...src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt
@@ -187,11 +187,11 @@ private fun CodeContent(
             }
             Spacer(modifier = Modifier.weight(1f))
         }
-    }
-    LaunchedEffect(Unit) {
-        coroutineContext.job.invokeOnCompletion {
-            focusRequester.requestFocus()
-            keyboardController?.show()
+        LaunchedEffect(Unit) {
+            coroutineContext.job.invokeOnCompletion {
+                focusRequester.requestFocus()
+                keyboardController?.show()
+            }
         }
     }
 }

diff --git a/...c/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt b/...c/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt
@@ -89,8 +89,8 @@ import com.wire.kalium.logic.configuration.server.ServerConfig
 @WireDestination(navArgsDelegate = CreateAccountNavArgs::class)
 @Composable
 fun CreateAccountEmailScreen(
-    createAccountEmailViewModel: CreateAccountEmailViewModel = hiltViewModel(),
-    navigator: Navigator
+    navigator: Navigator,
+    createAccountEmailViewModel: CreateAccountEmailViewModel = hiltViewModel()
 ) {
     with(createAccountEmailViewModel) {
         fun navigateToDetailsScreen() = navigator.navigate(
@@ -185,6 +185,9 @@ private fun EmailContent(
             }
             Spacer(modifier = Modifier.weight(1f))
             EmailFooter(state = state, onLoginPressed = onLoginPressed, onContinuePressed = onContinuePressed)
+            LaunchedEffect(Unit) {
+                focusRequester.requestFocus()
+            }
         }
     }
     if (state.termsDialogVisible) {
@@ -198,9 +201,6 @@ private fun EmailContent(
     if (state.error is CreateAccountEmailViewState.EmailError.DialogError.GenericError) {
         CoreFailureErrorDialog(state.error.coreFailure, onErrorDismiss)
     }
-    LaunchedEffect(Unit) {
-        focusRequester.requestFocus()
-    }
 }
 
 @Composable