Merge pull request #3823 from element-hq/feature/bma/lastDevice

Remove code duplication - no behavior change.
element-hq · Nov 7, 2024 · 213dc77 · 213dc77
2 parents 9ea0a11 + d462386
commit 213dc77
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/...n/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt b/...n/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt
@@ -248,25 +248,18 @@ private fun VerifySelfSessionBottomMenu(
         Step.Loading -> error("Should not happen")
         is Step.Initial -> {
             VerificationBottomMenu {
-                if (verificationViewState.isLastDevice) {
-                    Button(
-                        modifier = Modifier.fillMaxWidth(),
-                        text = stringResource(R.string.screen_session_verification_enter_recovery_key),
-                        onClick = onEnterRecoveryKey,
-                    )
-                } else {
+                if (verificationViewState.isLastDevice.not()) {
                     Button(
                         modifier = Modifier.fillMaxWidth(),
                         text = stringResource(R.string.screen_identity_use_another_device),
                         onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
                     )
-                    Button(
-                        modifier = Modifier.fillMaxWidth(),
-                        text = stringResource(R.string.screen_session_verification_enter_recovery_key),
-                        onClick = onEnterRecoveryKey,
-                    )
                 }
-                // This option should always be displayed
+                Button(
+                    modifier = Modifier.fillMaxWidth(),
+                    text = stringResource(R.string.screen_session_verification_enter_recovery_key),
+                    onClick = onEnterRecoveryKey,
+                )
                 OutlinedButton(
                     modifier = Modifier.fillMaxWidth(),
                     text = stringResource(R.string.screen_identity_confirmation_cannot_confirm),