Always display 'lost recovery key?' option #2745

jmartinesp · 2024-04-23T15:03:13Z

Type of change

Feature
Bugfix
Technical
Other :

Content

Removes 'create new key' option from the initial screen of the session verification flow that appeared when the current session was the only one.
Always displays 'Lost your recovery key?' action in the enter recovery key screen instead.
Added tests for that screen.

Motivation and context

Should be enough to close #2740. It also applies the latest changes to the designs in Figma, which changed the behaviour mentioned above.

Screenshots / GIFs

In the PR.

Tests

Log into an account.
Use 'enter recovery key' to enter the recovery key verification screen.
The new 'Lost your recovery key?' button should be present.

Tested devices

Physical
Emulator
OS version(s): 14

Checklist

Changes have been tested on an Android device or Android emulator with API 23
UI change has been tested on both light and dark themes
Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
Pull request is based on the develop branch
Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#changelog
Pull request includes screenshots or videos if containing UI changes
Pull request includes a sign off
You've made a self review of your PR

github-actions · 2024-04-23T15:09:45Z

📱 Scan the QR code below to install the build (arm64 only) for this PR.

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/x8fxED

codecov · 2024-04-23T15:17:13Z

Codecov Report

Attention: Patch coverage is 85.71429% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 73.56%. Comparing base (9a780cd) to head (2036881).
Report is 12 commits behind head on develop.

Files	Patch %	Lines
...kup/impl/enter/SecureBackupEnterRecoveryKeyView.kt	66.66%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2745      +/-   ##
===========================================
+ Coverage    73.55%   73.56%   +0.01%     
===========================================
  Files         1501     1501              
  Lines        35987    35992       +5     
  Branches      6940     6940              
===========================================
+ Hits         26471    26479       +8     
+ Misses        5869     5867       -2     
+ Partials      3647     3646       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bmarty

Thanks!
A few comments.

bmarty · 2024-04-24T12:07:26Z

...impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt

-                )
-            }
+            BottomMenu(
+                positiveButtonTitle = stringResource(R.string.screen_identity_use_another_device),


I do not think we should propose to "Use another device" if we know that this is the latest session (isLastDevice). Maybe the UX can be better here by just hiding the first button?

Done in ccf3c2a.

bmarty · 2024-04-24T12:09:53Z

...mpl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionState.kt

@@ -29,7 +29,7 @@ data class VerifySelfSessionState(
 ) {
    @Stable
    sealed interface VerificationStep {
-        data class Initial(val canEnterRecoveryKey: Boolean, val isLastDevice: Boolean) : VerificationStep
+        data class Initial(val canEnterRecoveryKey: Boolean) : VerificationStep


Maybe revert this change, see my other comment.

Also done in ccf3c2a.

bmarty · 2024-04-24T12:14:31Z

...nterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-3_4_null_2,NEXUS_5,1.0,en].png

I think we should not use the term passcode, this is element-hq/element-meta#2402 and since this is affecting the same preview, maybe handle it in the same PR?

I think this is only the 4th time we've changed this screen in the past couple of weeks. I guess 5th time's the charm!

5b84eb7 + a new recording of screenshots should fix it.

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

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

…play-lost-recovery-key-action

bmarty

Thanks for the changes. One final remark, then I think we're good!

bmarty · 2024-04-25T12:10:00Z

...tlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt

+        text = stringResource(id = R.string.screen_recovery_key_confirm_lost_recovery_key),
+        modifier = Modifier.fillMaxWidth(),
+        onClick = onCreateRecoveryKey,
+    )


I think this button should be disabled when state.submitAction.isLoading(). WDYT?

Made this remark when seeing this screenshot: https://github.com/element-hq/element-x-android/pull/2745/files#diff-dbd46661ff7c38b3aefb7d016c5a6e54348191cc5ac6a6f1bd71213ad7db2019

Actually, when the progress indicator is displayed the button is not clickable, so it's 'disabled' although it doesn't display the disabled state. It's what we have everywhere else I believe.

Yes, for "Continue" button, but I am talking about the other one "Lost your recovery key?". Sorry if it was not clear.

Ah true, good call!

So to clarify:
The two buttons must be disabled during the submit action loading, to avoid user navigating away during the process.

Adding at line 101:

enabled = !state.submitAction.isLoading()

should be fine.

…ding state

bmarty

Thanks!

sonarcloud · 2024-04-25T13:01:02Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

jmartinesp and others added 3 commits April 23, 2024 16:43

Always display 'lost recovery key?' option

3804f80

Update screenshots

681c9b2

Add changelog

80e0b52

jmartinesp requested a review from a team as a code owner April 23, 2024 15:03

jmartinesp requested review from bmarty and removed request for a team April 23, 2024 15:03

Fix lint issues

07b9ee5

bmarty reviewed Apr 24, 2024

View reviewed changes

jmartinesp added 2 commits April 24, 2024 15:46

Bring back isLastDevice.

ccf3c2a

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

Update strings.

5b84eb7

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

jmartinesp mentioned this pull request Apr 24, 2024

Element X: Wording improvement for "Enter recovery key" screen element-hq/element-meta#2402

Open

Update screenshots

ab7e814

jmartinesp requested a review from bmarty April 24, 2024 13:58

jmartinesp added 2 commits April 25, 2024 11:15

Merge remote-tracking branch 'origin/develop' into fix/jme/always-dis…

5ae4983

…play-lost-recovery-key-action

Fix tests

dacf750

bmarty approved these changes Apr 25, 2024

View reviewed changes

jmartinesp added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Apr 25, 2024

github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Apr 25, 2024

jmartinesp and others added 2 commits April 25, 2024 14:42

Disable 'lost your recovery key?' button while the screen is in a loa…

46472db

…ding state

Update screenshots

2036881

bmarty approved these changes Apr 25, 2024

View reviewed changes

jmartinesp merged commit 7397df8 into develop Apr 25, 2024
16 checks passed

jmartinesp deleted the fix/jme/always-display-lost-recovery-key-action branch April 25, 2024 13:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Always display 'lost recovery key?' option #2745

Always display 'lost recovery key?' option #2745

jmartinesp commented Apr 23, 2024 •

edited

github-actions bot commented Apr 23, 2024 •

edited

codecov bot commented Apr 23, 2024 •

edited

bmarty left a comment

bmarty Apr 24, 2024

jmartinesp Apr 24, 2024

jmartinesp Apr 24, 2024

bmarty Apr 24, 2024

jmartinesp Apr 24, 2024

bmarty Apr 24, 2024

jmartinesp Apr 24, 2024 •

edited

jmartinesp Apr 24, 2024

bmarty left a comment

bmarty Apr 25, 2024 •

edited

jmartinesp Apr 25, 2024

bmarty Apr 25, 2024

jmartinesp Apr 25, 2024

bmarty Apr 25, 2024

bmarty left a comment

sonarcloud bot commented Apr 25, 2024

Always display 'lost recovery key?' option #2745

Always display 'lost recovery key?' option #2745

Conversation

jmartinesp commented Apr 23, 2024 • edited

Type of change

Content

Motivation and context

Screenshots / GIFs

Tests

Tested devices

Checklist

github-actions bot commented Apr 23, 2024 • edited

codecov bot commented Apr 23, 2024 • edited

Codecov Report

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jmartinesp Apr 24, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmarty left a comment

Choose a reason for hiding this comment

bmarty Apr 25, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmarty left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Apr 25, 2024

Quality Gate passed

jmartinesp commented Apr 23, 2024 •

edited

github-actions bot commented Apr 23, 2024 •

edited

codecov bot commented Apr 23, 2024 •

edited

jmartinesp Apr 24, 2024 •

edited

bmarty Apr 25, 2024 •

edited