Remove at-username i18n string

_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"

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', {
+        atUsername: userNotFoundModalState.username,
-          username: userNotFoundModalState.username,
-        }),
       });
     } else {
       throw missingCaseError(userNotFoundModalState);

ts/components/conversationList/UsernameCheckbox.tsx

@@ -62,7 +62,7 @@ export const UsernameCheckbox: FunctionComponent<PropsType> = React.memo(
       username,
     ]);
 
-    const title = i18n('at-username', { username });
+    const title = username;
 
     const avatar = (
       <Avatar

ts/components/conversationList/UsernameSearchResultListItem.tsx

@@ -30,7 +30,6 @@ export function UsernameSearchResultListItem({
   setIsFetchingUUID,
   showConversation,
 }: Props): JSX.Element {
-  const usernameText = i18n('at-username', { username });
   const boundOnClick = useCallback(async () => {
     if (isFetchingUsername) {
       return;
@@ -59,7 +58,7 @@ export function UsernameSearchResultListItem({
     <BaseConversationListItem
       acceptedMessageRequest={false}
       conversationType="direct"
-      headerName={usernameText}
+      headerName={username}
       i18n={i18n}
       isMe={false}
       isSelected={false}
@@ -67,7 +66,7 @@ export function UsernameSearchResultListItem({
       shouldShowSpinner={isFetchingUsername}
       onClick={boundOnClick}
       sharedGroupNames={[]}
-      title={usernameText}
+      title={username}
     />
   );
 }

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');
     {

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
   );
 }