Merge pull request #1563 from session-foundation/fix-pro-badge-more-issues

fix: more qa issues with pro badges

Author: Bilb

ts/components/conversation/ContactName/ContactName.tsx

@@ -177,6 +177,29 @@ const boldStyles: CSSProperties = {
   fontWeight: 'bold',
 };
 
+function allowShowUPMForNtsCtx(ctx: ContactNameContext) {
+  // We are doing this as a switch instead of an array so we have to be explicit anytime we add a new context,
+  // thanks to the assertUnreachable below
+  switch (ctx) {
+    case 'message-info-author':
+    case 'member-list-item':
+    case 'member-list-item-mention-row':
+    case 'contact-list-row':
+    case 'message-author':
+    case 'quote-author':
+    case 'quoted-message-composition':
+    case 'react-list-modal':
+    case 'message-search-result-conversation':
+    case 'message-search-result-from':
+    case 'conversation-list-item':
+    case 'conversation-list-item-search':
+      return false;
+    default:
+      assertUnreachable(ctx, 'isForceSingleLineCtx');
+      throw new Error('isForceSingleLineCtx: unreachable');
+  }
+}
+
 export const ContactName = ({
   pubkey,
   module,
@@ -231,7 +254,10 @@ export const ContactName = ({
 
   const userHasPro = useUserHasPro(pubkey);
 
-  const showConversationSettingsCb = useShowUserDetailsCbFromConversation(pubkey);
+  const showConversationSettingsCb = useShowUserDetailsCbFromConversation(
+    pubkey,
+    allowShowUPMForNtsCtx(contactNameContext)
+  );
 
   const showProBadge = useProBadgeOnClickCb({
     context: 'contact-name',

ts/components/conversation/right-panel/overlay/message-info/components/MessageFrom.tsx

@@ -49,7 +49,7 @@ export const MessageFrom = (props: { sender: string; isSenderAdmin: boolean }) =
 
   const selectedConvoId = useSelectedConversationKey();
 
-  const showUserProfileModalCb = useShowUserDetailsCbFromConversation(sender) ?? undefined;
+  const showUserProfileModalCb = useShowUserDetailsCbFromConversation(sender, true) ?? undefined;
 
   return (
     <StyledMessageInfoAuthor>

ts/components/dialog/SessionProInfoModal.tsx

@@ -264,6 +264,7 @@ export function SessionProInfoModal(props: SessionProInfoState) {
   if (isNil(props?.variant) || (hasPro && !isProVisibleCTA(props.variant))) {
     return null;
   }
+  const isGroupCta = props.variant === SessionProInfoVariant.GROUP_ACTIVATED;
 
   return (
     <SessionWrapperModal
@@ -316,7 +317,7 @@ export function SessionProInfoModal(props: SessionProInfoState) {
     >
       <SpacerSM />
       <StyledCTATitle reverseDirection={hasPro}>
-        {tr(hasPro ? 'proActivated' : 'upgradeTo')}
+        {tr(hasPro ? (isGroupCta ? 'proGroupActivated' : 'proActivated') : 'upgradeTo')}
         <ProIconButton iconSize={'huge'} dataTestId="invalid-data-testid" onClick={undefined} />
       </StyledCTATitle>
       <SpacerXL />

ts/components/dialog/conversationSettings/ConversationTitleDialog.tsx

@@ -80,7 +80,7 @@ export const ConversationTitleDialog = ({
       }}
       onClick={onClickCb || undefined}
     >
-      {isMe ? tr('noteToSelf') : nicknameOrDisplayName}
+      {isMe ? tr('you') : nicknameOrDisplayName}
       <ProBadge conversationId={conversationId} />
     </H5>
   );

ts/components/leftpane/conversation-list-item/ConversationListItem.tsx

@@ -28,7 +28,7 @@ const Portal = ({ children }: { children: ReactNode }) => {
 const AvatarItem = () => {
   const conversationId = useConvoIdFromContext();
 
-  const showUserDetailsCb = useShowUserDetailsCbFromConversation(conversationId);
+  const showUserDetailsCb = useShowUserDetailsCbFromConversation(conversationId, true);
 
   return (
     <div>

ts/components/leftpane/overlay/choose-action/ContactRow.tsx

@@ -13,7 +13,7 @@ const StyledAvatarItem = styled.div`
 const AvatarItem = (props: Pick<Props, 'id'>) => {
   const { id } = props;
 
-  const showUserDetailsFromConversationCb = useShowUserDetailsCbFromConversation(id) ?? undefined;
+  const showUserDetailsFromConversationCb = useShowUserDetailsCbFromConversation(id, true) ?? undefined;
 
   return (
     <StyledAvatarItem>

ts/components/menu/Menu.tsx

@@ -94,7 +94,7 @@ export const DeletePrivateContactMenuItem = () => {
 export const ShowUserProfileMenuItem = () => {
   const convoId = useConvoIdFromContext();
 
-  const showUserDetailsCb = useShowUserDetailsCbFromConversation(convoId);
+  const showUserDetailsCb = useShowUserDetailsCbFromConversation(convoId, true);
 
   if (showUserDetailsCb) {
     return (

ts/components/menuAndSettingsHooks/useShowUserDetailsCb.ts

@@ -79,14 +79,17 @@ export function useShowUserDetailsCbFromMessage() {
  * Show the user details modal for a given conversation.
  * Note: this is only a valid action for private chats (blinded or not, friends or not)
  */
-export function useShowUserDetailsCbFromConversation(conversationId?: string) {
+export function useShowUserDetailsCbFromConversation(
+  conversationId?: string,
+  allowForNts?: boolean
+) {
   const dispatch = useDispatch();
 
   const isPrivate = useIsPrivate(conversationId);
 
   const isMe = useIsMe(conversationId);
 
-  if (!conversationId || isMe) {
+  if (!conversationId || (isMe && !allowForNts)) {
     return null;
   }