Enhance MFA multi-device testing on troubleshoot and revoke pages by DylanDylann · Pull Request #84016 · Expensify/App

DylanDylann · 2026-03-03T10:19:23Z

Explanation of Change

Taking over #83488 from @rafecolton

Enhance troubleshooting and device revocation page to:

Make it more clear whether the current device is registered
Revoke on the Troubleshoot page now only revokes the current device
On the device revocation page, you can revoke the current device, other devices, or all devices (whichever are eligible)

Fixed Issues

$ #83482
PROPOSAL:

Tests

Open android, iOS, and web, all on the same account
Visit the Troubleshoot page on each
Use Test to register the iOS device - observe the text go from Never registered to Another device registered on android and web.
Register android, observe the status on web go to Other devices registered
Revoke iOS and observe Android is not revoked.
Navigate to Security > Face/Fingerprint & Passkey on android, observe a row for "This device" and the button says "Revoke access"
Re-register iOS. Notice a "One other device" row appear on android.
On web, navigate to Security > Face/Fingerprint & Passkey, observe one row with "Two other devices"
Navigate to "Security > Face/Fingerprint & Passkey" on iOS and observe two rows - one other device, one this device
Revoke one other device from iOS. Notice web changes to "One other device" and android's "This device" row disappears
Tap "Revoke access" on web and notice iOS now disappears too

Verify that no errors appear in the JS console

Offline tests

N/A, online only

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Screen.Recording.2026-03-04.at.18.37.40.mov

Screen.Recording.2026-03-04.at.18.40.14.mp4

- Fix ESLint prefer-at error in en.ts (use .at() instead of bracket notation) - Fix type error in API types by using RevokeMultifactorAuthenticationCredentialsParams - Add missing translation keys to all non-English language files: - biometricsTest: statusNotRegistered, statusRegisteredOtherDevice, statusRegisteredThisDevice - revoke: thisDevice, otherDevices - Add missing Spanish translations: statusNeverRegistered, confirmationPromptAll, ctaAll - Fix Spanish troubleshootBiometricsStatus to use status param instead of registered Co-authored-by: {"message":"Not Found","documentation_url":"https://docs.github.com/rest/issues/comments#get-an-issue-comment","status":"404"} <{"message":"Not Found","documentation_url":"https://docs.github.com/rest/issues/comments#get-an-issue-comment","status":"404"}@users.noreply.github.com>

The previous commit inadvertently changed Unicode quote characters in the French translation file, breaking Prettier parsing. This restores the original characters and re-adds only the missing translation keys. Co-authored-by: Rafe Colton <rafecolton@users.noreply.github.com>

…revoke

DylanDylann · 2026-03-09T06:41:35Z

@JakubKorytko All resolved/replied

JakubKorytko

LGTM

rafecolton · 2026-03-09T16:51:19Z

@DylanDylann I'm getting the same error on the German translation:

@MelvinBot can you please analyze the above issue and recommend a fix? A few specific instructions:

Do not directly apply the fix, simply explain here.
Include a diff that will apply the fix using a code block with "patch" as the language.
Included any Spanish translations needed for this change in your diff

MelvinBot · 2026-03-09T17:07:48Z

Analysis

Root cause: The generateTranslations script fails with:

Error: Cannot inject into path "statusRegisteredOtherDevice.one": property "statusRegisteredOtherDevice" exists but is not an object

The script detects statusRegisteredOtherDevice as a new key added in en.ts. It decomposes the pluralized arrow function () => ({one: ..., other: ...}) into two separate injection paths: statusRegisteredOtherDevice.one and statusRegisteredOtherDevice.other.

When it tries to inject these into the non-English language files, it finds that statusRegisteredOtherDevice already exists (manually added by DylanDylann) as an arrow function node, not an object literal. The script's AST injection logic can only inject sub-properties into object literals, so it throws the error.

This affects ALL non-English language files, not just German — each one has the same manually-added arrow function.

Fix: Remove the manually-added statusRegisteredOtherDevice line from all non-English language files, then re-run the translation script. The script will generate the translations fresh for all supported languages.

For Spanish (which the script can't auto-generate), the translation needs to be added back manually after the script runs.

diff --git a/src/languages/de.ts b/src/languages/de.ts
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -699,7 +699,6 @@
             statusNeverRegistered: 'Nie registriert',
             statusNotRegistered: 'Nicht registriert',
-            statusRegisteredOtherDevice: () => ({one: 'Weiteres Gerät registriert', other: 'Andere Geräte registriert'}),
             statusRegisteredThisDevice: 'Registriert',
         },
diff --git a/src/languages/es.ts b/src/languages/es.ts
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -555,7 +555,6 @@
             statusNotRegistered: 'No registrado',
-            statusRegisteredOtherDevice: () => ({one: 'Otro dispositivo registrado', other: 'Otros dispositivos registrados'}),
             statusRegisteredThisDevice: 'Registrado',
         },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -701,7 +701,6 @@
             statusNotRegistered: 'Non enregistré',
-            statusRegisteredOtherDevice: () => ({one: 'Un autre appareil enregistré', other: 'Autres appareils enregistrés'}),
             statusRegisteredThisDevice: 'Enregistré',
         },
diff --git a/src/languages/it.ts b/src/languages/it.ts
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -699,7 +699,6 @@
             statusNotRegistered: 'Non registrato',
-            statusRegisteredOtherDevice: () => ({one: 'Un altro dispositivo registrato', other: 'Altri dispositivi registrati'}),
             statusRegisteredThisDevice: 'Registrato',
         },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -698,7 +698,6 @@
             statusNotRegistered: '未登録',
-            statusRegisteredOtherDevice: () => ({one: '他のデバイスが登録済み', other: '他のデバイスが登録済み'}),
             statusRegisteredThisDevice: '登録済み',
         },
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -698,7 +698,6 @@
             statusNotRegistered: 'Niet geregistreerd',
-            statusRegisteredOtherDevice: () => ({one: 'Een ander apparaat geregistreerd', other: 'Andere apparaten geregistreerd'}),
             statusRegisteredThisDevice: 'Geregistreerd',
         },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -698,7 +698,6 @@
             statusNotRegistered: 'Nie zarejestrowano',
-            statusRegisteredOtherDevice: () => ({one: 'Inne urządzenie zarejestrowane', other: 'Inne urządzenia zarejestrowane'}),
             statusRegisteredThisDevice: 'Zarejestrowano',
         },
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -697,7 +697,6 @@
             statusNotRegistered: 'Não registrado',
-            statusRegisteredOtherDevice: () => ({one: 'Outro dispositivo registrado', other: 'Outros dispositivos registrados'}),
             statusRegisteredThisDevice: 'Registrado',
         },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -691,7 +691,6 @@
             statusNotRegistered: '未注册',
-            statusRegisteredOtherDevice: () => ({one: '另一台设备已注册', other: '其他设备已注册'}),
             statusRegisteredThisDevice: '已注册',
         },

After applying this patch and re-running the translation script, the script will auto-generate statusRegisteredOtherDevice for all supported languages. Since the script doesn't generate Spanish, you'll need to manually add the Spanish translation back afterward:

// In src/languages/es.ts, inside biometricsTest:
statusRegisteredOtherDevice: () => ({one: 'Otro dispositivo registrado', other: 'Otros dispositivos registrados'}),

DylanDylann · 2026-03-09T18:27:20Z

@MelvinBot Removing statusRegisteredOtherDevice caused the TypeScript check to fail

MelvinBot · 2026-03-09T18:30:00Z

I investigated the failing typecheck — here's what I found:

Root Cause: The new key statusRegisteredOtherDevice was added to en.ts (line 706) and es.ts (line 558), but is missing from 8 other language files. Since all language files must match the type shape of en.ts, TypeScript errors with TS2741: Property 'statusRegisteredOtherDevice' is missing.

Affected files (each needs statusRegisteredOtherDevice added between statusNotRegistered and statusRegisteredThisDevice):

src/languages/de.ts (line ~701)
src/languages/fr.ts (line ~682)
src/languages/it.ts (line ~680)
src/languages/ja.ts (line ~679)
src/languages/nl.ts (line ~679)
src/languages/pl.ts (line ~679)
src/languages/pt-BR.ts (line ~678)
src/languages/zh-hans.ts (line ~672)

Fix: Add the statusRegisteredOtherDevice plural translation to each file. The pattern from en.ts:

statusRegisteredOtherDevice: () => ({one: 'Another device registered', other: 'Other devices registered'}),

Each language file needs its own translated version of this key, following the same plural function pattern used in es.ts:

statusRegisteredOtherDevice: () => ({one: 'Otro dispositivo registrado', other: 'Otros dispositivos registrados'}),

⚠️ I can't push changes to this PR because I didn't open it and I'm not listed as an assignee. To have me make this fix, add me to the PR assignees and then retry your request.

chuckdries

Looks pretty good overall, small NAB

src/components/TestToolMenu.tsx

DylanDylann · 2026-03-10T07:29:38Z

Failed Eslint on main, I will merge new main when it's resolved

chuckdries

Looks good; translation files appear to be in the correct state

chuckdries · 2026-03-10T20:29:37Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

improved.revoke.android.mp4

iOS: Native

improved.revoke.ios.mp4

github-actions · 2026-03-10T20:44:25Z

🚧 @chuckdries has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-10T20:50:14Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #84016.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-05a9112-d04040c-3179a204977811bd5dc85d72a5d36011cde53166/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-05a9112-d04040c-4cd3ca56bb0abdd91b5c29e363c06f85a5667a21/index.html

Web 🕸️
https://84016.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-10T20:51:35Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-03-11T20:04:57Z

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.3.36-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2026-03-12T22:49:38Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.36-10 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

rafecolton and others added 30 commits February 27, 2026 16:50

Initial feature implmenetation

c762a68

Add some more primitive-type functions to useNativeBiometrics

f2ea79f

Strip out redundant code and simplify hook

0dd758d

Add missing translation params to fix errors in test tool page

e64224c

Minor improvements for the revoke page

10000

285ed6d

Add dedicated API command for opening the revoke page

5e0d410

Move aciton definition to more sensible location

76fe737

Rename, rearrange to try to reduce diff

cf50b3f

Fix button text when revoking multiple other devices

3b701d4

Fix bug where iOS doesn't show registered right away

e52ebdd

Update translations

5e03e3f

Apply polyglot parrot translations

c8f7910

Address review feedback

ca4aea3

Shore up logic for revoke page confirmation button and text

6218913

Address edge cases given localPublicKey is async

14028ff

Refactor to remove function that is no longer necessary

0496ba2

Apply static translations

e48b428

Add unit tests for the now-complex revoke page logic

35a4612

Remove unused function and update unit tests accordingly

ea9cd23

Minor refactor, use variable that's already defined

9e29913

Remove another unused property

f889581

Address PR review comment, run prettier

da8234f

PR feedback - change variable name

60c9e9b

Complete remaining PR author checklist items

84a5182

Fix linter errors

c016bd6

Merge remote-tracking branch 'origin/main' into enhance-troubleshoot-…

1919148

…revoke

Better linter fix that also passes typecheck

ec3a623

Merge remote-tracking branch 'origin/main' into enhance-troubleshoot-…

2b00c45

…revoke

DylanDylann added 2 commits March 9, 2026 13:37

resolve comments

50050cd

minor fix

85e44e0

JakubKorytko approved these changes Mar 9, 2026

View reviewed changes

add Log

e3d2612

DylanDylann force-pushed the Dylan-enhance-troubleshoot-revoke branch from dbfb6ad to e3d2612 Compare March 9, 2026 18:33

chuckdries previously approved these changes Mar 9, 2026

View reviewed changes

src/components/TestToolMenu.tsx Outdated Show resolved Hide resolved

update loading flag name

85b8008

DylanDylann dismissed chuckdries’s stale review via 85b8008 March 10, 2026 05:00

DylanDylann force-pushed the Dylan-enhance-troubleshoot-revoke branch from d0a9a7e to 85b8008 Compare March 10, 2026 05:00

DylanDylann added 2 commits March 10, 2026 13:33

Merge branch 'main' into Dylan-enhance-troubleshoot-revoke

149513e

resolve conflict

2d6329f

DylanDylann added 3 commits March 10, 2026 15:18

translation script

a497dbe

fix typecheck

98eb065

Merge branch 'main' into Dylan-enhance-troubleshoot-revoke

57c354b

chuckdries approved these changes Mar 10, 2026

View reviewed changes

chuckdries merged commit 05a9112 into Expensify:main Mar 10, 2026
30 of 32 checks passed

OSBotify mentioned this pull request Mar 11, 2026

Deploy Checklist: New Expensify 2026-03-11 #84953

Closed

melvin-bot bot mentioned this pull request Mar 12, 2026

[Due for payment 2026-03-19] [ECUK/EU] Enhance troubleshooting and revoke for better multi-device testing #83482

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhance MFA multi-device testing on troubleshoot and revoke pages#84016

Enhance MFA multi-device testing on troubleshoot and revoke pages#84016
chuckdries merged 53 commits intoExpensify:mainfrom
DylanDylann:Dylan-enhance-troubleshoot-revoke

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Analysis

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants