Skip to content

fix: add correct link and msg for incabale mls clients [WPB-24215] #21406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
e-maad wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: add correct link and msg for incabale mls clients [WPB-24215] #21406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/webapp/src/i18n/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions apps/webapp/src/types/i18n.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.`;
Expand Down
2 changes: 1 addition & 1 deletion libraries/core/src/messagingProtocols/mls/mlsService/mlsService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]},
]);

Expand Down
2 changes: 1 addition & 1 deletion libraries/core/src/messagingProtocols/mls/mlsService/mlsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ export class MLSService extends TypedEventEmitter<Events> {
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) {
Expand Down
Loading