Merge pull request #1942 from session-foundation/cta-last-appeal

chore: last appeal changes & string & bump to 1.18.0

Author: Bilb

images/cta/donate-appeal.webp

@@ -4,7 +4,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.17.17",
+  "version": "1.18.0",
   "license": "GPL-3.0",
   "author": {
     "name": "Session Foundation",

package.json

@@ -69,14 +69,18 @@ export const StyledScrollDescriptionContainer = styled.div`
   color: var(--text-secondary-color);
 `;
 
-const StyledCTAImage = styled.img`
+const StyledCTAImage = styled.img<{ $withSmallGradient?: boolean }>`
   width: 100%;
   height: 100%;
   object-fit: cover;
   object-position: right center;
   background-color: var(--primary-color);
 
-  mask-image: linear-gradient(to bottom, black 66%, transparent 97%);
+  ${props =>
+    props.$withSmallGradient
+      ? 'mask-image: linear-gradient(to bottom, black 90%, transparent 97%);'
+      : 'mask-image: linear-gradient(to bottom, black 66%, transparent 97%);'}
+
   mask-size: 100% 100%;
 `;
 
@@ -176,7 +180,7 @@ function getImage(variant: CTAVariant): ReactNode {
       return <StyledCTAImage src="images/cta/donate.webp" />;
 
     case CTAVariant.DONATE_APPEAL:
-      return <StyledCTAImage src="images/cta/donate-appeal.webp" />;
+      return <StyledCTAImage src="images/cta/donate-appeal.webp" $withSmallGradient={true} />;
 
     default:
       assertUnreachable(variant, 'getImage');
@@ -186,10 +190,11 @@ function getImage(variant: CTAVariant): ReactNode {
 
 const StyledDonateAppealTitleContainer = styled(Localizer)`
   text-align: center;
+  margin-inline: var(--margins-xs);
 `;
 
 function DonateAppealTitle() {
-  return <StyledDonateAppealTitleContainer token="donateSessionAppealTitle" />;
+  return <StyledDonateAppealTitleContainer token="finalAppeal" />;
 }
 
 function getTitle(variant: CTAVariantExcludingProCTAs) {
@@ -221,7 +226,7 @@ function getDescription(variant: CTAVariantExcludingProCTAs) {
       return <Localizer token="donateSessionDescription" />;
 
     case CTAVariant.DONATE_APPEAL:
-      return <Localizer token="donateSessionAppealDescription" />;
+      return <Localizer token="finalAppealDescription" />;
 
     default:
       assertUnreachable(variant, 'CtaTitle');
@@ -311,7 +316,7 @@ function Buttons({
           }}
           dataTestId="cta-confirm-button"
         >
-          <Localizer token="donateSessionAppealReadMore" />
+          <Localizer token="readMoreCapital" />
         </SessionButtonShiny>
       );
     }

ts/components/dialog/SessionCTA.tsx

@@ -40,6 +40,7 @@ import {
 } from './utils';
 import { CONVERSATION_PRIORITIES } from '../../models/types';
 import { MessageDeletedType } from '../../models/messageType';
+import { CTAVariant } from '../../components/dialog/cta/types';
 
 // eslint:disable: quotemark one-variable-per-declaration no-unused-expression
 
@@ -129,6 +130,7 @@ const LOKI_SCHEMA_VERSIONS: Array<(currentVersion: number, db: Database) => void
     updateToSessionSchemaVersion52,
     updateToSessionSchemaVersion53,
     updateToSessionSchemaVersion54,
+    updateToSessionSchemaVersion55,
   ];
 
 function updateToSessionSchemaVersion1(currentVersion: number, db: Database) {
@@ -2396,6 +2398,38 @@ async function updateToSessionSchemaVersion54(currentVersion: number, db: Databa
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
+async function updateToSessionSchemaVersion55(currentVersion: number, db: Database) {
+  const targetVersion = 55;
+  if (currentVersion >= targetVersion) {
+    return;
+  }
+  console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
+
+  db.transaction(() => {
+    const ctaInteractions = sqlNode.getItemById(SettingsKey.ctaInteractions, db)?.value ?? [];
+    console.log(
+      `updateToSessionSchemaVersion55 ${SettingsKey.ctaInteractions} before: ${JSON.stringify(ctaInteractions)}`
+    );
+
+    const idx = ctaInteractions.findIndex((i: any) => i?.variant === CTAVariant.DONATE_APPEAL);
+    if (idx !== -1) {
+      ctaInteractions.splice(idx, 1);
+      console.log(
+        `updateToSessionSchemaVersion55 removed ${CTAVariant.DONATE_APPEAL} from ${SettingsKey.ctaInteractions}`
+      );
+      sqlNode.createOrUpdateItem({ id: SettingsKey.ctaInteractions, value: ctaInteractions }, db);
+    }
+
+    console.log(
+      `updateToSessionSchemaVersion55 ${SettingsKey.ctaInteractions} after: ${JSON.stringify(sqlNode.getItemById(SettingsKey.ctaInteractions, db)?.value ?? [])}`
+    );
+
+    writeSessionSchemaVersion(targetVersion, db);
+  })();
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
+}
+
 export function printTableColumns(table: string, db: Database) {
   console.info(db.pragma(`table_info('${table}');`));
 }

ts/localization

@@ -51,7 +51,6 @@ const fetchInfoFromSeshServer = createAsyncThunk(
       if (infoLoading) {
         throw new Error('already loading');
       }
-
       payloadCreator.dispatch(setInfoLoading(true));
       const result = await NetworkApi.getInfo();
       if (!result) {