feat: use multi value to know if disappear_v2 is live or nah

ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts

@@ -1,4 +1,5 @@
 import AbortController from 'abort-controller';
+import { getConversationController } from '../../../conversations';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
 import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils';
 import {
@@ -7,7 +8,6 @@ import {
   OpenGroupBatchRow,
   sogsBatchSend,
 } from './sogsV3BatchPoll';
-import { getConversationController } from '../../../conversations';
 
 type OpenGroupClearInboxResponse = {
   deleted: number;
@@ -21,42 +21,40 @@ export const clearInbox = async (roomInfos: OpenGroupRequestCommonType): Promise
 
   if (!conversation) {
     throw new Error(`clearInbox Matching conversation not found in db ${conversationId}`);
-  } else {
+  }
-    const options: Array<OpenGroupBatchRow> = [
+  const options: Array<OpenGroupBatchRow> = [
-      {
+    {
-        type: 'inbox',
+      type: 'inbox',
-        inbox: {
+      inbox: {
-          type: 'delete',
+        type: 'delete',
-        },
       },
-    ];
+    },
+  ];
 
-    const result = await sogsBatchSend(
+  const result = await sogsBatchSend(
-      roomInfos.serverUrl,
+    roomInfos.serverUrl,
-      new Set([roomInfos.roomId]),
+    new Set([roomInfos.roomId]),
-      new AbortController().signal,
+    new AbortController().signal,
-      options,
+    options,
-      'batch'
+    'batch'
-    );
+  );
 
-    if (!result) {
+  if (!result) {
-      throw new Error(`Could not clearInbox, res is invalid for ${conversationId}`);
+    throw new Error(`Could not clearInbox, res is invalid for ${conversationId}`);
-    }
+  }
 
-    const rawMessage =
+  const rawMessage = (result.body && (result.body[0].body as OpenGroupClearInboxResponse)) || null;
-      (result.body && (result.body[0].body as OpenGroupClearInboxResponse)) || null;
+  if (!rawMessage) {
-    if (!rawMessage) {
+    throw new Error(`clearInbox parsing failed for ${conversationId}`);
-      throw new Error(`clearInbox parsing failed for ${conversationId}`);
+  }
-    }
 
-    try {
+  try {
-      if (batchGlobalIsSuccess(result) && batchFirstSubIsSuccess(result)) {
+    if (batchGlobalIsSuccess(result) && batchFirstSubIsSuccess(result)) {
-        success = true;
+      success = true;
-        window.log.info(`clearInbox ${rawMessage.deleted} messages deleted for ${conversationId} `);
+      window.log.info(`clearInbox ${rawMessage.deleted} messages deleted for ${conversationId} `);
-      }
-    } catch (e) {
-      window?.log?.error(`clearInbox Can't decode JSON body for ${conversationId}`);
     }
+  } catch (e) {
+    window?.log?.error(`clearInbox Can't decode JSON body for ${conversationId}`);
   }
 
   if (!success) {

ts/util/releaseFeature.ts

@@ -1,4 +1,3 @@
-import { isEmpty } from 'lodash';
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 import { FEATURE_RELEASE_TIMESTAMPS } from '../session/constants';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
@@ -103,7 +102,7 @@ async function checkIsUserConfigFeatureReleased() {
 async function checkIsDisappearMessageV2FeatureReleased() {
   return (
     (await checkIsFeatureReleased('disappearing_messages')) ||
-    !isEmpty(process.env.SESSION_FORCE_DISAPPEAR_V2_ENABLED) // FIXME to remove after QA
+    !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA
   );
 }
 
@@ -115,7 +114,7 @@ function isUserConfigFeatureReleasedCached(): boolean {
 function isDisappearMessageV2FeatureReleasedCached(): boolean {
   return (
     !!isDisappearingMessageFeatureReleased ||
-    !isEmpty(process.env.SESSION_FORCE_DISAPPEAR_V2_ENABLED) // FIXME to remove after QA
+    !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA
   );
 }