From ec25d2f97fc597f2716e9a96d4d547fbd94cce8d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 22 Feb 2024 17:00:43 +1100
Subject: [PATCH] chore: bump Session to 1.12.0

---
 package.json                                    |  2 +-
 .../OverlayDisappearingMessages.tsx             |  2 +-
 ts/session/constants.ts                         |  7 +------
 ts/util/releaseFeature.ts                       | 17 ++++++++---------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 12f70835a..6e22d0daf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.11.8",
+  "version": "1.12.0",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",
diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
index b0e970bcf..a81aa6c4d 100644
--- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
+++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
@@ -13,7 +13,7 @@ import {
   useSelectedConversationKey,
   useSelectedExpireTimer,
   useSelectedIsGroupOrCommunity,
-  useSelectedWeAreAdmin
+  useSelectedWeAreAdmin,
 } from '../../../../../state/selectors/selectedConversation';
 import { ReleasedFeatures } from '../../../../../util/releaseFeature';
 import { Flex } from '../../../../basic/Flex';
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
index 7a55b33f5..b93d9ee9e 100644
--- a/ts/session/constants.ts
+++ b/ts/session/constants.ts
@@ -71,11 +71,6 @@ export const REACT_LIMIT = 6;
 export const MAX_USERNAME_BYTES = 64;
 
 export const FEATURE_RELEASE_TIMESTAMPS = {
-  // TODO update to agreed value between platforms for `disappearing_messages`
-  DISAPPEARING_MESSAGES_V2: 1706778000000, // unix 01/02/2024 09:00
-  // TODO DO NOT MERGE Remove after QA
-  // NOTE for testing purposes only
-  // DISAPPEARING_MESSAGES_V2: 1677488400000, // unix 27/02/2023 09:00
-
+  DISAPPEARING_MESSAGES_V2: 1710147600000, // unix 11/03/2024 09:00
   USER_CONFIG: 1690761600000, // Monday July 31st at 10am Melbourne time
 };
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 7854e507c..17f573575 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -100,10 +100,10 @@ async function checkIsUserConfigFeatureReleased() {
 }
 
 async function checkIsDisappearMessageV2FeatureReleased() {
-  return true;
-  //   ((await checkIsFeatureReleased('disappearing_messages')) ||
-  //   !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA
-  // );
+  return (
+    (await checkIsFeatureReleased('disappearing_messages')) ||
+    !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2')
+  ); // FIXME to remove after QA
 }
 
 function isUserConfigFeatureReleasedCached(): boolean {
@@ -112,11 +112,10 @@ function isUserConfigFeatureReleasedCached(): boolean {
 
 // NOTE Make sure to call checkIsDisappearMessageV2FeatureReleased at least once and then use this. It's mostly used in components that are rendered where we don't want to do async calls
 function isDisappearMessageV2FeatureReleasedCached(): boolean {
-  return true;
-  // return (
-  //   !!isDisappearingMessageFeatureReleased ||
-  //   !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA
-  // );
+  return (
+    !!isDisappearingMessageFeatureReleased ||
+    !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA
+  );
 }
 
 export const ReleasedFeatures = {