fix: legacy groups are kind of working again

at least as much as they ever did

preload.js

@@ -40,7 +40,7 @@ window.saveLog = additionalText => ipc.send('save-debug-log', additionalText);
 window.sessionFeatureFlags = {
   useOnionRequests: true,
   useTestNet: isTestNet() || isTestIntegration(),
-  useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA
+  useClosedGroupV2: false, // TODO DO NOT MERGE Remove after QA
   useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA
   replaceLocalizedStringsWithKeys: false,
   debug: {

ts/components/conversation/SessionConversation.tsx

@@ -662,10 +662,9 @@ function OutdatedLegacyGroupBanner(props: {
 
   return isLegacyGroup ? (
     <NoticeBanner
-      text={window.i18n('groupLegacyBanner', { date: 'FIXME AUDRIC' })} // Remove after QA
+      text={window.i18n('groupLegacyBanner', { date: '[Date]' })} // Remove after QA
       onBannerClick={() => {
-        showLinkVisitWarningDialog('', dispatch);
-        throw new Error('TODO'); // fixme audric
+        showLinkVisitWarningDialog('https://getsession.org/blog/session-groups-v2', dispatch);
       }}
       icon="externalLink"
       dataTestId="legacy-group-banner"

ts/components/dialog/UpdateGroupMembersDialog.tsx

@@ -219,7 +219,7 @@ export const UpdateGroupMembersDialog = (props: Props) => {
 
   return (
     <SessionWrapperModal title={window.i18n('groupMembers')} onClose={closeDialog}>
-      {hasClosedGroupV2QAButtons() && weAreAdmin ? (
+      {hasClosedGroupV2QAButtons() && weAreAdmin && PubKey.is03Pubkey(conversationId) ? (
         <>
           Also remove messages:
           <SessionToggle

ts/models/conversation.ts

@@ -2169,7 +2169,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
       if (this.isClosedGroup()) {
         if (this.matchesDisappearingMode('deleteAfterRead')) {
-          throw new Error('Group disappearing messages must be deleteAterSend');
+          throw new Error('Group disappearing messages must be deleteAfterSend');
         }
         const chatMessageMediumGroup = new VisibleMessage(chatMessageParams);
         const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({

ts/receiver/contentMessage.ts

@@ -10,8 +10,8 @@ import { IncomingMessageCache } from './cache';
 import { Data } from '../data/data';
 import { SettingsKey } from '../data/settings-key';
 import {
-    deleteMessagesFromSwarmAndCompletelyLocally,
-    deleteMessagesFromSwarmAndMarkAsDeletedLocally,
+  deleteMessagesFromSwarmAndCompletelyLocally,
+  deleteMessagesFromSwarmAndMarkAsDeletedLocally,
 } from '../interactions/conversations/unsendingInteractions';
 import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { ConvoHub } from '../session/conversations';
@@ -29,8 +29,8 @@ import { BlockedNumberController } from '../util';
 import { ReadReceipts } from '../util/readReceipts';
 import { Storage } from '../util/storage';
 import {
-    ContactsWrapperActions,
-    MetaGroupWrapperActions,
+  ContactsWrapperActions,
+  MetaGroupWrapperActions,
 } from '../webworker/workers/browser/libsession_worker_interface';
 import { handleCallMessage } from './callMessage';
 import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups';
@@ -103,6 +103,8 @@ async function decryptForClosedGroup(
           true
         );
         if (res?.decryptedContent.byteLength) {
+          decryptedContent = res.decryptedContent;
+
           break;
         }
         decryptedContent = res.decryptedContent;

ts/session/apis/snode_api/swarmPolling.ts

@@ -454,7 +454,7 @@ export class SwarmPolling {
       resultsFromAllNamespaces
     );
     window.log.debug(
-      `received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, `
+      `received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, , otherMessages:${otherMessages?.length || 0}, `
     );
     // We always handle the config messages first (for groups 03 or our own messages)
     await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type });

ts/session/sending/MessageSender.ts

@@ -124,9 +124,12 @@ async function messageToRequest05({
     createdAtNetworkTimestamp: networkTimestamp,
     plainTextBuffer,
   };
-  if (namespace === SnodeNamespaces.Default || namespace === SnodeNamespaces.LegacyClosedGroup) {
+  if (namespace === SnodeNamespaces.Default) {
     return new StoreUserMessageSubRequest(shared05Arguments);
   }
+  if (namespace === SnodeNamespaces.LegacyClosedGroup) {
+    return new StoreLegacyGroupMessageSubRequest(shared05Arguments);
+  }
   if (SnodeNamespace.isUserConfigNamespace(namespace)) {
     return new StoreUserConfigSubRequest(shared05Arguments);
   }