Skip to content

Conversation

@sreecharan-desu
Copy link
Contributor

Fixes #17370. Devices sharing the same name were incorrectly being merged in the 'Connected Services' list because they were grouped solely by name. This PR changes the grouping logic to use 'deviceId' as the primary key (falling back to 'name' for non-sync clients), ensuring that distinct devices with the same name are correctly shown as separate entries. It also updates the 'disconnect all' logic to correctly handle multiple sessions for the same physical device.

@sreecharan-desu sreecharan-desu requested a review from a team as a code owner January 23, 2026 17:46
@sreecharan-desu sreecharan-desu force-pushed the fix/connected-services-duplicate-names-17370 branch from 2bd418b to 85bb36b Compare January 23, 2026 18:30
@MagentaManifold
Copy link
Contributor

Not sure if you can see CI output, but unfortunately this PR does not compile/build.

> nx run fxa-settings:build-ts

src/components/Settings/ConnectedServices/index.test.tsx(156,37): error TS2339: Property 'groupedByName' does not exist on type '{ groupedByDevice: Dictionary<AttachedClient[]>; sortedAndUniqueClients: AttachedClient[]; }'.

I recommend running the stack locally (which is, admittedly, not easy) before submitting PRs.

@sreecharan-desu
Copy link
Contributor Author

Thanks for flagging this. I’ve identified the issue with groupedByName in the test and am working on a fix.

@sreecharan-desu
Copy link
Contributor Author

Fix Applied

  • Removed the outdated groupedByName usage
  • Updated test assertions to match the current return type
  • Verified locally using nx run fxa-settings:build-ts

CI is now passing. Thanks for the review.

@sreecharan-desu sreecharan-desu force-pushed the fix/connected-services-duplicate-names-17370 branch from 2f4d7f3 to 2dd112e Compare February 11, 2026 05:29
@sreecharan-desu sreecharan-desu requested a review from a team as a code owner February 11, 2026 05:29
@sreecharan-desu
Copy link
Contributor Author

Note: This PR was closed while I was fixing the GPG signing and rebasing onto main.

I’ve recreated the fix cleanly with a signed commit here: #20041.

Thanks for your patience.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Devices sharing same name are displayed as a single device on connected services

2 participants