diff --git a/_locales/en/messages.json b/_locales/en/messages.json index f218b14328a..c9c35a8731d 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -860,7 +860,7 @@ }, "at-username": { "message": "@$username$", - "description": "@ added to username to signify it as a username. Should it be on the right in your language?" + "description": "(deleted 02/07/2023) @ added to username to signify it as a username. Should it be on the right in your language?" }, "welcomeToSignal": { "message": "Welcome to Signal" diff --git a/ts/components/GlobalModalContainer.tsx b/ts/components/GlobalModalContainer.tsx index 440f329c570..a2ad9ad2021 100644 --- a/ts/components/GlobalModalContainer.tsx +++ b/ts/components/GlobalModalContainer.tsx @@ -181,9 +181,7 @@ export function GlobalModalContainer({ }); } else if (userNotFoundModalState.type === 'username') { content = i18n('startConversation--username-not-found', { - atUsername: i18n('at-username', { - username: userNotFoundModalState.username, - }), + atUsername: userNotFoundModalState.username, }); } else { throw missingCaseError(userNotFoundModalState); diff --git a/ts/components/conversationList/UsernameCheckbox.tsx b/ts/components/conversationList/UsernameCheckbox.tsx index 64d9390874b..62c57256e1e 100644 --- a/ts/components/conversationList/UsernameCheckbox.tsx +++ b/ts/components/conversationList/UsernameCheckbox.tsx @@ -62,7 +62,7 @@ export const UsernameCheckbox: FunctionComponent = React.memo( username, ]); - const title = i18n('at-username', { username }); + const title = username; const avatar = ( { if (isFetchingUsername) { return; @@ -59,7 +58,7 @@ export function UsernameSearchResultListItem({ ); } diff --git a/ts/test-mock/pnp/username_test.ts b/ts/test-mock/pnp/username_test.ts index 8803d9f65df..9e9efbe1621 100644 --- a/ts/test-mock/pnp/username_test.ts +++ b/ts/test-mock/pnp/username_test.ts @@ -89,7 +89,7 @@ describe('pnp/username', function needsName() { debug('find username in the left pane'); await leftPane .locator( - `[data-testid="${usernameContact.device.uuid}"] >> "@${USERNAME}"` + `[data-testid="${usernameContact.device.uuid}"] >> "${USERNAME}"` ) .waitFor(); @@ -243,7 +243,7 @@ describe('pnp/username', function needsName() { await searchInput.type(`@${CARL_USERNAME}`); debug('starting lookup'); - await window.locator(`button >> "@${CARL_USERNAME}"`).click(); + await window.locator(`button >> "${CARL_USERNAME}"`).click(); debug('sending a message'); { diff --git a/ts/util/getTitle.ts b/ts/util/getTitle.ts index 7e2af8e78d8..2b7a6851896 100644 --- a/ts/util/getTitle.ts +++ b/ts/util/getTitle.ts @@ -40,7 +40,7 @@ export function getTitleNoDefault( (isShort ? attributes.profileName : undefined) || getProfileName(attributes) || getNumber(attributes) || - (username && window.i18n('at-username', { username })) + username ); }