@@ -53,7 +53,7 @@ import androidx.compose.ui.text.style.TextAlign
5353import androidx.compose.ui.text.style.TextOverflow
5454import androidx.compose.ui.tooling.preview.Preview
5555import androidx.compose.ui.unit.dp
56- import androidx.hilt.navigation .compose.hiltViewModel
56+ import androidx.hilt.lifecycle.viewmodel .compose.hiltViewModel
5757import androidx.lifecycle.asFlow
5858import androidx.navigation.NavHostController
5959import androidx.navigation.compose.rememberNavController
@@ -254,7 +254,9 @@ fun WebEidScreen(
254254 modifier = Modifier .semantics { heading() },
255255 )
256256 if (authRequest != null ) {
257- WebEidAuthInfo (authRequest = authRequest)
257+ if (! isWebEidAuthenticating) {
258+ WebEidAuthInfo (authRequest = authRequest)
259+ }
258260
259261 NFCView (
260262 activity = activity,
@@ -291,10 +293,14 @@ fun WebEidScreen(
291293 webEidViewModel = viewModel,
292294 )
293295
294- WebEidRememberMe (
295- rememberMe = rememberMe,
296- onRememberMeChange = { rememberMe = it },
297- )
296+ if (! isWebEidAuthenticating) {
297+ Spacer (modifier = Modifier .height(SPadding ))
298+
299+ WebEidRememberMe (
300+ rememberMe = rememberMe,
301+ onRememberMeChange = { rememberMe = it },
302+ )
303+ }
298304 } else if (signRequest != null ) {
299305 val responseUri = signRequest.responseUri.lowercase()
300306 val isCertificateFlow = responseUri.contains(" /certificate" ) && ! responseUri.contains(" /signature" )
@@ -456,9 +462,7 @@ fun WebEidScreen(
456462}
457463
458464@Composable
459- private fun WebEidAuthInfo (
460- authRequest : WebEidAuthRequest ,
461- ) {
465+ private fun WebEidAuthInfo (authRequest : WebEidAuthRequest ) {
462466 Column (
463467 modifier = Modifier .fillMaxWidth(),
464468 ) {
0 commit comments