fix: show pro badge for Msg search results that have pro

Author: Bilb

ts/components/conversation/ContactName/ContactName.tsx

@@ -39,7 +39,8 @@ function isBoldProfileNameCtx(ctx: ContactNameContext) {
     case 'quote-author':
     case 'conversation-list-item-search':
     case 'react-list-modal':
-    case 'message-search-result':
+    case 'message-search-result-conversation':
+    case 'message-search-result-from':
       return false;
     default:
       assertUnreachable(ctx, 'isBoldProfileNameCtx');
@@ -70,7 +71,8 @@ function isShowPubkeyCtx(ctx: ContactNameContext, isBlinded: boolean) {
     case 'quoted-message-composition':
     case 'conversation-list-item-search':
     case 'react-list-modal':
-    case 'message-search-result':
+    case 'message-search-result-conversation':
+    case 'message-search-result-from':
       return false;
     default:
       assertUnreachable(ctx, 'isShowPubkeyCtx');
@@ -89,12 +91,13 @@ function isShowNtsIsYouCtx(ctx: ContactNameContext) {
     case 'quote-author':
     case 'quoted-message-composition':
     case 'react-list-modal':
-    case 'message-search-result':
     case 'member-list-item':
     case 'member-list-item-mention-row':
     case 'message-info-author':
+    case 'message-search-result-from':
       return true;
     case 'contact-list-row':
+    case 'message-search-result-conversation':
     case 'conversation-list-item':
     case 'conversation-list-item-search':
       return false;
@@ -120,7 +123,8 @@ function isForceSingleLineCtx(ctx: ContactNameContext) {
     case 'quote-author':
     case 'quoted-message-composition':
     case 'react-list-modal':
-    case 'message-search-result':
+    case 'message-search-result-conversation':
+    case 'message-search-result-from':
     case 'conversation-list-item':
     case 'conversation-list-item-search':
       return false;
@@ -146,7 +150,8 @@ function isShowUPMOnClickCtx(ctx: ContactNameContext) {
     case 'quote-author':
     case 'quoted-message-composition':
     case 'react-list-modal':
-    case 'message-search-result':
+    case 'message-search-result-conversation':
+    case 'message-search-result-from':
     case 'conversation-list-item':
     case 'conversation-list-item-search':
       return false;

ts/components/conversation/ContactName/ContactNameContext.ts

@@ -12,6 +12,7 @@ export type ContactNameContext =
   | 'quote-author' // the author of the quoted message, shown in the message list
   | 'react-list-modal'
   | 'message-info-author' // the author of the message as shown in the message info (right panel)
-  | 'message-search-result'
+  | 'message-search-result-conversation' // the conversation name in the message search results
+  | 'message-search-result-from' // the name of the sender in the message search results
   | 'contact-list-row' // the name in the list of contacts (after clicking the + from the left pane)
   | `member-list-item${ContactNameSuffixInMemberList}`;

ts/components/menuAndSettingsHooks/useProBadgeOnClickCb.tsx

@@ -77,10 +77,11 @@ const showNoCb: ShowTagNoCb = { show: true, cb: null };
 function isContactNameNoShowContext(context: ContactNameContext) {
   switch (context) {
     case 'react-list-modal':
-    case 'message-search-result':
+    case 'message-search-result-from': // no pro badge when showing the sender of a message in the search results
     case 'member-list-item-mention-row': // we don't want the pro badge when mentioning someone (from the composition box)
       return true;
     case 'contact-list-row':
+    case 'message-search-result-conversation': // show the pro badge when showing the conversation name in the search results
     case 'quoted-message-composition':
     case 'message-info-author':
     case 'member-list-item':

ts/components/search/MessageSearchResults.tsx

@@ -92,7 +92,7 @@ const FromName = (props: { source: string; conversationId: string }) => {
     <ContactName
       pubkey={conversationId}
       module="module-message-search-result__header__name"
-      contactNameContext="message-search-result"
+      contactNameContext="message-search-result-from"
       conversationId={conversationId}
     />
   );
@@ -109,7 +109,7 @@ const ConversationHeader = (props: { source: string; conversationId: string }) =
         <StyledMessageResultsHeaderName>
           <ContactName
             pubkey={conversationId}
-            contactNameContext="message-search-result"
+            contactNameContext="message-search-result-conversation"
             conversationId={conversationId}
           />
         </StyledMessageResultsHeaderName>