diff --git a/package.json b/package.json index dc502b6eb..b93c63972 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/preload.js b/preload.js index 30a43299f..7857da846 100644 --- a/preload.js +++ b/preload.js @@ -41,7 +41,7 @@ window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet() || isTestIntegration(), useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA - useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2QAButtons: false, // TODO DO NOT MERGE Remove after QA replaceLocalizedStringsWithKeys: false, debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index aea87d1a2..d879d57c2 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -259,6 +259,8 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP window.log.warn('tried to resend invite but we do not have correct details'); return; } + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, pubkey); + // if we tried to invite that member as admin right away, let's retry it as such. const inviteAsAdmin = member.nominatedAdmin; await GroupInvite.addJob({ diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 0c28dae07..ad1bb38df 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -524,7 +524,8 @@ async function handleWithHistoryMembers({ memberPubkey: member, profileKeyHex, }); - await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); + // a group invite job will be added to the queue + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); } const encryptedSupplementKeys = withHistory.length ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) @@ -554,7 +555,8 @@ async function handleWithoutHistoryMembers({ displayName, profileKeyHex, }); - await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); + // a group invite job will be added to the queue + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); } if (!isEmpty(withoutHistory)) { diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index d51622234..896b9ad82 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -638,6 +638,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'memberSetInviteSent', pubkeyHex, ]) as Promise>, + memberSetInviteNotSent: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetInviteNotSent', + pubkeyHex, + ]) as Promise>, memberSetInviteFailed: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, diff --git a/yarn.lock b/yarn.lock index 09a608b1f..9f21297c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz": - version "0.4.9" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz#239ddfb4a8a688b924ba0f1e4e1c9b573407e176" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz": + version "0.4.10" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz#9a420fa0ad4dc9067de17b2ec9fa3676a1c10056" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0"