From e777bcc20a3e0ddbbe8a995bcb5d06d23b2ffa78 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Dec 2022 15:56:45 +0100
Subject: [PATCH] Fix detekted issues.

---
 .../java/io/element/android/x/features/login/LoginScreen.kt | 6 +++++-
 .../x/features/login/changeserver/ChangeServerScreen.kt     | 6 +++++-
 .../x/features/login/changeserver/ChangeServerViewModel.kt  | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt b/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
index d521f93e2c..de30fe2c72 100644
--- a/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
@@ -79,13 +79,17 @@ fun LoginScreen(
 fun LoginContent(
     state: LoginViewState,
     formState: LoginFormState,
+    modifier: Modifier = Modifier,
     onChangeServer: () -> Unit = {},
     onLoginChanged: (String) -> Unit = {},
     onPasswordChanged: (String) -> Unit = {},
     onSubmitClicked: () -> Unit = {},
     onLoginWithSuccess: () -> Unit = {},
 ) {
-    Surface(color = MaterialTheme.colorScheme.background) {
+    Surface(
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.background,
+    ) {
         Box(
             modifier = Modifier
                 .fillMaxSize()
diff --git a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerScreen.kt b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerScreen.kt
index 6e22221327..d972a20817 100644
--- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerScreen.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerScreen.kt
@@ -62,11 +62,15 @@ fun ChangeServerScreen(
 @Composable
 fun ChangeServerContent(
     state: ChangeServerViewState,
+    modifier: Modifier = Modifier,
     onChangeServer: (String) -> Unit = {},
     onChangeServerSubmit: () -> Unit = {},
     onChangeServerSuccess: () -> Unit = {},
 ) {
-    Surface(color = MaterialTheme.colorScheme.background) {
+    Surface(
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.background,
+    ) {
         val scrollState = rememberScrollState()
         Box(
             modifier = Modifier
diff --git a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt
index 15793e4a57..7189ce4397 100644
--- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt
@@ -32,7 +32,7 @@ class ChangeServerViewModel(initialState: ChangeServerViewState) :
             suspend {
                 val state = awaitState()
                 matrix.setHomeserver(state.homeserver)
-            }.execute { it ->
+            }.execute {
                 copy(changeServerAction = it)
             }
         }