From f2fbd5e904c8f8f9c4de6f8bdbe194dfccc9a9b3 Mon Sep 17 00:00:00 2001 From: Immad Abdul Jabbar Date: Fri, 29 May 2026 13:20:58 +0200 Subject: [PATCH] fix: add correct link and msg for incabale mls clients [WPB-24215] --- apps/webapp/src/i18n/en-US.json | 6 +++--- .../MessagesList/Message/FailedToAddUsersMessage.tsx | 2 +- apps/webapp/src/types/i18n.d.ts | 6 +++--- .../messagingProtocols/mls/mlsService/mlsService.test.ts | 2 +- .../src/messagingProtocols/mls/mlsService/mlsService.ts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/webapp/src/i18n/en-US.json b/apps/webapp/src/i18n/en-US.json index a434345d77c..7be8ea7612c 100644 --- a/apps/webapp/src/i18n/en-US.json +++ b/apps/webapp/src/i18n/en-US.json @@ -1009,16 +1009,16 @@ "extensionsGiphyNoGifs": "Oops, no gifs", "extensionsGiphyRandom": "Random", "failedToAddParticipantSingularNonFederatingBackends": "[bold]{name}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.", - "failedToAddParticipantSingularNotMlsCapable": "[bold]{name}[/bold] could not be added to the group.", + "failedToAddParticipantSingularNotMlsCapable": "[bold]{name}[/bold] could not be added to the conversation. They may not have MLS-capable clients.", "failedToAddParticipantSingularOfflineBackend": "[bold]{name}[/bold] could not be added to the group as the backend of [bold]{domain}[/bold] could not be reached.", "failedToAddParticipantSingularOfflineForTooLong": "[bold]{name}[/bold] could not be added to the group.", "failedToAddParticipantsPlural": "[bold]{total} participants[/bold] could not be added to the group.", "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group as their backends do not federate with each other.", - "failedToAddParticipantsPluralDetailsNotMlsCapable": "[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group.", + "failedToAddParticipantsPluralDetailsNotMlsCapable": "[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the conversation. They may not have MLS-capable clients.", "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group as the backend of [bold]{domain}[/bold] could not be reached.", "failedToAddParticipantsPluralDetailsOfflineForTooLong": "[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group.", "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{name}[/bold] could not be added to the group as their backends do not federate with each other.", - "failedToAddParticipantsSingularDetailsNotMlsCapable": "[bold]{name}[/bold] could not be added to the group.", + "failedToAddParticipantsSingularDetailsNotMlsCapable": "[bold]{name}[/bold] could not be added to the conversation. They may not have MLS-capable clients.", "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{name}[/bold] could not be added to the group as the backend of [bold]{domain}[/bold] could not be reached.", "failedToAddParticipantsSingularDetailsOfflineForTooLong": "[bold]{name}[/bold] could not be added to the group.", "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.", diff --git a/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx index 033ff655867..fa08cb329a9 100644 --- a/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx +++ b/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx @@ -63,7 +63,7 @@ const reasonToMessageDataMap = { translationLabel: 'OfflineForTooLong', }, [AddUsersFailureReasons.NOT_MLS_CAPABLE]: { - link: {url: config.URL.SUPPORT.MLS_MIGRATION_FROM_PROTEUS, name: 'mls-learn-more'}, + link: {url: config.URL.SUPPORT.MLS_LEARN_MORE, name: 'mls-learn-more'}, translationLabel: 'NotMlsCapable', }, } as const; diff --git a/apps/webapp/src/types/i18n.d.ts b/apps/webapp/src/types/i18n.d.ts index 4f45efda108..79e9a62cabc 100644 --- a/apps/webapp/src/types/i18n.d.ts +++ b/apps/webapp/src/types/i18n.d.ts @@ -1013,16 +1013,16 @@ declare module 'I18n/en-US.json' { 'extensionsGiphyNoGifs': `Oops, no gifs`; 'extensionsGiphyRandom': `Random`; 'failedToAddParticipantSingularNonFederatingBackends': `[bold]{name}[/bold] could not be added to the group as their backend doesn\'t federate with the backends of all group participants.`; - 'failedToAddParticipantSingularNotMlsCapable': `[bold]{name}[/bold] could not be added to the group.`; + 'failedToAddParticipantSingularNotMlsCapable': `[bold]{name}[/bold] could not be added to the conversation. They may not have MLS-capable clients.`; 'failedToAddParticipantSingularOfflineBackend': `[bold]{name}[/bold] could not be added to the group as the backend of [bold]{domain}[/bold] could not be reached.`; 'failedToAddParticipantSingularOfflineForTooLong': `[bold]{name}[/bold] could not be added to the group.`; 'failedToAddParticipantsPlural': `[bold]{total} participants[/bold] could not be added to the group.`; 'failedToAddParticipantsPluralDetailsNonFederatingBackends': `[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group as their backends do not federate with each other.`; - 'failedToAddParticipantsPluralDetailsNotMlsCapable': `[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group.`; + 'failedToAddParticipantsPluralDetailsNotMlsCapable': `[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the conversation. They may not have MLS-capable clients.`; 'failedToAddParticipantsPluralDetailsOfflineBackend': `[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group as the backend of [bold]{domain}[/bold] could not be reached.`; 'failedToAddParticipantsPluralDetailsOfflineForTooLong': `[bold]{names}[/bold] and [bold]{name}[/bold] could not be added to the group.`; 'failedToAddParticipantsSingularDetailsNonFederatingBackends': `[bold]{name}[/bold] could not be added to the group as their backends do not federate with each other.`; - 'failedToAddParticipantsSingularDetailsNotMlsCapable': `[bold]{name}[/bold] could not be added to the group.`; + 'failedToAddParticipantsSingularDetailsNotMlsCapable': `[bold]{name}[/bold] could not be added to the conversation. They may not have MLS-capable clients.`; 'failedToAddParticipantsSingularDetailsOfflineBackend': `[bold]{name}[/bold] could not be added to the group as the backend of [bold]{domain}[/bold] could not be reached.`; 'failedToAddParticipantsSingularDetailsOfflineForTooLong': `[bold]{name}[/bold] could not be added to the group.`; 'featureConfigChangeModalApplock': `Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.`; diff --git a/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.test.ts b/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.test.ts index 9c9cbf8ed92..a5b09f836a4 100644 --- a/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.test.ts +++ b/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.test.ts @@ -260,7 +260,7 @@ describe('MLSService', () => { const {failures, keyPackages} = await mlsService.getKeyPackagesPayload(users); expect(failures).toEqual([ - {reason: AddUsersFailureReasons.OFFLINE_FOR_TOO_LONG, users: [users[1]]}, + {reason: AddUsersFailureReasons.NOT_MLS_CAPABLE, users: [users[1]]}, {reason: AddUsersFailureReasons.UNREACHABLE_BACKENDS, users: [users[0]], backends: [users[1].domain]}, ]); diff --git a/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.ts b/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.ts index d78118422b8..308b7461cfb 100644 --- a/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.ts +++ b/libraries/core/src/messagingProtocols/mls/mlsService/mlsService.ts @@ -451,7 +451,7 @@ export class MLSService extends TypedEventEmitter { const failures: AddUsersFailure[] = []; if (emptyKeyPackagesUsers.length > 0) { - failures.push({reason: AddUsersFailureReasons.OFFLINE_FOR_TOO_LONG, users: emptyKeyPackagesUsers}); + failures.push({reason: AddUsersFailureReasons.NOT_MLS_CAPABLE, users: emptyKeyPackagesUsers}); } if (failedToFetchKeyPackages.length > 0) {