Always display 'lost recovery key?' option (#2745)

* Always display 'lost recovery key?' option

* Use `isLastDevice` it to display only 'enter recovery key' option for verification.

* Update strings. This should fix the wrong term 'passcode' being used in the recovery key screen title.

* Disable 'lost your recovery key?' button while the screen is in a loading state

* Update screenshots

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt

@@ -136,6 +136,10 @@ class SecureBackupFlowNode @AssistedInject constructor(
                             backstack.pop()
                         }
                     }
+
+                    override fun onCreateNewRecoveryKey() {
+                        backstack.push(NavTarget.CreateNewRecoveryKey)
+                    }
                 }
                 createNode<SecureBackupEnterRecoveryKeyNode>(buildContext, plugins = listOf(callback))
             }

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt

@@ -35,6 +35,7 @@ class SecureBackupEnterRecoveryKeyNode @AssistedInject constructor(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onEnterRecoveryKeySuccess()
+        fun onCreateNewRecoveryKey()
     }
 
     private val callback = plugins<Callback>().first()
@@ -47,6 +48,7 @@ class SecureBackupEnterRecoveryKeyNode @AssistedInject constructor(
             modifier = modifier,
             onDone = callback::onEnterRecoveryKeySuccess,
             onBackClicked = ::navigateUp,
+            onCreateNewRecoveryKey = callback::onCreateNewRecoveryKey
         )
     }
 }

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyStateProvider.kt

@@ -36,6 +36,7 @@ fun aSecureBackupEnterRecoveryKeyState(
     recoveryKey: String = aFormattedRecoveryKey(),
     isSubmitEnabled: Boolean = recoveryKey.isNotEmpty(),
     submitAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    eventSink: (SecureBackupEnterRecoveryKeyEvents) -> Unit = {},
 ) = SecureBackupEnterRecoveryKeyState(
     recoveryKeyViewState = RecoveryKeyViewState(
         recoveryKeyUserStory = RecoveryKeyUserStory.Enter,
@@ -44,5 +45,5 @@ fun aSecureBackupEnterRecoveryKeyState(
     ),
     isSubmitEnabled = isSubmitEnabled,
     submitAction = submitAction,
-    eventSink = {}
+    eventSink = eventSink,
 )

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt

@@ -32,6 +32,7 @@ import io.element.android.libraries.designsystem.components.async.AsyncActionVie
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -39,6 +40,7 @@ fun SecureBackupEnterRecoveryKeyView(
     state: SecureBackupEnterRecoveryKeyState,
     onDone: () -> Unit,
     onBackClicked: () -> Unit,
+    onCreateNewRecoveryKey: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     AsyncActionView(
@@ -57,7 +59,7 @@ fun SecureBackupEnterRecoveryKeyView(
         title = stringResource(id = R.string.screen_recovery_key_confirm_title),
         subTitle = stringResource(id = R.string.screen_recovery_key_confirm_description),
         content = { Content(state = state) },
-        buttons = { Buttons(state = state) }
+        buttons = { Buttons(state = state, onCreateRecoveryKey = onCreateNewRecoveryKey) }
     )
 }
 
@@ -81,6 +83,7 @@ private fun Content(
 @Composable
 private fun ColumnScope.Buttons(
     state: SecureBackupEnterRecoveryKeyState,
+    onCreateRecoveryKey: () -> Unit,
 ) {
     Button(
         text = stringResource(id = CommonStrings.action_continue),
@@ -91,6 +94,12 @@ private fun ColumnScope.Buttons(
             state.eventSink.invoke(SecureBackupEnterRecoveryKeyEvents.Submit)
         }
     )
+    TextButton(
+        text = stringResource(id = R.string.screen_recovery_key_confirm_lost_recovery_key),
+        enabled = !state.submitAction.isLoading(),
+        modifier = Modifier.fillMaxWidth(),
+        onClick = onCreateRecoveryKey,
+    )
 }
 
 @PreviewsDayNight
@@ -102,5 +111,6 @@ internal fun SecureBackupEnterRecoveryKeyViewPreview(
         state = state,
         onDone = {},
         onBackClicked = {},
+        onCreateNewRecoveryKey = {},
     )
 }

features/securebackup/impl/src/main/res/values/localazy.xml

@@ -35,8 +35,9 @@
   <string name="screen_recovery_key_confirm_key_description">"If you have a security key or security phrase, this will work too."</string>
   <string name="screen_recovery_key_confirm_key_label">"Recovery key or passcode"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Enter…"</string>
+  <string name="screen_recovery_key_confirm_lost_recovery_key">"Lost your recovery key?"</string>
   <string name="screen_recovery_key_confirm_success">"Recovery key confirmed"</string>
-  <string name="screen_recovery_key_confirm_title">"Enter your recovery key or passcode"</string>
+  <string name="screen_recovery_key_confirm_title">"Enter your recovery key"</string>
   <string name="screen_recovery_key_copied_to_clipboard">"Copied recovery key"</string>
   <string name="screen_recovery_key_generating_key">"Generating…"</string>
   <string name="screen_recovery_key_save_action">"Save recovery key"</string>