From dae90f718c5b9ae2a500ee9d3d13ed196c4259b8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Thu, 20 Feb 2025 14:18:31 +1100
Subject: [PATCH] fix: add group member to list of contacts so they appear on
 recreategr

---
 .../conversation/SessionConversation.tsx          |  2 +-
 .../conversation/header/ConversationHeader.tsx    | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index e88fc2f0f..f17ca23be 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -7,6 +7,7 @@ import classNames from 'classnames';
 import { Component, RefObject, createRef } from 'react';
 import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
+import { format } from 'date-fns';
 import {
   CompositionBox,
   SendMessageType,
@@ -72,7 +73,6 @@ import {
 import { useSelectedDisableLegacyGroupDeprecatedActions } from '../../hooks/useRefreshReleasedFeaturesTimestamp';
 import { useAreGroupsCreatedAsNewGroupsYet } from '../../state/selectors/releasedFeatures';
 import { Constants } from '../../session';
-import { format } from 'date-fns';
 
 const DEFAULT_JPEG_QUALITY = 0.85;
 
diff --git a/ts/components/conversation/header/ConversationHeader.tsx b/ts/components/conversation/header/ConversationHeader.tsx
index a94ceffcb..c05d26e2a 100644
--- a/ts/components/conversation/header/ConversationHeader.tsx
+++ b/ts/components/conversation/header/ConversationHeader.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 import { useDispatch } from 'react-redux';
 
 import type { PubkeyType } from 'libsession_util_nodejs';
@@ -137,9 +138,17 @@ function RecreateGroupButton() {
         margin="var(--margins-sm)"
         onClick={async () => {
           try {
-            await Promise.all(
-              members.map(m => ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE))
-            );
+            for (let index = 0; index < members.length; index++) {
+              const m = members[index];
+              const memberConvo = await ConvoHub.use().getOrCreateAndWait(
+                m,
+                ConversationTypeEnum.PRIVATE
+              );
+              if (!memberConvo.get('active_at')) {
+                memberConvo.set({ active_at: 1 });
+                await memberConvo.commit();
+              }
+            }
           } catch (e) {
             window.log.warn('recreate group: failed to recreate a member convo', e.message);
           }