chore: group activated does not show user CTA even if he has no pro

Author: Bilb

ts/components/dialog/SessionProInfoModal.tsx

@@ -266,6 +266,13 @@ export function SessionProInfoModal(props: SessionProInfoState) {
   }
   const isGroupCta = props.variant === SessionProInfoVariant.GROUP_ACTIVATED;
 
+  /**
+   * Note: the group activated cta is quite custom, but whatever the pro status of the current pro user,
+   * we do not want to show the CTA for "subscribe to pro".
+   * An admin have subscribed and that's all that's needed to make this group a Pro group.
+   */
+  const hasNoProAndNotGroupCta = !hasPro && !isGroupCta;
+
   return (
     <SessionWrapperModal
       onClose={onClose}
@@ -283,14 +290,14 @@ export function SessionProInfoModal(props: SessionProInfoState) {
             display: 'grid',
             alignItems: 'center',
             justifyItems: 'center',
-            gridTemplateColumns: hasPro ? '1fr' : '1fr 1fr',
+            gridTemplateColumns: !hasNoProAndNotGroupCta ? '1fr' : '1fr 1fr',
             columnGap: 'var(--margins-sm)',
             paddingInline: 'var(--margins-md)',
             marginBottom: 'var(--margins-md)',
             height: 'unset',
           }}
         >
-          {!hasPro ? (
+          {hasNoProAndNotGroupCta ? (
             <SessionButtonShiny
               {...buttonProps}
               shinyContainerStyle={{
@@ -308,24 +315,26 @@ export function SessionProInfoModal(props: SessionProInfoState) {
             buttonColor={SessionButtonColor.Tertiary}
             onClick={onClose}
             dataTestId="modal-session-pro-cancel-button"
-            style={hasPro ? { ...buttonProps.style, width: '50%' } : buttonProps.style}
+            style={
+              !hasNoProAndNotGroupCta ? { ...buttonProps.style, width: '50%' } : buttonProps.style
+            }
           >
-            {tr(hasPro ? 'close' : 'cancel')}
+            {tr(!hasNoProAndNotGroupCta ? 'close' : 'cancel')}
           </SessionButton>
         </ModalActionsContainer>
       }
     >
       <SpacerSM />
-      <StyledCTATitle reverseDirection={hasPro}>
-        {tr(hasPro ? (isGroupCta ? 'proGroupActivated' : 'proActivated') : 'upgradeTo')}
+      <StyledCTATitle reverseDirection={!hasNoProAndNotGroupCta}>
+        {tr(isGroupCta ? 'proGroupActivated' : hasPro ? 'proActivated' : 'upgradeTo')}
         <ProIconButton iconSize={'huge'} dataTestId="invalid-data-testid" onClick={undefined} />
       </StyledCTATitle>
       <SpacerXL />
       <StyledContentContainer>
         <StyledScrollDescriptionContainer>
           {getDescription(props.variant)}
         </StyledScrollDescriptionContainer>
-        {!hasPro ? (
+        {hasNoProAndNotGroupCta ? (
           <StyledFeatureList>
             {getFeatureList(props.variant).map(token => (
               <FeatureListItem>{tr(token)}</FeatureListItem>

ts/components/dialog/user-settings/pages/DefaultSettingsPage.tsx

@@ -402,7 +402,7 @@ export const DefaultSettingPage = () => {
               <SessionLucideIconButton
                 iconSize="small"
                 unicode={LUCIDE_ICONS_UNICODE.COPY}
-                iconColor="var(--primary-color)"
+                iconColor="var(--renderer-span-primary)"
                 onClick={copyAccountIdToClipboard}
               />
             }

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

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

ts/node/sql.ts

@@ -1859,7 +1859,9 @@ function cleanUpUnreadExpiredDaRMessages() {
  */
 function cleanUpInvalidConversationIds() {
   const deleteResult = assertGlobalInstance()
-    .prepare(`DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = '' OR id IS NULL OR typeof(id) != 'text';`)
+    .prepare(
+      `DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = '' OR id IS NULL OR typeof(id) != 'text';`
+    )
     .run();
 
   console.info(`cleanUpInvalidConversationIds removed ${deleteResult.changes} rows`);