Some PNP fixes

_locales/en/messages.json

@@ -2439,7 +2439,7 @@
     "description": "Error message when you try to send an edit after message becomes too old"
   },
   "icu:startConversation--username-not-found": {
-    "messageformat": "User not found. {atUsername} is not a Signal user; make sure you’ve entered the complete username.",
+    "messageformat": "{atUsername} is not a Signal user. Make sure you've entered the complete username.",
     "description": "Shown in dialog if username is not found. Note that 'username' will be the output of at-username"
   },
   "icu:startConversation--phone-number-not-found": {

ts/components/LeftPane.tsx

@@ -625,17 +625,18 @@ export function LeftPane({
     dialogs.push({ key: 'banner', dialog: maybeBanner });
   }
 
+  const hideHeader =
+    modeSpecificProps.mode === LeftPaneMode.Archive ||
+    modeSpecificProps.mode === LeftPaneMode.Compose ||
+    modeSpecificProps.mode === LeftPaneMode.FindByUsername ||
+    modeSpecificProps.mode === LeftPaneMode.FindByPhoneNumber ||
+    modeSpecificProps.mode === LeftPaneMode.ChooseGroupMembers ||
+    modeSpecificProps.mode === LeftPaneMode.SetGroupMetadata;
+
   return (
     <NavSidebar
       title="Chats"
-      hideHeader={
+      hideHeader={hideHeader}
-        modeSpecificProps.mode === LeftPaneMode.Archive ||
-        modeSpecificProps.mode === LeftPaneMode.Compose ||
-        modeSpecificProps.mode === LeftPaneMode.FindByUsername ||
-        modeSpecificProps.mode === LeftPaneMode.FindByPhoneNumber ||
-        modeSpecificProps.mode === LeftPaneMode.ChooseGroupMembers ||
-        modeSpecificProps.mode === LeftPaneMode.SetGroupMetadata
-      }
       i18n={i18n}
       otherTabsUnreadStats={otherTabsUnreadStats}
       hasFailedStorySends={hasFailedStorySends}
@@ -722,9 +723,10 @@ export function LeftPane({
           </NavSidebarSearchHeader>
         )}
         <div className="module-left-pane__dialogs">
-          {dialogs.map(({ key, dialog }) => (
+          {!hideHeader &&
-            <React.Fragment key={key}>{dialog}</React.Fragment>
+            dialogs.map(({ key, dialog }) => (
-          ))}
+              <React.Fragment key={key}>{dialog}</React.Fragment>
+            ))}
         </div>
         {preRowsNode && <React.Fragment key={0}>{preRowsNode}</React.Fragment>}
         <div className="module-left-pane__list--measure" ref={measureRef}>

ts/components/ProfileEditor.tsx

@@ -621,6 +621,8 @@ export function ProfileEditor({
           }
           label={i18n('icu:ProfileEditor__username-link')}
           onClick={() => {
+            markCompletedUsernameLinkOnboarding();
+
             if (usernameLinkCorrupted) {
               setIsResettingUsernameLink(true);
               return;
@@ -633,7 +635,7 @@ export function ProfileEditor({
         />
       );
 
-      if (!hasCompletedUsernameLinkOnboarding) {
+      if (!hasCompletedUsernameLinkOnboarding && !usernameLink) {
         maybeUsernameLinkRow = (
           <UsernameLinkTooltip
             handleClose={markCompletedUsernameLinkOnboarding}