From 1063ece2cda2f17af87d9c407b86ef8eedb6606d Mon Sep 17 00:00:00 2001
From: Matt Grogan <megrogan@gmail.com>
Date: Mon, 16 Sep 2024 17:05:03 +0100
Subject: [PATCH] Allow invites to be cancelled (#6393)

---
 .../home/ChannelOrCommunityMembers.svelte     |  14 +-
 .../app/src/components/home/RightPanel.svelte |  68 +++--
 .../components/home/addgroup/NewGroup.svelte  |   2 +-
 .../home/communities/edit/Edit.svelte         |   4 +-
 .../home/groupdetails/InvitedUser.svelte      |   8 +-
 .../home/groupdetails/Members.svelte          |   2 +-
 frontend/app/src/i18n/cn.json                 |   3 +
 frontend/app/src/i18n/de.json                 |   3 +
 frontend/app/src/i18n/en.json                 |   3 +
 frontend/app/src/i18n/es.json                 |   3 +
 frontend/app/src/i18n/fa.json                 |   3 +
 frontend/app/src/i18n/fr.json                 |   3 +
 frontend/app/src/i18n/hi.json                 |   3 +
 frontend/app/src/i18n/it.json                 |   3 +
 frontend/app/src/i18n/iw.json                 |   3 +
 frontend/app/src/i18n/jp.json                 |   3 +
 frontend/app/src/i18n/pl.json                 |   3 +
 frontend/app/src/i18n/ru.json                 |   3 +
 frontend/app/src/i18n/uk.json                 |   3 +
 frontend/app/src/i18n/vi.json                 |   3 +
 .../src/services/community/candid/idl.js      |  14 +
 .../src/services/community/candid/types.d.ts  |   8 +
 .../services/community/community.client.ts    | 281 +++++++++---------
 .../src/services/group/candid/idl.js          |  10 +
 .../src/services/group/candid/types.d.ts      |   4 +
 .../src/services/group/group.client.ts        | 201 +++++++------
 .../services/localUserIndex/candid/idl.d.ts   |   2 -
 .../localUserIndex/localUserIndex.client.ts   |  67 ++---
 .../src/services/localUserIndex/mappers.ts    |  28 +-
 .../src/services/openchatAgent.ts             |  67 ++---
 frontend/openchat-client/src/openchat.ts      | 112 ++++---
 .../openchat-shared/src/domain/chat/chat.ts   |   2 -
 frontend/openchat-shared/src/domain/worker.ts |  27 +-
 frontend/openchat-worker/src/worker.ts        |  22 +-
 34 files changed, 550 insertions(+), 435 deletions(-)

diff --git a/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte b/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte
index 67c239d578..b8d5c9cec4 100644
--- a/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte
+++ b/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte
@@ -76,6 +76,14 @@
                 break;
         }
     }
+
+    function onCancelCommunityInvite(ev: CustomEvent<string>): void {
+        dispatch("cancelCommunityInvite", ev.detail);
+    }
+
+    function onCancelGroupInvite(ev: CustomEvent<string>): void {
+        dispatch("cancelGroupInvite", ev.detail);
+    }
 </script>
 
 <ScopeToggle bind:selectedTab>
@@ -101,7 +109,8 @@
         on:chatWith
         on:showInviteUsers={showInviteCommunityUsers}
         on:removeMember={onRemoveCommunityMember}
-        on:changeRole={onChangeCommunityRole} />
+        on:changeRole={onChangeCommunityRole}
+        on:cancelInvite={onCancelCommunityInvite} />
 
     <Members
         slot="channel"
@@ -117,7 +126,8 @@
         on:chatWith
         on:showInviteUsers={showInviteGroupUsers}
         on:removeMember={onRemoveGroupMember}
-        on:changeRole={onChangeGroupRole} />
+        on:changeRole={onChangeGroupRole}
+        on:cancelInvite={onCancelGroupInvite} />
 </ScopeToggle>
 
 <style lang="scss">
diff --git a/frontend/app/src/components/home/RightPanel.svelte b/frontend/app/src/components/home/RightPanel.svelte
index 828ab5b72c..9dceae0796 100644
--- a/frontend/app/src/components/home/RightPanel.svelte
+++ b/frontend/app/src/components/home/RightPanel.svelte
@@ -119,17 +119,14 @@
 
             invitingUsers = true;
 
-            await client.inviteUsersToCommunity($selectedCommunity.id, userIds).then((resp) => {
-                switch (resp) {
-                    case "success":
-                        popRightPanelHistory();
-                        if ($multiUserChat?.public ?? false) {
-                            toastStore.showSuccessToast(i18nKey("communities.usersInvited"));
-                        }
-                        break;
-                    default:
-                        toastStore.showFailureToast(i18nKey("communities.errors.inviteUsers"));
-                        break;
+            await client.inviteUsers($selectedCommunity.id, userIds).then((resp) => {
+                if (resp) {
+                    popRightPanelHistory();
+                    if ($multiUserChat?.public ?? false) {
+                        toastStore.showSuccessToast(i18nKey("communities.usersInvited"));
+                    }
+                } else {
+                    toastStore.showFailureToast(i18nKey("communities.errors.inviteUsers"));
                 }
             });
 
@@ -149,15 +146,14 @@
             await client
                 .inviteUsers($multiUserChat.id, userIds)
                 .then((resp) => {
-                    switch (resp) {
-                        case "success":
-                            popRightPanelHistory();
+                    if (resp) {
+                        popRightPanelHistory();
                             if ($multiUserChat?.public ?? false) {
                                 toastStore.showSuccessToast(i18nKey("group.usersInvited"));
                             }
-                            break;
-                        default:
-                            toastStore.showFailureToast(
+
+                    } else {
+                        toastStore.showFailureToast(
                                 i18nKey(
                                     "group.inviteUsersFailed",
                                     undefined,
@@ -165,7 +161,6 @@
                                     true,
                                 ),
                             );
-                            break;
                     }
                 })
                 .catch((err) => {
@@ -343,6 +338,30 @@
         }
     }
 
+    function onCancelCommunityInvite(ev: CustomEvent<string>) {
+        if ($selectedCommunity !== undefined) {
+            cancelInvite($selectedCommunity.id, ev.detail);
+        }
+    }
+
+    async function onCancelGroupInvite(ev: CustomEvent<string>) {
+        if (
+            $selectedChatId !== undefined &&
+            ($selectedChatId.kind === "group_chat" || $selectedChatId.kind === "channel")
+        ) {
+            cancelInvite($selectedChatId, ev.detail);
+        }
+    }
+
+    async function cancelInvite(id: MultiUserChatIdentifier | CommunityIdentifier, userId: string) {
+        const success = await client.cancelInvites(id, [userId]);
+        if (success) {
+            toastStore.showSuccessToast(i18nKey("cancelInviteSucceeded"));
+        } else {
+            toastStore.showFailureToast(i18nKey("cancelInviteFailed"));
+        }
+    }
+
     $: threadRootEvent =
         lastState.kind === "message_thread_panel" && $selectedChatId !== undefined
             ? findMessage($eventsStore, lastState.threadRootMessageId)
@@ -432,6 +451,8 @@
                 on:removeGroupMember={onRemoveGroupMember}
                 on:showInviteGroupUsers={showInviteGroupUsers}
                 on:changeGroupRole={onChangeGroupRole}
+                on:cancelGroupInvite={onCancelGroupInvite}
+                on:cancelCommunityInvite={onCancelCommunityInvite}
                 on:close={popRightPanelHistory}
                 on:chatWith />
         {:else}
@@ -448,7 +469,9 @@
                 on:chatWith
                 on:showInviteUsers={showInviteCommunityUsers}
                 on:removeMember={onRemoveCommunityMember}
-                on:changeRole={onChangeCommunityRole} />
+                on:changeRole={onChangeCommunityRole}
+                on:cancelInvite={onCancelCommunityInvite}
+                />
         {/if}
     {:else if lastState.kind === "invite_group_users" && $multiUserChat !== undefined}
         {#if $multiUserChat.kind === "channel" && $selectedCommunity !== undefined}
@@ -488,7 +511,8 @@
             on:chatWith
             on:showInviteUsers={showInviteGroupUsers}
             on:removeMember={onRemoveGroupMember}
-            on:changeRole={onChangeGroupRole} />
+            on:changeRole={onChangeGroupRole} 
+            on:cancelInvite={onCancelGroupInvite} />
     {:else if lastState.kind === "show_group_members" && $selectedChatId !== undefined && $multiUserChat !== undefined && $multiUserChat.kind === "channel" && $selectedCommunity !== undefined}
         <ChannelOrCommunityMembers
             selectedTab="channel"
@@ -506,7 +530,9 @@
             on:showInviteGroupUsers={showInviteGroupUsers}
             on:changeGroupRole={onChangeGroupRole}
             on:close={popRightPanelHistory}
-            on:chatWith />
+            on:chatWith 
+            on:cancelGroupInvite={onCancelGroupInvite}
+            on:cancelCommunityInvite={onCancelCommunityInvite} />
     {:else if lastState.kind === "show_pinned" && $selectedChatId !== undefined && ($selectedChatId.kind === "group_chat" || $selectedChatId.kind === "channel") && $multiUserChat !== undefined}
         <PinnedMessages
             on:chatWith
diff --git a/frontend/app/src/components/home/addgroup/NewGroup.svelte b/frontend/app/src/components/home/addgroup/NewGroup.svelte
index 1a5c27bcb2..8369686d1f 100644
--- a/frontend/app/src/components/home/addgroup/NewGroup.svelte
+++ b/frontend/app/src/components/home/addgroup/NewGroup.svelte
@@ -194,7 +194,7 @@
                 candidateGroup.members.map((m) => m.user.userId),
             )
             .then((resp) => {
-                if (resp !== "success") {
+                if (!resp) {
                     Promise.reject("Unable to invite users to the new group");
                 }
             });
diff --git a/frontend/app/src/components/home/communities/edit/Edit.svelte b/frontend/app/src/components/home/communities/edit/Edit.svelte
index d7ff20a657..9359d001ee 100644
--- a/frontend/app/src/components/home/communities/edit/Edit.svelte
+++ b/frontend/app/src/components/home/communities/edit/Edit.svelte
@@ -114,12 +114,12 @@
             return Promise.resolve();
         }
         return client
-            .inviteUsersToCommunity(
+            .inviteUsers(
                 { kind: "community", communityId },
                 members.map((m) => m.user.userId),
             )
             .then((resp) => {
-                if (resp !== "success") {
+                if (!resp) {
                     Promise.reject("Unable to invite users to the new community");
                 }
             });
diff --git a/frontend/app/src/components/home/groupdetails/InvitedUser.svelte b/frontend/app/src/components/home/groupdetails/InvitedUser.svelte
index f5c374ec50..5ab20fbb16 100644
--- a/frontend/app/src/components/home/groupdetails/InvitedUser.svelte
+++ b/frontend/app/src/components/home/groupdetails/InvitedUser.svelte
@@ -20,8 +20,8 @@
     export let canUninviteUser: boolean = false;
     export let searchTerm: string = "";
 
-    function uninviteUser() {
-        dispatch("uninviteUser", user);
+    function cancelInvite() {
+        dispatch("cancelInvite", user.userId);
     }
 </script>
 
@@ -36,13 +36,13 @@
                 </span>
                 <span slot="menu">
                     <Menu>
-                        <MenuItem on:click={uninviteUser}>
+                        <MenuItem on:click={cancelInvite}>
                             <Cancel
                                 size={$iconSize}
                                 color={"var(--icon-inverted-txt)"}
                                 slot="icon" />
                             <div slot="text">
-                                <Translatable resourceKey={i18nKey("uninviteUser")} />
+                                <Translatable resourceKey={i18nKey("cancelInvite")} />
                             </div>
                         </MenuItem>
                     </Menu>
diff --git a/frontend/app/src/components/home/groupdetails/Members.svelte b/frontend/app/src/components/home/groupdetails/Members.svelte
index 8464dcb980..5b9e571b5b 100644
--- a/frontend/app/src/components/home/groupdetails/Members.svelte
+++ b/frontend/app/src/components/home/groupdetails/Members.svelte
@@ -283,7 +283,7 @@
     {:else if memberView === "invited"}
         <div use:menuCloser class="user-list">
             {#each invitedUsers as user}
-                <InvitedUser {user} {searchTerm} canUninviteUser={false} on:uninviteUser />
+                <InvitedUser {user} {searchTerm} canUninviteUser={client.canInviteUsers(collection.id)} on:cancelInvite />
             {/each}
         </div>
     {/if}
diff --git a/frontend/app/src/i18n/cn.json b/frontend/app/src/i18n/cn.json
index 308d20fa3d..96c789e12b 100644
--- a/frontend/app/src/i18n/cn.json
+++ b/frontend/app/src/i18n/cn.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "无法加入黑名单",
     "blockUserSucceeded": "该用户已被加入黑名单",
     "cancel": "取消",
+    "cancelInvite": "取消邀请",
+    "cancelInviteFailed": "取消邀请时出错",
+    "cancelInviteSucceeded": "邀请已取消",
     "challenge": {
         "alreadyRegistered": "请关闭并稍后重试",
         "failed": "挑战失败。请重试。",
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 6dde232c72..aa2d5a0249 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Benutzer kann nicht blockiert werden",
     "blockUserSucceeded": "Benutzer wurde gesperrt",
     "cancel": "Abbrechen",
+    "cancelInvite": "Einladung abbrechen",
+    "cancelInviteFailed": "Fehler beim Abbrechen der Einladung",
+    "cancelInviteSucceeded": "Einladung abgebrochen",
     "challenge": {
         "alreadyRegistered": "Bitte schließen und später erneut versuchen",
         "failed": "Herausforderung fehlgeschlagen. Bitte versuchen Sie es erneut.",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 6c2c18c96c..e0c4cd7709 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Unable to block user",
     "blockUserSucceeded": "User has been blocked",
     "cancel": "Cancel",
+    "cancelInvite": "Cancel invite",
+    "cancelInviteFailed": "Error cancelling invite",
+    "cancelInviteSucceeded": "Invite cancelled",
     "challenge": {
         "alreadyRegistered": "Please close and try again later",
         "failed": "Challenge failed. Please try again.",
diff --git a/frontend/app/src/i18n/es.json b/frontend/app/src/i18n/es.json
index e7755a7cb2..5b1c7f4dbc 100644
--- a/frontend/app/src/i18n/es.json
+++ b/frontend/app/src/i18n/es.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "No se puede bloquear al usuario",
     "blockUserSucceeded": "El usuario ha sido bloqueado",
     "cancel": "Cancelar",
+    "cancelInvite": "Cancelar invitación",
+    "cancelInviteFailed": "Error al cancelar la invitación",
+    "cancelInviteSucceeded": "Invitación cancelada",
     "challenge": {
         "alreadyRegistered": "Cierra y vuelve a intentarlo más tarde.",
         "failed": "El desafío falló. Inténtalo de nuevo.",
diff --git a/frontend/app/src/i18n/fa.json b/frontend/app/src/i18n/fa.json
index b068b84df5..74680d4456 100644
--- a/frontend/app/src/i18n/fa.json
+++ b/frontend/app/src/i18n/fa.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "مسدود کردن کاربر ممکن نیست",
     "blockUserSucceeded": "کاربر مسدود شده است",
     "cancel": "لغو کنید",
+    "cancelInvite": "لغو دعوت",
+    "cancelInviteFailed": "خطا در لغو دعوت",
+    "cancelInviteSucceeded": "دعوت لغو شد",
     "challenge": {
         "alreadyRegistered": "لطفاً ببندید و بعداً دوباره امتحان کنید",
         "failed": "چالش شکست خورد. لطفا دوباره تلاش کنید.",
diff --git a/frontend/app/src/i18n/fr.json b/frontend/app/src/i18n/fr.json
index 7a3fc41fa8..80746367e5 100644
--- a/frontend/app/src/i18n/fr.json
+++ b/frontend/app/src/i18n/fr.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Impossible de bloquer l'utilisateur",
     "blockUserSucceeded": "L'utilisateur a été bloqué",
     "cancel": "Annuler",
+    "cancelInvite": "Annuler l'invitation",
+    "cancelInviteFailed": "Erreur lors de l'annulation de l'invitation",
+    "cancelInviteSucceeded": "Invitation annulée",
     "challenge": {
         "alreadyRegistered": "Veuillez fermer et réessayer plus tard",
         "failed": "Le défi a échoué. Veuillez réessayer.",
diff --git a/frontend/app/src/i18n/hi.json b/frontend/app/src/i18n/hi.json
index bc743027fa..e4e5aaa074 100644
--- a/frontend/app/src/i18n/hi.json
+++ b/frontend/app/src/i18n/hi.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "उपयोगकर्ता को ब्लॉक करने में असमर्थ",
     "blockUserSucceeded": "उपयोगकर्ता को ब्लॉक कर दिया गया है",
     "cancel": "रद्द करें",
+    "cancelInvite": "आमंत्रण रद्द करें",
+    "cancelInviteFailed": "आमंत्रण रद्द करने में त्रुटि",
+    "cancelInviteSucceeded": "आमंत्रण रद्द किया गया",
     "challenge": {
         "alreadyRegistered": "कृपया बंद करें और बाद में पुनः प्रयास करें",
         "failed": "चुनौती विफल. कृपया पुनः प्रयास करें.",
diff --git a/frontend/app/src/i18n/it.json b/frontend/app/src/i18n/it.json
index a0bc692648..9a7a20c414 100644
--- a/frontend/app/src/i18n/it.json
+++ b/frontend/app/src/i18n/it.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Impossibile bloccare l'utente",
     "blockUserSucceeded": "L'utente è stato bloccato",
     "cancel": "Annulla",
+    "cancelInvite": "Annulla invito",
+    "cancelInviteFailed": "Errore durante l'annullamento dell'invito",
+    "cancelInviteSucceeded": "Invito annullato",
     "challenge": {
         "alreadyRegistered": "Per favore chiudi e riprova più tardi",
         "failed": "Sfida fallita. Per favore riprova.",
diff --git a/frontend/app/src/i18n/iw.json b/frontend/app/src/i18n/iw.json
index 269a65aa92..3ef4031b3c 100644
--- a/frontend/app/src/i18n/iw.json
+++ b/frontend/app/src/i18n/iw.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "לא ניתן לחסום משתמש",
     "blockUserSucceeded": "המשתמש נחסם",
     "cancel": "לְבַטֵל",
+    "cancelInvite": "בטל הזמנה",
+    "cancelInviteFailed": "שגיאה בביטול ההזמנה",
+    "cancelInviteSucceeded": "ההזמנה בוטלה",
     "challenge": {
         "alreadyRegistered": "אנא סגור ונסה שוב מאוחר יותר",
         "failed": "האתגר נכשל. בבקשה נסה שוב.",
diff --git a/frontend/app/src/i18n/jp.json b/frontend/app/src/i18n/jp.json
index 90b42508cd..ebcf3c6c92 100644
--- a/frontend/app/src/i18n/jp.json
+++ b/frontend/app/src/i18n/jp.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "ユーザーをブロックできませんでした",
     "blockUserSucceeded": "ユーザーはブロックされました",
     "cancel": "キャンセル",
+    "cancelInvite": "招待をキャンセル",
+    "cancelInviteFailed": "招待のキャンセル中にエラーが発生しました",
+    "cancelInviteSucceeded": "招待をキャンセルしました",
     "challenge": {
         "alreadyRegistered": "閉じて、後でもう一度お試しください",
         "failed": "チャレンジに失敗しました。もう一度お試しください。",
diff --git a/frontend/app/src/i18n/pl.json b/frontend/app/src/i18n/pl.json
index d080955b16..cb7b55a9d9 100644
--- a/frontend/app/src/i18n/pl.json
+++ b/frontend/app/src/i18n/pl.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Nie można zablokować użytkownika",
     "blockUserSucceeded": "Użytkownik został zablokowany",
     "cancel": "Anulować",
+    "cancelInvite": "Anuluj zaproszenie",
+    "cancelInviteFailed": "Błąd podczas anulowania zaproszenia",
+    "cancelInviteSucceeded": "Zaproszenie anulowane",
     "challenge": {
         "alreadyRegistered": "Zamknij i spróbuj ponownie później",
         "failed": "Wyzwanie nie powiodło się. Proszę spróbuj ponownie.",
diff --git a/frontend/app/src/i18n/ru.json b/frontend/app/src/i18n/ru.json
index 8b3fb54c34..4f2702b915 100644
--- a/frontend/app/src/i18n/ru.json
+++ b/frontend/app/src/i18n/ru.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Не удалось заблокировать пользователя",
     "blockUserSucceeded": "Пользователь заблокирован",
     "cancel": "Отмена",
+    "cancelInvite": "Отменить приглашение",
+    "cancelInviteFailed": "Ошибка отмены приглашения",
+    "cancelInviteSucceeded": "Приглашение отменено",
     "challenge": {
         "alreadyRegistered": "Пожалуйста, закройте и повторите попытку позже.",
         "failed": "Вызов не удался. Пожалуйста, попробуйте еще раз.",
diff --git a/frontend/app/src/i18n/uk.json b/frontend/app/src/i18n/uk.json
index 9f4a735b36..8322e875df 100644
--- a/frontend/app/src/i18n/uk.json
+++ b/frontend/app/src/i18n/uk.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Не вдалося заблокувати користувача",
     "blockUserSucceeded": "Користувача заблоковано",
     "cancel": "Скасувати",
+    "cancelInvite": "Скасувати запрошення",
+    "cancelInviteFailed": "Помилка скасування запрошення",
+    "cancelInviteSucceeded": "Запрошення скасовано",
     "challenge": {
         "alreadyRegistered": "Будь ласка, закрийте та повторіть спробу пізніше",
         "failed": "Виклик не виконано. Будь ласка спробуйте ще раз.",
diff --git a/frontend/app/src/i18n/vi.json b/frontend/app/src/i18n/vi.json
index 8c356d7e4c..2b08be0ca2 100644
--- a/frontend/app/src/i18n/vi.json
+++ b/frontend/app/src/i18n/vi.json
@@ -123,6 +123,9 @@
     "blockUserFailed": "Không thể chặn người dùng",
     "blockUserSucceeded": "Người dùng đã bị chặn",
     "cancel": "Hủy bỏ",
+    "cancelInvite": "Hủy lời mời",
+    "cancelInviteFailed": "Lỗi khi hủy lời mời",
+    "cancelInviteSucceeded": "Lời mời đã hủy",
     "challenge": {
         "alreadyRegistered": "Vui lòng đóng và thử lại sau",
         "failed": "Thử thách không thành công. Vui lòng thử lại.",
diff --git a/frontend/openchat-agent/src/services/community/candid/idl.js b/frontend/openchat-agent/src/services/community/candid/idl.js
index 7301db5f34..81a1d733f4 100644
--- a/frontend/openchat-agent/src/services/community/candid/idl.js
+++ b/frontend/openchat-agent/src/services/community/candid/idl.js
@@ -121,6 +121,15 @@ export const idlFactory = ({ IDL }) => {
     'CannotBlockSelf' : IDL.Null,
     'CannotBlockUser' : IDL.Null,
   });
+  const CancelInvitesArgs = IDL.Record({
+    'channel_id' : IDL.Opt(ChannelId),
+    'user_ids' : IDL.Vec(UserId),
+  });
+  const CancelInvitesResponse = IDL.Variant({
+    'ChannelNotFound' : IDL.Null,
+    'NotAuthorized' : IDL.Null,
+    'Success' : IDL.Null,
+  });
   const CancelP2PSwapArgs = IDL.Record({
     'channel_id' : ChannelId,
     'message_id' : MessageId,
@@ -2072,6 +2081,11 @@ export const idlFactory = ({ IDL }) => {
       ),
     'add_reaction' : IDL.Func([AddReactionArgs], [AddReactionResponse], []),
     'block_user' : IDL.Func([BlockUserArgs], [BlockUserResponse], []),
+    'cancel_invites' : IDL.Func(
+        [CancelInvitesArgs],
+        [CancelInvitesResponse],
+        [],
+      ),
     'cancel_p2p_swap' : IDL.Func(
         [CancelP2PSwapArgs],
         [CancelP2PSwapResponse],
diff --git a/frontend/openchat-agent/src/services/community/candid/types.d.ts b/frontend/openchat-agent/src/services/community/candid/types.d.ts
index be05ec3f7c..70408e6536 100644
--- a/frontend/openchat-agent/src/services/community/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/community/candid/types.d.ts
@@ -236,6 +236,13 @@ export interface CallParticipant {
   'user_id' : UserId,
   'joined' : TimestampMillis,
 }
+export interface CancelInvitesArgs {
+  'channel_id' : [] | [ChannelId],
+  'user_ids' : Array<UserId>,
+}
+export type CancelInvitesResponse = { 'ChannelNotFound' : null } |
+  { 'NotAuthorized' : null } |
+  { 'Success' : null };
 export interface CancelP2PSwapArgs {
   'channel_id' : ChannelId,
   'message_id' : MessageId,
@@ -2543,6 +2550,7 @@ export interface _SERVICE {
   >,
   'add_reaction' : ActorMethod<[AddReactionArgs], AddReactionResponse>,
   'block_user' : ActorMethod<[BlockUserArgs], BlockUserResponse>,
+  'cancel_invites' : ActorMethod<[CancelInvitesArgs], CancelInvitesResponse>,
   'cancel_p2p_swap' : ActorMethod<[CancelP2PSwapArgs], CancelP2PSwapResponse>,
   'change_channel_role' : ActorMethod<
     [ChangeChannelRoleArgs],
diff --git a/frontend/openchat-agent/src/services/community/community.client.ts b/frontend/openchat-agent/src/services/community/community.client.ts
index 10be0905ee..eda208cda9 100644
--- a/frontend/openchat-agent/src/services/community/community.client.ts
+++ b/frontend/openchat-agent/src/services/community/community.client.ts
@@ -188,7 +188,7 @@ export class CommunityClient extends CandidService {
         private config: AgentConfig,
         private communityId: string,
         private db: Database,
-        private inviteCode: string | undefined,
+        private inviteCode: string | undefined
     ) {
         super(identity, agent, communityId);
 
@@ -201,7 +201,7 @@ export class CommunityClient extends CandidService {
                 channel_id: BigInt(channelId),
                 message_id: messageId,
             }),
-            claimPrizeResponse,
+            claimPrizeResponse
         );
     }
 
@@ -209,7 +209,7 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         userIds: string[],
         username: string,
-        displayName: string | undefined,
+        displayName: string | undefined
     ): Promise<AddMembersToChannelResponse> {
         return this.handleResponse(
             this.service.add_members_to_channel({
@@ -218,7 +218,7 @@ export class CommunityClient extends CandidService {
                 added_by_name: username,
                 added_by_display_name: apiOptional(identity, displayName),
             }),
-            addMembersToChannelResponse,
+            addMembersToChannelResponse
         );
     }
 
@@ -229,7 +229,7 @@ export class CommunityClient extends CandidService {
         messageId: bigint,
         reaction: string,
         threadRootMessageIndex: number | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<AddRemoveReactionResponse> {
         return this.handleResponse(
             this.service.add_reaction({
@@ -241,7 +241,7 @@ export class CommunityClient extends CandidService {
                 reaction,
                 new_achievement: newAchievement,
             }),
-            addRemoveReactionResponse,
+            addRemoveReactionResponse
         );
     }
 
@@ -250,14 +250,14 @@ export class CommunityClient extends CandidService {
             this.service.block_user({
                 user_id: Principal.fromText(userId),
             }),
-            blockUserResponse,
+            blockUserResponse
         );
     }
 
     changeChannelRole(
         chatId: ChannelIdentifier,
         userId: string,
-        newRole: MemberRole,
+        newRole: MemberRole
     ): Promise<ChangeRoleResponse> {
         return this.handleResponse(
             this.service.change_channel_role({
@@ -265,7 +265,7 @@ export class CommunityClient extends CandidService {
                 user_id: Principal.fromText(userId),
                 new_role: apiMemberRole(newRole),
             }),
-            changeChannelRoleResponse,
+            changeChannelRoleResponse
         );
     }
 
@@ -275,7 +275,7 @@ export class CommunityClient extends CandidService {
                 user_id: Principal.fromText(userId),
                 new_role: apiCommunityRole(newRole),
             }),
-            changeRoleResponse,
+            changeRoleResponse
         );
     }
 
@@ -289,25 +289,22 @@ export class CommunityClient extends CandidService {
                 description: channel.description,
                 external_url: apiOptional(identity, channel.externalUrl),
                 history_visible_to_new_joiners: channel.historyVisible,
-                avatar: apiOptional(
-                    (data) => {
-                        return {
-                            id: DataClient.newBlobId(),
-                            data,
-                            mime_type: "image/jpg",
-                        };
-                    },
-                    channel.avatar?.blobData,
-                ),
+                avatar: apiOptional((data) => {
+                    return {
+                        id: DataClient.newBlobId(),
+                        data,
+                        mime_type: "image/jpg",
+                    };
+                }, channel.avatar?.blobData),
                 permissions_v2: [apiGroupPermissions(channel.permissions)],
                 rules: channel.rules,
                 gate: apiMaybeAccessGate(channel.gate),
                 messages_visible_to_non_members: apiOptional(
                     identity,
-                    channel.messagesVisibleToNonMembers,
+                    channel.messagesVisibleToNonMembers
                 ),
             }),
-            (resp) => createGroupResponse(resp, channel.id),
+            (resp) => createGroupResponse(resp, channel.id)
         );
     }
 
@@ -316,7 +313,7 @@ export class CommunityClient extends CandidService {
             this.service.decline_invitation({
                 channel_id: [BigInt(chatId.channelId)],
             }),
-            declineInvitationResponse,
+            declineInvitationResponse
         );
     }
 
@@ -325,14 +322,14 @@ export class CommunityClient extends CandidService {
             this.service.delete_channel({
                 channel_id: BigInt(chatId.channelId),
             }),
-            deleteGroupResponse,
+            deleteGroupResponse
         );
     }
 
     getDeletedMessage(
         chatId: ChannelIdentifier,
         messageId: bigint,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): Promise<DeletedGroupMessageResponse> {
         return this.handleResponse(
             this.service.deleted_message({
@@ -340,7 +337,7 @@ export class CommunityClient extends CandidService {
                 message_id: messageId,
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
             }),
-            deletedMessageResponse,
+            deletedMessageResponse
         );
     }
 
@@ -349,7 +346,7 @@ export class CommunityClient extends CandidService {
         messageIds: bigint[],
         threadRootMessageIndex: number | undefined,
         asPlatformModerator: boolean | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<DeleteMessageResponse> {
         return this.handleResponse(
             this.service.delete_messages({
@@ -359,7 +356,7 @@ export class CommunityClient extends CandidService {
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
                 new_achievement: newAchievement,
             }),
-            deleteMessageResponse,
+            deleteMessageResponse
         );
     }
 
@@ -372,7 +369,7 @@ export class CommunityClient extends CandidService {
         message: Message,
         threadRootMessageIndex: number | undefined,
         blockLevelMarkdown: boolean | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<EditMessageResponse> {
         return new DataClient(this.identity, this.agent, this.config)
             .uploadData(message.content, [chatId.communityId])
@@ -387,7 +384,7 @@ export class CommunityClient extends CandidService {
                             blockLevelMarkdown === undefined ? [] : [blockLevelMarkdown],
                         new_achievement: newAchievement,
                     }),
-                    editMessageResponse,
+                    editMessageResponse
                 );
             });
     }
@@ -402,14 +399,14 @@ export class CommunityClient extends CandidService {
         startIndex: number,
         ascending: boolean,
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         const [cachedEvents, missing] = await getCachedEvents(
             this.db,
             eventIndexRange,
             { chatId, threadRootMessageIndex },
             startIndex,
-            ascending,
+            ascending
         );
 
         // we may or may not have all of the requested events
@@ -421,13 +418,13 @@ export class CommunityClient extends CandidService {
                 startIndex,
                 ascending,
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             )
                 .then((resp) => this.setCachedEvents(chatId, resp, threadRootMessageIndex))
                 .catch((err) => {
                     if (err instanceof ResponseTooLargeError) {
                         console.log(
-                            "Response size too large, we will try to split the payload into a a few chunks",
+                            "Response size too large, we will try to split the payload into a a few chunks"
                         );
                         return chunkedChatEventsFromBackend(
                             (index: number, chunkSize: number) =>
@@ -437,13 +434,13 @@ export class CommunityClient extends CandidService {
                                     ascending,
                                     threadRootMessageIndex,
                                     latestKnownUpdate,
-                                    chunkSize,
+                                    chunkSize
                                 ),
                             eventIndexRange,
                             startIndex,
-                            ascending,
+                            ascending
                         ).then((resp) =>
-                            this.setCachedEvents(chatId, resp, threadRootMessageIndex),
+                            this.setCachedEvents(chatId, resp, threadRootMessageIndex)
                         );
                     } else {
                         throw err;
@@ -454,7 +451,7 @@ export class CommunityClient extends CandidService {
                 chatId,
                 [cachedEvents, missing],
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             );
         }
     }
@@ -465,7 +462,7 @@ export class CommunityClient extends CandidService {
         ascending: boolean,
         threadRootMessageIndex: number | undefined,
         latestKnownUpdate: bigint | undefined,
-        maxEvents: number = MAX_EVENTS,
+        maxEvents: number = MAX_EVENTS
     ): Promise<EventsResponse<ChatEvent>> {
         const args = {
             channel_id: BigInt(chatId.channelId),
@@ -481,7 +478,7 @@ export class CommunityClient extends CandidService {
             () => this.service.events(args),
             (res) => {
                 return getEventsResponse(this.principal, res, chatId, latestKnownUpdate);
-            },
+            }
         );
     }
 
@@ -489,13 +486,13 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         eventIndexes: number[],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         return getCachedEventsByIndex(this.db, eventIndexes, {
             chatId,
             threadRootMessageIndex,
         }).then((res) =>
-            this.handleMissingEvents(chatId, res, threadRootMessageIndex, latestKnownUpdate),
+            this.handleMissingEvents(chatId, res, threadRootMessageIndex, latestKnownUpdate)
         );
     }
 
@@ -503,7 +500,7 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         eventIndexes: number[],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         const args = {
             channel_id: BigInt(chatId.channelId),
@@ -516,7 +513,7 @@ export class CommunityClient extends CandidService {
             () => this.service.events_by_index(args),
             (res) => {
                 return getEventsResponse(this.principal, res, chatId, latestKnownUpdate);
-            },
+            }
         );
     }
 
@@ -525,32 +522,32 @@ export class CommunityClient extends CandidService {
         eventIndexRange: IndexRange,
         messageIndex: number,
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         const [cachedEvents, missing, totalMiss] = await getCachedEventsWindowByMessageIndex(
             this.db,
             eventIndexRange,
             { chatId, threadRootMessageIndex },
-            messageIndex,
+            messageIndex
         );
         if (totalMiss || missing.size >= MAX_MISSING) {
             // if we have exceeded the maximum number of missing events, let's just consider it a complete miss and go to the api
             console.log(
                 "We didn't get enough back from the cache, going to the api",
                 missing.size,
-                totalMiss,
+                totalMiss
             );
             return this.eventsWindowFromBackend(
                 chatId,
                 messageIndex,
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             )
                 .then((resp) => this.setCachedEvents(chatId, resp, threadRootMessageIndex))
                 .catch((err) => {
                     if (err instanceof ResponseTooLargeError) {
                         console.log(
-                            "Response size too large, we will try to split the window request into a a few chunks",
+                            "Response size too large, we will try to split the window request into a a few chunks"
                         );
                         return chunkedChatEventsWindowFromBackend(
                             (index: number, ascending: boolean, chunkSize: number) =>
@@ -560,7 +557,7 @@ export class CommunityClient extends CandidService {
                                     ascending,
                                     threadRootMessageIndex,
                                     latestKnownUpdate,
-                                    chunkSize,
+                                    chunkSize
                                 ),
                             (index: number, chunkSize: number) =>
                                 this.eventsWindowFromBackend(
@@ -568,12 +565,12 @@ export class CommunityClient extends CandidService {
                                     index,
                                     threadRootMessageIndex,
                                     latestKnownUpdate,
-                                    chunkSize,
+                                    chunkSize
                                 ),
                             eventIndexRange,
-                            messageIndex,
+                            messageIndex
                         ).then((resp) =>
-                            this.setCachedEvents(chatId, resp, threadRootMessageIndex),
+                            this.setCachedEvents(chatId, resp, threadRootMessageIndex)
                         );
                     } else {
                         throw err;
@@ -584,7 +581,7 @@ export class CommunityClient extends CandidService {
                 chatId,
                 [cachedEvents, missing],
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             );
         }
     }
@@ -594,7 +591,7 @@ export class CommunityClient extends CandidService {
         messageIndex: number,
         threadRootMessageIndex: number | undefined,
         latestKnownUpdate: bigint | undefined,
-        maxEvents: number = MAX_EVENTS,
+        maxEvents: number = MAX_EVENTS
     ): Promise<EventsResponse<ChatEvent>> {
         const args = {
             channel_id: BigInt(chatId.channelId),
@@ -607,14 +604,14 @@ export class CommunityClient extends CandidService {
         };
         return this.handleQueryResponse(
             () => this.service.events_window(args),
-            (res) => getEventsResponse(this.principal, res, chatId, latestKnownUpdate),
+            (res) => getEventsResponse(this.principal, res, chatId, latestKnownUpdate)
         );
     }
 
     async getMessagesByMessageIndex(
         chatId: ChannelIdentifier,
         messageIndexes: Set<number>,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<Message>> {
         const fromCache = await loadMessagesByMessageIndex(this.db, chatId, messageIndexes);
         if (fromCache.missing.size > 0) {
@@ -623,7 +620,7 @@ export class CommunityClient extends CandidService {
             const resp = await this.getMessagesByMessageIndexFromBackend(
                 chatId,
                 fromCache.missing,
-                latestKnownUpdate,
+                latestKnownUpdate
             ).then((resp) => this.setCachedEvents(chatId, resp));
 
             return resp === "events_failed"
@@ -646,7 +643,7 @@ export class CommunityClient extends CandidService {
     private getMessagesByMessageIndexFromBackend(
         chatId: ChannelIdentifier,
         messageIndexes: Set<number>,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<Message>> {
         const thread_root_message_index: [] = [];
         const args = {
@@ -661,7 +658,7 @@ export class CommunityClient extends CandidService {
             () => this.service.messages_by_message_index(args),
             (resp) =>
                 getMessagesByMessageIndexResponse(this.principal, resp, chatId, latestKnownUpdate),
-            args,
+            args
         );
     }
 
@@ -669,7 +666,7 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         [cachedEvents, missing]: [EventsSuccessResult<ChatEvent>, Set<number>],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         if (missing.size === 0) {
             return Promise.resolve(cachedEvents);
@@ -678,7 +675,7 @@ export class CommunityClient extends CandidService {
                 chatId,
                 [...missing],
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             )
                 .then((resp) => this.setCachedEvents(chatId, resp, threadRootMessageIndex))
                 .then((resp) => {
@@ -693,10 +690,10 @@ export class CommunityClient extends CandidService {
     private setCachedEvents<T extends ChatEvent>(
         chatId: ChannelIdentifier,
         resp: EventsResponse<T>,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): EventsResponse<T> {
         setCachedEvents(this.db, chatId, resp, threadRootMessageIndex).catch((err) =>
-            this.config.logger.error("Error writing cached channel events", err),
+            this.config.logger.error("Error writing cached channel events", err)
         );
         return resp;
     }
@@ -710,13 +707,13 @@ export class CommunityClient extends CandidService {
             this.service.leave_channel({
                 channel_id: BigInt(chatId.channelId),
             }),
-            leaveGroupResponse,
+            leaveGroupResponse
         );
     }
 
     localUserIndex(): Promise<string> {
         return this.handleResponse(this.service.local_user_index({}), (resp) =>
-            resp.Success.toString(),
+            resp.Success.toString()
         );
     }
 
@@ -724,7 +721,7 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         messageIndexes: number[],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<Message>> {
         const args = {
             channel_id: BigInt(chatId.channelId),
@@ -735,7 +732,7 @@ export class CommunityClient extends CandidService {
         };
         return this.handleQueryResponse(
             () => this.service.messages_by_message_index(args),
-            (res) => messagesByMessageIndexResponse(this.principal, res, chatId, latestKnownUpdate),
+            (res) => messagesByMessageIndexResponse(this.principal, res, chatId, latestKnownUpdate)
         );
     }
 
@@ -745,7 +742,7 @@ export class CommunityClient extends CandidService {
                 channel_id: BigInt(chatId.channelId),
                 message_index: messageIndex,
             }),
-            unpinMessageResponse,
+            unpinMessageResponse
         );
     }
 
@@ -755,7 +752,7 @@ export class CommunityClient extends CandidService {
                 channel_id: BigInt(chatId.channelId),
                 message_index: messageIndex,
             }),
-            pinMessageResponse,
+            pinMessageResponse
         );
     }
 
@@ -764,20 +761,20 @@ export class CommunityClient extends CandidService {
             this.service.remove_member({
                 user_id: Principal.fromText(userId),
             }),
-            removeMemberResponse,
+            removeMemberResponse
         );
     }
 
     removeMemberFromChannel(
         chatId: ChannelIdentifier,
-        userId: string,
+        userId: string
     ): Promise<RemoveMemberResponse> {
         return this.handleResponse(
             this.service.remove_member_from_channel({
                 channel_id: BigInt(chatId.channelId),
                 user_id: Principal.fromText(userId),
             }),
-            removeMemberFromChannelResponse,
+            removeMemberFromChannelResponse
         );
     }
 
@@ -785,7 +782,7 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         messageId: bigint,
         reaction: string,
-        threadRootMessageIndex: number | undefined,
+        threadRootMessageIndex: number | undefined
     ): Promise<AddRemoveReactionResponse> {
         return this.handleResponse(
             this.service.remove_reaction({
@@ -794,7 +791,7 @@ export class CommunityClient extends CandidService {
                 reaction,
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
             }),
-            addRemoveReactionResponse,
+            addRemoveReactionResponse
         );
     }
 
@@ -806,7 +803,7 @@ export class CommunityClient extends CandidService {
         chatId: ChannelIdentifier,
         maxResults: number,
         users: string[],
-        searchTerm: string,
+        searchTerm: string
     ): Promise<SearchGroupChatResponse> {
         return this.handleQueryResponse(
             () =>
@@ -816,13 +813,13 @@ export class CommunityClient extends CandidService {
                     users: users.length > 0 ? [users.map((u) => Principal.fromText(u))] : [],
                     search_term: searchTerm,
                 }),
-            (resp) => searchGroupChatResponse(resp, chatId),
+            (resp) => searchGroupChatResponse(resp, chatId)
         );
     }
 
     async getCommunityDetails(
         id: CommunityIdentifier,
-        communityLastUpdated: bigint,
+        communityLastUpdated: bigint
     ): Promise<CommunityDetailsResponse> {
         const fromCache = await getCachedCommunityDetails(this.db, id.communityId);
         if (fromCache !== undefined) {
@@ -846,13 +843,13 @@ export class CommunityClient extends CandidService {
                 this.service.selected_initial({
                     invite_code: apiOptional(textToCode, this.inviteCode),
                 }),
-            communityDetailsResponse,
+            communityDetailsResponse
         );
     }
 
     private async getCommunityDetailsUpdates(
         id: CommunityIdentifier,
-        previous: CommunityDetails,
+        previous: CommunityDetails
     ): Promise<CommunityDetails> {
         const response = await this.getCommunityDetailsUpdatesFromBackend(previous);
         if (response.lastUpdated > previous.lastUpdated) {
@@ -862,7 +859,7 @@ export class CommunityClient extends CandidService {
     }
 
     private async getCommunityDetailsUpdatesFromBackend(
-        previous: CommunityDetails,
+        previous: CommunityDetails
     ): Promise<CommunityDetails> {
         const updatesResponse = await this.handleQueryResponse(
             () =>
@@ -870,7 +867,7 @@ export class CommunityClient extends CandidService {
                     updates_since: previous.lastUpdated,
                     invite_code: apiOptional(textToCode, this.inviteCode),
                 }),
-            communityDetailsUpdatesResponse,
+            communityDetailsUpdatesResponse
         );
 
         if (updatesResponse.kind === "failure") {
@@ -889,7 +886,7 @@ export class CommunityClient extends CandidService {
 
     async getChannelDetails(
         chatId: ChannelIdentifier,
-        chatLastUpdated: bigint,
+        chatLastUpdated: bigint
     ): Promise<GroupChatDetailsResponse> {
         const cacheKey = `${chatId.communityId}_${chatId.channelId}`;
         const fromCache = await getCachedGroupDetails(this.db, cacheKey);
@@ -909,21 +906,21 @@ export class CommunityClient extends CandidService {
     }
 
     private getChannelDetailsFromBackend(
-        chatId: ChannelIdentifier,
+        chatId: ChannelIdentifier
     ): Promise<GroupChatDetailsResponse> {
         return this.handleQueryResponse(
             () =>
                 this.service.selected_channel_initial({
                     channel_id: BigInt(chatId.channelId),
                 }),
-            groupDetailsResponse,
+            groupDetailsResponse
         );
     }
 
     private async getChannelDetailsUpdates(
         chatId: ChannelIdentifier,
         cacheKey: string,
-        previous: GroupChatDetails,
+        previous: GroupChatDetails
     ): Promise<GroupChatDetails> {
         const response = await this.getChannelDetailsUpdatesFromBackend(chatId, previous);
         if (response.timestamp > previous.timestamp) {
@@ -934,7 +931,7 @@ export class CommunityClient extends CandidService {
 
     private async getChannelDetailsUpdatesFromBackend(
         chatId: ChannelIdentifier,
-        previous: GroupChatDetails,
+        previous: GroupChatDetails
     ): Promise<GroupChatDetails> {
         const updatesResponse = await this.handleQueryResponse(
             () =>
@@ -942,7 +939,7 @@ export class CommunityClient extends CandidService {
                     channel_id: BigInt(chatId.channelId),
                     updates_since: previous.timestamp,
                 }),
-            groupDetailsUpdatesResponse,
+            groupDetailsUpdatesResponse
         );
 
         if (updatesResponse.kind === "failure") {
@@ -969,7 +966,7 @@ export class CommunityClient extends CandidService {
         communityRulesAccepted: number | undefined,
         channelRulesAccepted: number | undefined,
         messageFilterFailed: bigint | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<[SendMessageResponse, Message]> {
         // pre-emtively remove the failed message from indexeddb - it will get re-added if anything goes wrong
         removeFailedMessage(this.db, chatId, event.event.messageId, threadRootMessageIndex);
@@ -993,7 +990,7 @@ export class CommunityClient extends CandidService {
                     (replyContext) => ({
                         event_index: replyContext.eventIndex,
                     }),
-                    event.event.repliesTo,
+                    event.event.repliesTo
                 ),
                 mentioned: mentioned.map(apiUser),
                 forwarding: event.event.forwarded,
@@ -1012,7 +1009,7 @@ export class CommunityClient extends CandidService {
                         this.db,
                         chatId,
                         event,
-                        threadRootMessageIndex,
+                        threadRootMessageIndex
                     )(retVal);
                     return retVal;
                 })
@@ -1029,7 +1026,7 @@ export class CommunityClient extends CandidService {
         answerIdx: number,
         voteType: "register" | "delete",
         threadRootMessageIndex: number | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<RegisterPollVoteResponse> {
         return this.handleResponse(
             this.service.register_poll_vote({
@@ -1040,7 +1037,7 @@ export class CommunityClient extends CandidService {
                 message_index: messageIdx,
                 new_achievement: newAchievement,
             }),
-            registerPollVoteResponse,
+            registerPollVoteResponse
         );
     }
 
@@ -1051,7 +1048,7 @@ export class CommunityClient extends CandidService {
                     channel_id: BigInt(chatId.channelId),
                     invite_code: apiOptional(textToCode, this.inviteCode),
                 }),
-            (resp) => communityChannelSummaryResponse(resp, this.communityId),
+            (resp) => communityChannelSummaryResponse(resp, this.communityId)
         ).catch((err) => {
             if (err instanceof DestinationInvalidError) {
                 return { kind: "canister_not_found" };
@@ -1066,7 +1063,7 @@ export class CommunityClient extends CandidService {
             this.service.import_group({
                 group_id: Principal.fromText(id.groupId),
             }),
-            (resp) => importGroupResponse(this.communityId, resp),
+            (resp) => importGroupResponse(this.communityId, resp)
         );
     }
 
@@ -1076,14 +1073,14 @@ export class CommunityClient extends CandidService {
                 this.service.summary({
                     invite_code: apiOptional(textToCode, this.inviteCode),
                 }),
-            summaryResponse,
+            summaryResponse
         );
     }
 
     exploreChannels(
         searchTerm: string | undefined,
         pageSize: number,
-        pageIndex: number,
+        pageIndex: number
     ): Promise<ExploreChannelsResponse> {
         return this.handleQueryResponse(
             () =>
@@ -1093,7 +1090,7 @@ export class CommunityClient extends CandidService {
                     search_term: apiOptional(identity, searchTerm),
                     invite_code: apiOptional(textToCode, this.inviteCode),
                 }),
-            (resp) => exploreChannelsResponse(resp, this.communityId),
+            (resp) => exploreChannelsResponse(resp, this.communityId)
         );
     }
 
@@ -1104,20 +1101,20 @@ export class CommunityClient extends CandidService {
                     updates_since: updatesSince,
                     invite_code: apiOptional(textToCode, this.inviteCode),
                 }),
-            summaryUpdatesResponse,
+            summaryUpdatesResponse
         );
     }
 
     toggleMuteChannelNotifications(
         chatId: ChannelIdentifier | undefined,
-        mute: boolean,
+        mute: boolean
     ): Promise<ToggleMuteNotificationResponse> {
         return this.handleResponse(
             this.service.toggle_mute_notifications({
                 channel_id: chatId ? [BigInt(chatId.channelId)] : [],
                 mute,
             }),
-            muteNotificationsResponse,
+            muteNotificationsResponse
         );
     }
 
@@ -1127,7 +1124,7 @@ export class CommunityClient extends CandidService {
                 channel_id: [],
                 mute,
             }),
-            toggleMuteNotificationsResponse,
+            toggleMuteNotificationsResponse
         );
     }
 
@@ -1136,14 +1133,14 @@ export class CommunityClient extends CandidService {
             this.service.unblock_user({
                 user_id: Principal.fromText(userId),
             }),
-            unblockUserResponse,
+            unblockUserResponse
         );
     }
 
     undeleteMessage(
         chatId: ChannelIdentifier,
         messageId: bigint,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): Promise<UndeleteMessageResponse> {
         return this.handleResponse(
             this.service.undelete_messages({
@@ -1151,14 +1148,14 @@ export class CommunityClient extends CandidService {
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
                 message_ids: [messageId],
             }),
-            undeleteMessageResponse,
+            undeleteMessageResponse
         );
     }
 
     threadPreviews(
         chatId: ChannelIdentifier,
         threadRootMessageIndexes: number[],
-        latestClientThreadUpdate: bigint | undefined,
+        latestClientThreadUpdate: bigint | undefined
     ): Promise<ThreadPreviewsResponse> {
         return this.handleQueryResponse(
             () =>
@@ -1167,14 +1164,14 @@ export class CommunityClient extends CandidService {
                     threads: new Uint32Array(threadRootMessageIndexes),
                     latest_client_thread_update: apiOptional(identity, latestClientThreadUpdate),
                 }),
-            (resp) => threadPreviewsResponse(resp, chatId, latestClientThreadUpdate),
+            (resp) => threadPreviewsResponse(resp, chatId, latestClientThreadUpdate)
         );
     }
 
     registerProposalVote(
         channelId: string,
         messageIdx: number,
-        adopt: boolean,
+        adopt: boolean
     ): Promise<RegisterProposalVoteResponse> {
         return this.handleResponse(
             this.service.register_proposal_vote({
@@ -1182,7 +1179,7 @@ export class CommunityClient extends CandidService {
                 adopt,
                 message_index: messageIdx,
             }),
-            registerProposalVoteResponse,
+            registerProposalVoteResponse
         );
     }
 
@@ -1197,7 +1194,7 @@ export class CommunityClient extends CandidService {
         gate?: AccessGate,
         isPublic?: boolean,
         messagesVisibleToNonMembers?: boolean,
-        externalUrl?: string,
+        externalUrl?: string
     ): Promise<UpdateGroupResponse> {
         return this.handleResponse(
             this.service.update_channel({
@@ -1214,8 +1211,8 @@ export class CommunityClient extends CandidService {
                     gate === undefined
                         ? { NoChange: null }
                         : gate.kind === "no_gate"
-                          ? { SetToNone: null }
-                          : { SetToSome: apiAccessGate(gate) },
+                        ? { SetToNone: null }
+                        : { SetToSome: apiAccessGate(gate) },
                 avatar:
                     avatar === undefined
                         ? { NoChange: null }
@@ -1228,7 +1225,7 @@ export class CommunityClient extends CandidService {
                           },
                 messages_visible_to_non_members: apiOptional(identity, messagesVisibleToNonMembers),
             }),
-            updateGroupResponse,
+            updateGroupResponse
         );
     }
 
@@ -1241,7 +1238,7 @@ export class CommunityClient extends CandidService {
         banner?: Uint8Array,
         gate?: AccessGate,
         isPublic?: boolean,
-        primaryLanguage?: string,
+        primaryLanguage?: string
     ): Promise<UpdateCommunityResponse> {
         return this.handleResponse(
             this.service.update_community({
@@ -1255,8 +1252,8 @@ export class CommunityClient extends CandidService {
                     gate === undefined
                         ? { NoChange: null }
                         : gate.kind === "no_gate"
-                          ? { SetToNone: null }
-                          : { SetToSome: apiAccessGate(gate) },
+                        ? { SetToNone: null }
+                        : { SetToSome: apiAccessGate(gate) },
                 avatar:
                     avatar === undefined
                         ? { NoChange: null }
@@ -1278,7 +1275,7 @@ export class CommunityClient extends CandidService {
                               },
                           },
             }),
-            updateCommunityResponse,
+            updateCommunityResponse
         );
     }
 
@@ -1288,7 +1285,7 @@ export class CommunityClient extends CandidService {
                 name,
                 user_ids: users.map((u) => Principal.fromText(u)),
             }),
-            createUserGroupResponse,
+            createUserGroupResponse
         );
     }
 
@@ -1296,7 +1293,7 @@ export class CommunityClient extends CandidService {
         userGroupId: number,
         name: string | undefined,
         usersToAdd: string[],
-        usersToRemove: string[],
+        usersToRemove: string[]
     ): Promise<UpdateUserGroupResponse> {
         return this.handleResponse(
             this.service.update_user_group({
@@ -1305,20 +1302,20 @@ export class CommunityClient extends CandidService {
                 users_to_add: usersToAdd.map((u) => Principal.fromText(u)),
                 users_to_remove: usersToRemove.map((u) => Principal.fromText(u)),
             }),
-            updateUserGroupResponse,
+            updateUserGroupResponse
         );
     }
 
     setMemberDisplayName(
         displayName: string | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<SetMemberDisplayNameResponse> {
         return this.handleResponse(
             this.service.set_member_display_name({
                 display_name: apiOptional(identity, displayName),
                 new_achievement: newAchievement,
             }),
-            setMemberDisplayNameResponse,
+            setMemberDisplayNameResponse
         );
     }
 
@@ -1327,14 +1324,14 @@ export class CommunityClient extends CandidService {
             this.service.delete_user_groups({
                 user_group_ids: userGroupIds,
             }),
-            deleteUserGroupsResponse,
+            deleteUserGroupsResponse
         );
     }
 
     followThread(
         channelId: string,
         threadRootMessageIndex: number,
-        follow: boolean,
+        follow: boolean
     ): Promise<FollowThreadResponse> {
         const args = {
             channel_id: BigInt(channelId),
@@ -1342,7 +1339,7 @@ export class CommunityClient extends CandidService {
         };
         return this.handleResponse(
             follow ? this.service.follow_thread(args) : this.service.unfollow_thread(args),
-            followThreadResponse,
+            followThreadResponse
         );
     }
 
@@ -1350,7 +1347,7 @@ export class CommunityClient extends CandidService {
         channelId: string,
         threadRootMessageIndex: number | undefined,
         messageId: bigint,
-        deleteMessage: boolean,
+        deleteMessage: boolean
     ): Promise<boolean> {
         return this.handleResponse(
             this.service.report_message({
@@ -1359,7 +1356,7 @@ export class CommunityClient extends CandidService {
                 message_id: messageId,
                 delete: deleteMessage,
             }),
-            reportMessageResponse,
+            reportMessageResponse
         );
     }
 
@@ -1368,7 +1365,7 @@ export class CommunityClient extends CandidService {
         threadRootMessageIndex: number | undefined,
         messageId: bigint,
         pin: string | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<AcceptP2PSwapResponse> {
         return this.handleResponse(
             this.service.accept_p2p_swap({
@@ -1378,14 +1375,14 @@ export class CommunityClient extends CandidService {
                 pin: apiOptional(identity, pin),
                 new_achievement: newAchievement,
             }),
-            acceptP2PSwapResponse,
+            acceptP2PSwapResponse
         );
     }
 
     cancelP2PSwap(
         channelId: string,
         threadRootMessageIndex: number | undefined,
-        messageId: bigint,
+        messageId: bigint
     ): Promise<CancelP2PSwapResponse> {
         return this.handleResponse(
             this.service.cancel_p2p_swap({
@@ -1393,14 +1390,14 @@ export class CommunityClient extends CandidService {
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
                 message_id: messageId,
             }),
-            cancelP2PSwapResponse,
+            cancelP2PSwapResponse
         );
     }
 
     joinVideoCall(
         channelId: string,
         messageId: bigint,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<JoinVideoCallResponse> {
         return this.handleResponse(
             this.service.join_video_call({
@@ -1408,7 +1405,7 @@ export class CommunityClient extends CandidService {
                 channel_id: BigInt(channelId),
                 new_achievement: newAchievement,
             }),
-            joinVideoCallResponse,
+            joinVideoCallResponse
         );
     }
 
@@ -1416,7 +1413,7 @@ export class CommunityClient extends CandidService {
         channelId: string,
         messageId: bigint,
         presence: VideoCallPresence,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<SetVideoCallPresenceResponse> {
         return this.handleResponse(
             this.service.set_video_call_presence({
@@ -1425,14 +1422,14 @@ export class CommunityClient extends CandidService {
                 presence: apiVideoCallPresence(presence),
                 new_achievement: newAchievement,
             }),
-            setVideoCallPresence,
+            setVideoCallPresence
         );
     }
 
     videoCallParticipants(
         channelId: string,
         messageId: bigint,
-        updatesSince?: bigint,
+        updatesSince?: bigint
     ): Promise<VideoCallParticipantsResponse> {
         return this.handleQueryResponse(
             () =>
@@ -1441,7 +1438,17 @@ export class CommunityClient extends CandidService {
                     message_id: messageId,
                     updated_since: apiOptional(identity, updatesSince),
                 }),
-            videoCallParticipantsResponse,
+            videoCallParticipantsResponse
+        );
+    }
+
+    cancelInvites(channelId: string | undefined, userIds: string[]): Promise<boolean> {
+        return this.handleResponse(
+            this.service.cancel_invites({
+                channel_id: apiOptional((cid) => BigInt(cid), channelId),
+                user_ids: userIds.map((u) => Principal.fromText(u)),
+            }),
+            (candid) => "Success" in candid
         );
     }
 }
diff --git a/frontend/openchat-agent/src/services/group/candid/idl.js b/frontend/openchat-agent/src/services/group/candid/idl.js
index 90e4925aaa..1f207a6f9c 100644
--- a/frontend/openchat-agent/src/services/group/candid/idl.js
+++ b/frontend/openchat-agent/src/services/group/candid/idl.js
@@ -83,6 +83,11 @@ export const idlFactory = ({ IDL }) => {
     'CannotBlockSelf' : IDL.Null,
     'CannotBlockUser' : IDL.Null,
   });
+  const CancelInvitesArgs = IDL.Record({ 'user_ids' : IDL.Vec(UserId) });
+  const CancelInvitesResponse = IDL.Variant({
+    'NotAuthorized' : IDL.Null,
+    'Success' : IDL.Null,
+  });
   const CancelP2PSwapArgs = IDL.Record({
     'message_id' : MessageId,
     'thread_root_message_index' : IDL.Opt(MessageIndex),
@@ -1686,6 +1691,11 @@ export const idlFactory = ({ IDL }) => {
       ),
     'add_reaction' : IDL.Func([AddReactionArgs], [AddReactionResponse], []),
     'block_user' : IDL.Func([BlockUserArgs], [BlockUserResponse], []),
+    'cancel_invites' : IDL.Func(
+        [CancelInvitesArgs],
+        [CancelInvitesResponse],
+        [],
+      ),
     'cancel_p2p_swap' : IDL.Func(
         [CancelP2PSwapArgs],
         [CancelP2PSwapResponse],
diff --git a/frontend/openchat-agent/src/services/group/candid/types.d.ts b/frontend/openchat-agent/src/services/group/candid/types.d.ts
index b626ff358b..52616720b6 100644
--- a/frontend/openchat-agent/src/services/group/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/group/candid/types.d.ts
@@ -200,6 +200,9 @@ export interface CallParticipant {
   'user_id' : UserId,
   'joined' : TimestampMillis,
 }
+export interface CancelInvitesArgs { 'user_ids' : Array<UserId> }
+export type CancelInvitesResponse = { 'NotAuthorized' : null } |
+  { 'Success' : null };
 export interface CancelP2PSwapArgs {
   'message_id' : MessageId,
   'thread_root_message_index' : [] | [MessageIndex],
@@ -2226,6 +2229,7 @@ export interface _SERVICE {
   'accept_p2p_swap' : ActorMethod<[AcceptP2PSwapArgs], AcceptP2PSwapResponse>,
   'add_reaction' : ActorMethod<[AddReactionArgs], AddReactionResponse>,
   'block_user' : ActorMethod<[BlockUserArgs], BlockUserResponse>,
+  'cancel_invites' : ActorMethod<[CancelInvitesArgs], CancelInvitesResponse>,
   'cancel_p2p_swap' : ActorMethod<[CancelP2PSwapArgs], CancelP2PSwapResponse>,
   'change_role' : ActorMethod<[ChangeRoleArgs], ChangeRoleResponse>,
   'claim_prize' : ActorMethod<[ClaimPrizeArgs], ClaimPrizeResponse>,
diff --git a/frontend/openchat-agent/src/services/group/group.client.ts b/frontend/openchat-agent/src/services/group/group.client.ts
index ada95fdb5d..9f027dc56a 100644
--- a/frontend/openchat-agent/src/services/group/group.client.ts
+++ b/frontend/openchat-agent/src/services/group/group.client.ts
@@ -149,7 +149,7 @@ export class GroupClient extends CandidService {
         private config: AgentConfig,
         private chatId: GroupChatIdentifier,
         private db: Database,
-        private inviteCode: string | undefined,
+        private inviteCode: string | undefined
     ) {
         super(identity, agent, chatId.groupId);
         this.groupService = this.createServiceClient<GroupService>(idlFactory);
@@ -159,7 +159,7 @@ export class GroupClient extends CandidService {
         return this.handleQueryResponse(
             () => this.groupService.summary({}),
             summaryResponse,
-            {},
+            {}
         ).catch((err) => {
             if (err instanceof DestinationInvalidError) {
                 return { kind: "canister_not_found" };
@@ -175,14 +175,14 @@ export class GroupClient extends CandidService {
         return this.handleQueryResponse(
             () => this.groupService.summary_updates(args),
             summaryUpdatesResponse,
-            args,
+            args
         );
     }
 
     chatEventsByIndex(
         eventIndexes: number[],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         return getCachedEventsByIndex(this.db, eventIndexes, {
             chatId: this.chatId,
@@ -192,10 +192,10 @@ export class GroupClient extends CandidService {
 
     private setCachedEvents<T extends ChatEvent>(
         resp: EventsResponse<T>,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): EventsResponse<T> {
         setCachedEvents(this.db, this.chatId, resp, threadRootMessageIndex).catch((err) =>
-            this.config.logger.error("Error writing cached group events", err),
+            this.config.logger.error("Error writing cached group events", err)
         );
         return resp;
     }
@@ -203,7 +203,7 @@ export class GroupClient extends CandidService {
     private handleMissingEvents(
         [cachedEvents, missing]: [EventsSuccessResult<ChatEvent>, Set<number>],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         if (missing.size === 0) {
             return Promise.resolve(cachedEvents);
@@ -211,7 +211,7 @@ export class GroupClient extends CandidService {
             return this.chatEventsByIndexFromBackend(
                 [...missing],
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             )
                 .then((resp) => this.setCachedEvents(resp, threadRootMessageIndex))
                 .then((resp) => {
@@ -226,7 +226,7 @@ export class GroupClient extends CandidService {
     chatEventsByIndexFromBackend(
         eventIndexes: number[],
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         const args = {
             thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
@@ -237,7 +237,7 @@ export class GroupClient extends CandidService {
         return this.handleQueryResponse(
             () => this.groupService.events_by_index(args),
             (resp) => getEventsResponse(this.principal, resp, this.chatId, latestKnownUpdate),
-            args,
+            args
         );
     }
 
@@ -246,14 +246,14 @@ export class GroupClient extends CandidService {
         messageIndex: number,
         threadRootMessageIndex: number | undefined,
         latestKnownUpdate: bigint | undefined,
-        maxEvents: number = MAX_EVENTS,
+        maxEvents: number = MAX_EVENTS
     ): Promise<EventsResponse<ChatEvent>> {
         const [cachedEvents, missing, totalMiss] = await getCachedEventsWindowByMessageIndex(
             this.db,
             eventIndexRange,
             { chatId: this.chatId, threadRootMessageIndex },
             messageIndex,
-            maxEvents,
+            maxEvents
         );
 
         if (totalMiss || missing.size >= MAX_MISSING) {
@@ -261,19 +261,19 @@ export class GroupClient extends CandidService {
             console.log(
                 "We didn't get enough back from the cache, going to the api",
                 missing.size,
-                totalMiss,
+                totalMiss
             );
             return this.chatEventsWindowFromBackend(
                 messageIndex,
                 threadRootMessageIndex,
                 latestKnownUpdate,
-                maxEvents,
+                maxEvents
             )
                 .then((resp) => this.setCachedEvents(resp, threadRootMessageIndex))
                 .catch((err) => {
                     if (err instanceof ResponseTooLargeError) {
                         console.log(
-                            "Response size too large, we will try to split the window request into a a few chunks",
+                            "Response size too large, we will try to split the window request into a a few chunks"
                         );
                         return chunkedChatEventsWindowFromBackend(
                             (index: number, ascending: boolean, chunkSize: number) =>
@@ -282,17 +282,17 @@ export class GroupClient extends CandidService {
                                     ascending,
                                     threadRootMessageIndex,
                                     latestKnownUpdate,
-                                    chunkSize,
+                                    chunkSize
                                 ),
                             (index: number, chunkSize: number) =>
                                 this.chatEventsWindowFromBackend(
                                     index,
                                     threadRootMessageIndex,
                                     latestKnownUpdate,
-                                    chunkSize,
+                                    chunkSize
                                 ),
                             eventIndexRange,
-                            messageIndex,
+                            messageIndex
                         ).then((resp) => this.setCachedEvents(resp, threadRootMessageIndex));
                     } else {
                         throw err;
@@ -302,7 +302,7 @@ export class GroupClient extends CandidService {
             return this.handleMissingEvents(
                 [cachedEvents, missing],
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             );
         }
     }
@@ -311,7 +311,7 @@ export class GroupClient extends CandidService {
         messageIndex: number,
         threadRootMessageIndex: number | undefined,
         latestKnownUpdate: bigint | undefined,
-        maxEvents: number = MAX_EVENTS,
+        maxEvents: number = MAX_EVENTS
     ): Promise<EventsResponse<ChatEvent>> {
         const args = {
             thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
@@ -324,7 +324,7 @@ export class GroupClient extends CandidService {
         return this.handleQueryResponse(
             () => this.groupService.events_window(args),
             (resp) => getEventsResponse(this.principal, resp, this.chatId, latestKnownUpdate),
-            args,
+            args
         );
     }
 
@@ -333,14 +333,14 @@ export class GroupClient extends CandidService {
         startIndex: number,
         ascending: boolean,
         threadRootMessageIndex: number | undefined,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<ChatEvent>> {
         const [cachedEvents, missing] = await getCachedEvents(
             this.db,
             eventIndexRange,
             { chatId: this.chatId, threadRootMessageIndex },
             startIndex,
-            ascending,
+            ascending
         );
 
         // we may or may not have all of the requested events
@@ -351,13 +351,13 @@ export class GroupClient extends CandidService {
                 startIndex,
                 ascending,
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             )
                 .then((resp) => this.setCachedEvents(resp, threadRootMessageIndex))
                 .catch((err) => {
                     if (err instanceof ResponseTooLargeError) {
                         console.log(
-                            "Response size too large, we will try to split the payload into a a few chunks",
+                            "Response size too large, we will try to split the payload into a a few chunks"
                         );
                         return chunkedChatEventsFromBackend(
                             (index: number, chunkSize: number) =>
@@ -366,11 +366,11 @@ export class GroupClient extends CandidService {
                                     ascending,
                                     threadRootMessageIndex,
                                     latestKnownUpdate,
-                                    chunkSize,
+                                    chunkSize
                                 ),
                             eventIndexRange,
                             startIndex,
-                            ascending,
+                            ascending
                         ).then((resp) => this.setCachedEvents(resp, threadRootMessageIndex));
                     } else {
                         throw err;
@@ -380,7 +380,7 @@ export class GroupClient extends CandidService {
             return this.handleMissingEvents(
                 [cachedEvents, missing],
                 threadRootMessageIndex,
-                latestKnownUpdate,
+                latestKnownUpdate
             );
         }
     }
@@ -390,7 +390,7 @@ export class GroupClient extends CandidService {
         ascending: boolean,
         threadRootMessageIndex: number | undefined,
         latestKnownUpdate: bigint | undefined,
-        maxEvents: number = MAX_EVENTS,
+        maxEvents: number = MAX_EVENTS
     ): Promise<EventsResponse<ChatEvent>> {
         const args = {
             thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
@@ -404,7 +404,7 @@ export class GroupClient extends CandidService {
         return this.handleQueryResponse(
             () => this.groupService.events(args),
             (resp) => getEventsResponse(this.principal, resp, this.chatId, latestKnownUpdate),
-            args,
+            args
         );
     }
 
@@ -419,7 +419,7 @@ export class GroupClient extends CandidService {
                 new_role,
                 correlation_id: generateUint64(),
             }),
-            changeRoleResponse,
+            changeRoleResponse
         );
     }
 
@@ -429,7 +429,7 @@ export class GroupClient extends CandidService {
                 user_id: Principal.fromText(userId),
                 correlation_id: generateUint64(),
             }),
-            removeMemberResponse,
+            removeMemberResponse
         );
     }
 
@@ -437,7 +437,7 @@ export class GroupClient extends CandidService {
         message: Message,
         threadRootMessageIndex: number | undefined,
         blockLevelMarkdown: boolean | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<EditMessageResponse> {
         return new DataClient(this.identity, this.agent, this.config)
             .uploadData(message.content, [this.chatId.groupId])
@@ -453,7 +453,7 @@ export class GroupClient extends CandidService {
                 };
                 return this.handleResponse(
                     this.groupService.edit_message_v2(args),
-                    editMessageResponse,
+                    editMessageResponse
                 );
             });
     }
@@ -464,7 +464,7 @@ export class GroupClient extends CandidService {
                 correlation_id: generateUint64(),
                 message_id: messageId,
             }),
-            claimPrizeResponse,
+            claimPrizeResponse
         );
     }
 
@@ -476,7 +476,7 @@ export class GroupClient extends CandidService {
         threadRootMessageIndex: number | undefined,
         rulesAccepted: number | undefined,
         messageFilterFailed: bigint | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<[SendMessageResponse, Message]> {
         // pre-emtively remove the failed message from indexeddb - it will get re-added if anything goes wrong
         removeFailedMessage(this.db, this.chatId, event.event.messageId, threadRootMessageIndex);
@@ -498,7 +498,7 @@ export class GroupClient extends CandidService {
                     (replyContext) => ({
                         event_index: replyContext.eventIndex,
                     }),
-                    event.event.repliesTo,
+                    event.event.repliesTo
                 ),
                 mentioned: mentioned.map(apiUser),
                 forwarding: event.event.forwarded,
@@ -519,7 +519,7 @@ export class GroupClient extends CandidService {
                         this.db,
                         this.chatId,
                         event,
-                        threadRootMessageIndex,
+                        threadRootMessageIndex
                     )(retVal);
                     return retVal;
                 })
@@ -539,7 +539,7 @@ export class GroupClient extends CandidService {
         eventsTimeToLiveMs?: OptionUpdate<bigint>,
         gate?: AccessGate,
         isPublic?: boolean,
-        messagesVisibleToNonMembers?: boolean,
+        messagesVisibleToNonMembers?: boolean
     ): Promise<UpdateGroupResponse> {
         return this.handleResponse(
             this.groupService.update_group_v2({
@@ -564,11 +564,11 @@ export class GroupClient extends CandidService {
                     gate === undefined
                         ? { NoChange: null }
                         : gate.kind === "no_gate"
-                          ? { SetToNone: null }
-                          : { SetToSome: apiAccessGate(gate) },
+                        ? { SetToNone: null }
+                        : { SetToSome: apiAccessGate(gate) },
                 messages_visible_to_non_members: apiOptional(identity, messagesVisibleToNonMembers),
             }),
-            updateGroupResponse,
+            updateGroupResponse
         );
     }
 
@@ -578,7 +578,7 @@ export class GroupClient extends CandidService {
         username: string,
         displayName: string | undefined,
         threadRootMessageIndex: number | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<AddRemoveReactionResponse> {
         return this.handleResponse(
             this.groupService.add_reaction({
@@ -590,14 +590,14 @@ export class GroupClient extends CandidService {
                 correlation_id: generateUint64(),
                 new_achievement: newAchievement,
             }),
-            addRemoveReactionResponse,
+            addRemoveReactionResponse
         );
     }
 
     removeReaction(
         messageId: bigint,
         reaction: string,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): Promise<AddRemoveReactionResponse> {
         return this.handleResponse(
             this.groupService.remove_reaction({
@@ -606,7 +606,7 @@ export class GroupClient extends CandidService {
                 reaction,
                 correlation_id: generateUint64(),
             }),
-            addRemoveReactionResponse,
+            addRemoveReactionResponse
         );
     }
 
@@ -614,7 +614,7 @@ export class GroupClient extends CandidService {
         messageId: bigint,
         threadRootMessageIndex: number | undefined,
         asPlatformModerator: boolean | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<DeleteMessageResponse> {
         return this.handleResponse(
             this.groupService.delete_messages({
@@ -624,13 +624,13 @@ export class GroupClient extends CandidService {
                 as_platform_moderator: apiOptional(identity, asPlatformModerator),
                 new_achievement: newAchievement,
             }),
-            deleteMessageResponse,
+            deleteMessageResponse
         );
     }
 
     undeleteMessage(
         messageId: bigint,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): Promise<UndeleteMessageResponse> {
         return this.handleResponse(
             this.groupService.undelete_messages({
@@ -638,7 +638,7 @@ export class GroupClient extends CandidService {
                 message_ids: [messageId],
                 correlation_id: generateUint64(),
             }),
-            undeleteMessageResponse,
+            undeleteMessageResponse
         );
     }
 
@@ -648,7 +648,7 @@ export class GroupClient extends CandidService {
                 user_id: Principal.fromText(userId),
                 correlation_id: generateUint64(),
             }),
-            blockUserResponse,
+            blockUserResponse
         );
     }
 
@@ -658,7 +658,7 @@ export class GroupClient extends CandidService {
                 user_id: Principal.fromText(userId),
                 correlation_id: generateUint64(),
             }),
-            unblockUserResponse,
+            unblockUserResponse
         );
     }
 
@@ -682,7 +682,7 @@ export class GroupClient extends CandidService {
     private getGroupDetailsFromBackend(): Promise<GroupChatDetailsResponse> {
         return this.handleQueryResponse(
             () => this.groupService.selected_initial({}),
-            groupDetailsResponse,
+            groupDetailsResponse
         );
     }
 
@@ -695,7 +695,7 @@ export class GroupClient extends CandidService {
     }
 
     private async getGroupDetailsUpdatesFromBackend(
-        previous: GroupChatDetails,
+        previous: GroupChatDetails
     ): Promise<GroupChatDetails> {
         const args = {
             updates_since: previous.timestamp,
@@ -703,7 +703,7 @@ export class GroupClient extends CandidService {
         const updatesResponse = await this.handleQueryResponse(
             () => this.groupService.selected_updates_v2(args),
             groupDetailsUpdatesResponse,
-            args,
+            args
         );
 
         if (updatesResponse.kind === "failure") {
@@ -725,13 +725,13 @@ export class GroupClient extends CandidService {
         return this.handleQueryResponse(
             () => this.groupService.public_summary(args),
             publicSummaryResponse,
-            args,
+            args
         );
     }
 
     async getMessagesByMessageIndex(
         messageIndexes: Set<number>,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<Message>> {
         const fromCache = await loadMessagesByMessageIndex(this.db, this.chatId, messageIndexes);
         if (fromCache.missing.size > 0) {
@@ -739,7 +739,7 @@ export class GroupClient extends CandidService {
 
             const resp = await this.getMessagesByMessageIndexFromBackend(
                 fromCache.missing,
-                latestKnownUpdate,
+                latestKnownUpdate
             ).then((resp) => this.setCachedEvents(resp));
 
             return resp === "events_failed"
@@ -761,7 +761,7 @@ export class GroupClient extends CandidService {
 
     private getMessagesByMessageIndexFromBackend(
         messageIndexes: Set<number>,
-        latestKnownUpdate: bigint | undefined,
+        latestKnownUpdate: bigint | undefined
     ): Promise<EventsResponse<Message>> {
         const thread_root_message_index: [] = [];
         const invite_code: [] = [];
@@ -779,22 +779,22 @@ export class GroupClient extends CandidService {
                     this.principal,
                     resp,
                     this.chatId,
-                    latestKnownUpdate,
+                    latestKnownUpdate
                 ),
-            args,
+            args
         );
     }
 
     getDeletedMessage(
         messageId: bigint,
-        threadRootMessageIndex?: number,
+        threadRootMessageIndex?: number
     ): Promise<DeletedGroupMessageResponse> {
         return this.handleResponse(
             this.groupService.deleted_message({
                 message_id: messageId,
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
             }),
-            deletedMessageResponse,
+            deletedMessageResponse
         );
     }
 
@@ -804,7 +804,7 @@ export class GroupClient extends CandidService {
                 message_index: messageIndex,
                 correlation_id: generateUint64(),
             }),
-            pinMessageResponse,
+            pinMessageResponse
         );
     }
 
@@ -814,7 +814,7 @@ export class GroupClient extends CandidService {
                 message_index: messageIndex,
                 correlation_id: generateUint64(),
             }),
-            unpinMessageResponse,
+            unpinMessageResponse
         );
     }
 
@@ -823,7 +823,7 @@ export class GroupClient extends CandidService {
         answerIdx: number,
         voteType: "register" | "delete",
         threadRootMessageIndex: number | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<RegisterPollVoteResponse> {
         return this.handleResponse(
             this.groupService.register_poll_vote({
@@ -834,34 +834,34 @@ export class GroupClient extends CandidService {
                 new_achievement: newAchievement,
                 correlation_id: generateUint64(),
             }),
-            registerPollVoteResponse,
+            registerPollVoteResponse
         );
     }
 
     searchGroupChat(
         searchTerm: string,
         userIds: string[],
-        maxResults: number,
+        maxResults: number
     ): Promise<SearchGroupChatResponse> {
         const args = {
             search_term: searchTerm,
             max_results: maxResults,
             users: apiOptional(
                 identity,
-                userIds.map((u) => Principal.fromText(u)),
+                userIds.map((u) => Principal.fromText(u))
             ),
         };
         return this.handleQueryResponse(
             () => this.groupService.search_messages(args),
             (res) => searchGroupChatResponse(res, this.chatId),
-            args,
+            args
         );
     }
 
     getInviteCode(): Promise<InviteCodeResponse> {
         return this.handleQueryResponse(
             () => this.groupService.invite_code({}),
-            inviteCodeResponse,
+            inviteCodeResponse
         );
     }
 
@@ -870,7 +870,7 @@ export class GroupClient extends CandidService {
             this.groupService.enable_invite_code({
                 correlation_id: generateUint64(),
             }),
-            enableInviteCodeResponse,
+            enableInviteCodeResponse
         );
     }
 
@@ -879,7 +879,7 @@ export class GroupClient extends CandidService {
             this.groupService.disable_invite_code({
                 correlation_id: generateUint64(),
             }),
-            disableInviteCodeResponse,
+            disableInviteCodeResponse
         );
     }
 
@@ -888,13 +888,13 @@ export class GroupClient extends CandidService {
             this.groupService.reset_invite_code({
                 correlation_id: generateUint64(),
             }),
-            resetInviteCodeResponse,
+            resetInviteCodeResponse
         );
     }
 
     threadPreviews(
         threadRootMessageIndexes: number[],
-        latestClientThreadUpdate: bigint | undefined,
+        latestClientThreadUpdate: bigint | undefined
     ): Promise<ThreadPreviewsResponse> {
         return this.handleQueryResponse(
             () =>
@@ -902,54 +902,54 @@ export class GroupClient extends CandidService {
                     threads: new Uint32Array(threadRootMessageIndexes),
                     latest_client_thread_update: apiOptional(identity, latestClientThreadUpdate),
                 }),
-            (resp) => threadPreviewsResponse(resp, this.chatId, latestClientThreadUpdate),
+            (resp) => threadPreviewsResponse(resp, this.chatId, latestClientThreadUpdate)
         );
     }
 
     registerProposalVote(
         messageIdx: number,
-        adopt: boolean,
+        adopt: boolean
     ): Promise<RegisterProposalVoteResponse> {
         return this.handleResponse(
             this.groupService.register_proposal_vote({
                 adopt,
                 message_index: messageIdx,
             }),
-            registerProposalVoteResponse,
+            registerProposalVoteResponse
         );
     }
 
     registerProposalVoteV2(
         messageIdx: number,
-        adopt: boolean,
+        adopt: boolean
     ): Promise<RegisterProposalVoteResponse> {
         return this.handleResponse(
             this.groupService.register_proposal_vote_v2({
                 adopt,
                 message_index: messageIdx,
             }),
-            registerProposalVoteResponse,
+            registerProposalVoteResponse
         );
     }
 
     localUserIndex(): Promise<string> {
         return this.handleQueryResponse(
             () => this.groupService.local_user_index({}),
-            (resp) => resp.Success.toString(),
+            (resp) => resp.Success.toString()
         );
     }
 
     declineInvitation(): Promise<DeclineInvitationResponse> {
         return this.handleResponse(
             this.groupService.decline_invitation({}),
-            declineInvitationResponse,
+            declineInvitationResponse
         );
     }
 
     toggleMuteNotifications(mute: boolean): Promise<ToggleMuteNotificationResponse> {
         return this.handleResponse(
             this.groupService.toggle_mute_notifications({ mute }),
-            muteNotificationsResponse,
+            muteNotificationsResponse
         );
     }
 
@@ -961,7 +961,7 @@ export class GroupClient extends CandidService {
                 permissions: [],
                 rules,
             }),
-            convertToCommunityReponse,
+            convertToCommunityReponse
         );
     }
 
@@ -973,14 +973,14 @@ export class GroupClient extends CandidService {
             follow
                 ? this.groupService.follow_thread(args)
                 : this.groupService.unfollow_thread(args),
-            followThreadResponse,
+            followThreadResponse
         );
     }
 
     reportMessage(
         threadRootMessageIndex: number | undefined,
         messageId: bigint,
-        deleteMessage: boolean,
+        deleteMessage: boolean
     ): Promise<boolean> {
         return this.handleResponse(
             this.groupService.report_message({
@@ -988,7 +988,7 @@ export class GroupClient extends CandidService {
                 message_id: messageId,
                 delete: deleteMessage,
             }),
-            reportMessageResponse,
+            reportMessageResponse
         );
     }
 
@@ -996,7 +996,7 @@ export class GroupClient extends CandidService {
         threadRootMessageIndex: number | undefined,
         messageId: bigint,
         pin: string | undefined,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<AcceptP2PSwapResponse> {
         return this.handleResponse(
             this.groupService.accept_p2p_swap({
@@ -1005,20 +1005,20 @@ export class GroupClient extends CandidService {
                 pin: apiOptional(identity, pin),
                 new_achievement: newAchievement,
             }),
-            acceptP2PSwapResponse,
+            acceptP2PSwapResponse
         );
     }
 
     cancelP2PSwap(
         threadRootMessageIndex: number | undefined,
-        messageId: bigint,
+        messageId: bigint
     ): Promise<CancelP2PSwapResponse> {
         return this.handleResponse(
             this.groupService.cancel_p2p_swap({
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
                 message_id: messageId,
             }),
-            cancelP2PSwapResponse,
+            cancelP2PSwapResponse
         );
     }
 
@@ -1028,14 +1028,14 @@ export class GroupClient extends CandidService {
                 message_id: messageId,
                 new_achievement: newAchievement,
             }),
-            joinVideoCallResponse,
+            joinVideoCallResponse
         );
     }
 
     setVideoCallPresence(
         messageId: bigint,
         presence: VideoCallPresence,
-        newAchievement: boolean,
+        newAchievement: boolean
     ): Promise<SetVideoCallPresenceResponse> {
         return this.handleResponse(
             this.groupService.set_video_call_presence({
@@ -1043,13 +1043,13 @@ export class GroupClient extends CandidService {
                 presence: apiVideoCallPresence(presence),
                 new_achievement: newAchievement,
             }),
-            setVideoCallPresence,
+            setVideoCallPresence
         );
     }
 
     videoCallParticipants(
         messageId: bigint,
-        updatesSince?: bigint,
+        updatesSince?: bigint
     ): Promise<VideoCallParticipantsResponse> {
         return this.handleQueryResponse(
             () =>
@@ -1057,7 +1057,16 @@ export class GroupClient extends CandidService {
                     message_id: messageId,
                     updated_since: apiOptional(identity, updatesSince),
                 }),
-            videoCallParticipantsResponse,
+            videoCallParticipantsResponse
+        );
+    }
+
+    cancelInvites(userIds: string[]): Promise<boolean> {
+        return this.handleResponse(
+            this.groupService.cancel_invites({
+                user_ids: userIds.map((u) => Principal.fromText(u)),
+            }),
+            (candid) => "Success" in candid
         );
     }
 }
diff --git a/frontend/openchat-agent/src/services/localUserIndex/candid/idl.d.ts b/frontend/openchat-agent/src/services/localUserIndex/candid/idl.d.ts
index 23bcd05ee4..4d47bebca6 100644
--- a/frontend/openchat-agent/src/services/localUserIndex/candid/idl.d.ts
+++ b/frontend/openchat-agent/src/services/localUserIndex/candid/idl.d.ts
@@ -32,8 +32,6 @@ export {
     ChatEventsResponse as ApiChatEventsResponse,
     JoinGroupResponse as ApiJoinGroupResponse,
     GateCheckFailedReason as ApiGateCheckFailedReason,
-    InviteUsersToGroupResponse as ApiInviteUsersResponse,
-    InviteUsersToChannelResponse as ApiInviteUsersToChannelResponse,
     JoinCommunityResponse as ApiJoinCommunityResponse,
     CommunityCanisterCommunitySummary as ApiCommunityCanisterCommunitySummary,
     JoinChannelResponse as ApiJoinChannelResponse,
diff --git a/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts b/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts
index b441d5b98d..1a1b5b1892 100644
--- a/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts
+++ b/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts
@@ -14,7 +14,6 @@ import type {
     EventWrapper,
     GroupAndCommunitySummaryUpdatesArgs,
     GroupAndCommunitySummaryUpdatesResponse,
-    InviteUsersResponse,
     JoinCommunityResponse,
     JoinGroupResponse,
     MessageContext,
@@ -29,7 +28,6 @@ import {
     apiAccessTokenType,
     apiVerifiedCredentialArgs,
     groupAndCommunitySummaryUpdates,
-    inviteUsersResponse,
     joinChannelResponse,
     joinCommunityResponse,
     registerUserResponse,
@@ -49,19 +47,14 @@ import {
 export class LocalUserIndexClient extends CandidService {
     private localUserIndexService: LocalUserIndexService;
 
-    constructor(
-        identity: Identity,
-        agent: HttpAgent,
-        canisterId: string,
-        private db: Database,
-    ) {
+    constructor(identity: Identity, agent: HttpAgent, canisterId: string, private db: Database) {
         super(identity, agent, canisterId);
 
         this.localUserIndexService = this.createServiceClient<LocalUserIndexService>(idlFactory);
     }
 
     groupAndCommunitySummaryUpdates(
-        requests: GroupAndCommunitySummaryUpdatesArgs[],
+        requests: GroupAndCommunitySummaryUpdatesArgs[]
     ): Promise<GroupAndCommunitySummaryUpdatesResponse[]> {
         const args = {
             requests: requests.map((r) => ({
@@ -75,13 +68,13 @@ export class LocalUserIndexClient extends CandidService {
         return this.handleQueryResponse(
             () => this.localUserIndexService.group_and_community_summary_updates(args),
             groupAndCommunitySummaryUpdates,
-            args,
+            args
         );
     }
 
     async chatEvents(
         requests: ChatEventsArgs[],
-        cachePrimer = false,
+        cachePrimer = false
     ): Promise<ChatEventsResponse[]> {
         // The responses must be ordered such that the response at index i matches the request at index i
         const responses = [] as ChatEventsResponse[];
@@ -103,7 +96,7 @@ export class LocalUserIndexClient extends CandidService {
                     setCachePrimerTimestamp(
                         this.db,
                         request.context.chatId,
-                        request.latestKnownUpdate,
+                        request.latestKnownUpdate
                     );
                 }
             } else if (missing.size > MAX_MISSING) {
@@ -133,13 +126,13 @@ export class LocalUserIndexClient extends CandidService {
                         this.db,
                         request.context.chatId,
                         response.result,
-                        request.context.threadRootMessageIndex,
+                        request.context.threadRootMessageIndex
                     );
                     if (cachePrimer) {
                         setCachePrimerTimestamp(
                             this.db,
                             request.context.chatId,
-                            batchResponse.timestamp,
+                            batchResponse.timestamp
                         );
                     }
                 }
@@ -168,7 +161,7 @@ export class LocalUserIndexClient extends CandidService {
 
     private async getEventsFromCache(
         context: MessageContext,
-        args: ChatEventsArgsInner,
+        args: ChatEventsArgsInner
     ): Promise<[EventsSuccessResult<ChatEvent>, Set<number>]> {
         if (args.kind === "page") {
             return await getCachedEvents(
@@ -179,7 +172,7 @@ export class LocalUserIndexClient extends CandidService {
                 args.ascending,
                 undefined,
                 undefined,
-                1,
+                1
             );
         }
         if (args.kind === "window") {
@@ -190,7 +183,7 @@ export class LocalUserIndexClient extends CandidService {
                 args.midPoint,
                 undefined,
                 undefined,
-                1,
+                1
             );
             return [cached, missing];
         }
@@ -208,13 +201,13 @@ export class LocalUserIndexClient extends CandidService {
         return this.handleQueryResponse(
             () => this.localUserIndexService.chat_events(args),
             (resp) => chatEventsBatchResponse(this.principal, requests, resp),
-            args,
+            args
         );
     }
 
     registerUser(
         username: string,
-        referralCode: string | undefined,
+        referralCode: string | undefined
     ): Promise<RegisterUserResponse> {
         return this.handleResponse(
             this.localUserIndexService.register_user({
@@ -222,7 +215,7 @@ export class LocalUserIndexClient extends CandidService {
                 referral_code: apiOptional(identity, referralCode),
                 public_key: new Uint8Array((this.identity as SignIdentity).getPublicKey().toDer()),
             }),
-            registerUserResponse,
+            registerUserResponse
         );
     }
 
@@ -230,7 +223,7 @@ export class LocalUserIndexClient extends CandidService {
         communityId: string,
         inviteCode: string | undefined,
         credentialArgs: VerifiedCredentialArgs | undefined,
-        referredBy?: string,
+        referredBy?: string
     ): Promise<JoinCommunityResponse> {
         return this.handleResponse(
             this.localUserIndexService.join_community({
@@ -239,14 +232,14 @@ export class LocalUserIndexClient extends CandidService {
                 verified_credential_args: apiOptional(apiVerifiedCredentialArgs, credentialArgs),
                 referred_by: apiOptional((id) => Principal.fromText(id), referredBy),
             }),
-            joinCommunityResponse,
+            joinCommunityResponse
         );
     }
 
     joinGroup(
         chatId: string,
         inviteCode: string | undefined,
-        credentialArgs: VerifiedCredentialArgs | undefined,
+        credentialArgs: VerifiedCredentialArgs | undefined
     ): Promise<JoinGroupResponse> {
         return this.handleResponse(
             this.localUserIndexService.join_group({
@@ -255,7 +248,7 @@ export class LocalUserIndexClient extends CandidService {
                 verified_credential_args: apiOptional(apiVerifiedCredentialArgs, credentialArgs),
                 correlation_id: BigInt(0),
             }),
-            joinGroupResponse,
+            joinGroupResponse
         );
     }
 
@@ -263,7 +256,7 @@ export class LocalUserIndexClient extends CandidService {
         id: ChannelIdentifier,
         inviteCode: string | undefined,
         credentialArgs: VerifiedCredentialArgs | undefined,
-        referredBy?: string,
+        referredBy?: string
     ): Promise<JoinGroupResponse> {
         return this.handleResponse(
             this.localUserIndexService.join_channel({
@@ -273,30 +266,30 @@ export class LocalUserIndexClient extends CandidService {
                 verified_credential_args: apiOptional(apiVerifiedCredentialArgs, credentialArgs),
                 referred_by: apiOptional((id) => Principal.fromText(id), referredBy),
             }),
-            (resp) => joinChannelResponse(resp, id.communityId),
+            (resp) => joinChannelResponse(resp, id.communityId)
         );
     }
 
     inviteUsersToCommunity(
         communityId: string,
         userIds: string[],
-        callerUsername: string,
-    ): Promise<InviteUsersResponse> {
+        callerUsername: string
+    ): Promise<boolean> {
         return this.handleResponse(
             this.localUserIndexService.invite_users_to_community({
                 community_id: Principal.fromText(communityId),
                 user_ids: userIds.map((u) => Principal.fromText(u)),
                 caller_username: callerUsername,
             }),
-            inviteUsersResponse,
+            (candid) => "Success" in candid
         );
     }
 
     inviteUsersToGroup(
         chatId: string,
         userIds: string[],
-        callerUsername: string,
-    ): Promise<InviteUsersResponse> {
+        callerUsername: string
+    ): Promise<boolean> {
         return this.handleResponse(
             this.localUserIndexService.invite_users_to_group({
                 group_id: Principal.fromText(chatId),
@@ -304,7 +297,7 @@ export class LocalUserIndexClient extends CandidService {
                 caller_username: callerUsername,
                 correlation_id: BigInt(0),
             }),
-            inviteUsersResponse,
+            (candid) => "Success" in candid
         );
     }
 
@@ -312,8 +305,8 @@ export class LocalUserIndexClient extends CandidService {
         communityId: string,
         channelId: string,
         userIds: string[],
-        callerUsername: string,
-    ): Promise<InviteUsersResponse> {
+        callerUsername: string
+    ): Promise<boolean> {
         return this.handleResponse(
             this.localUserIndexService.invite_users_to_channel({
                 community_id: Principal.fromText(communityId),
@@ -321,13 +314,13 @@ export class LocalUserIndexClient extends CandidService {
                 user_ids: userIds.map((u) => Principal.fromText(u)),
                 caller_username: callerUsername,
             }),
-            inviteUsersResponse,
+            (candid) => "Success" in candid
         );
     }
 
     getAccessToken(
         chatId: ChatIdentifier,
-        accessType: AccessTokenType,
+        accessType: AccessTokenType
     ): Promise<string | undefined> {
         return this.handleQueryResponse(
             () =>
@@ -335,7 +328,7 @@ export class LocalUserIndexClient extends CandidService {
                     chat: apiChatIdentifier(chatId),
                     token_type: apiAccessTokenType(accessType),
                 }),
-            accessTokenResponse,
+            accessTokenResponse
         );
     }
 }
diff --git a/frontend/openchat-agent/src/services/localUserIndex/mappers.ts b/frontend/openchat-agent/src/services/localUserIndex/mappers.ts
index 1021838fed..2947260fcd 100644
--- a/frontend/openchat-agent/src/services/localUserIndex/mappers.ts
+++ b/frontend/openchat-agent/src/services/localUserIndex/mappers.ts
@@ -5,7 +5,6 @@ import type {
     ChatEventsBatchResponse,
     ChatEventsResponse,
     GroupAndCommunitySummaryUpdatesResponse,
-    InviteUsersResponse,
     JoinCommunityResponse,
     JoinGroupResponse,
     MessageContext,
@@ -21,8 +20,6 @@ import type {
     ApiChatEventsResponse,
     ApiEventsContext,
     ApiGroupAndCommunitySummaryUpdatesResponse,
-    ApiInviteUsersResponse,
-    ApiInviteUsersToChannelResponse,
     ApiJoinChannelResponse,
     ApiJoinCommunityResponse,
     ApiRegisterUserResponse,
@@ -71,7 +68,7 @@ export function accessTokenResponse(candid: ApiAccessTokenResponse): string | un
 }
 
 export function groupAndCommunitySummaryUpdates(
-    candid: ApiGroupAndCommunitySummaryUpdatesResponse,
+    candid: ApiGroupAndCommunitySummaryUpdatesResponse
 ): GroupAndCommunitySummaryUpdatesResponse[] {
     const results: GroupAndCommunitySummaryUpdatesResponse[] = [];
     for (const result of candid.Success) {
@@ -111,7 +108,7 @@ export function groupAndCommunitySummaryUpdates(
         } else {
             throw new UnsupportedValueError(
                 "Unexpected ApiSummaryUpdatesResponse type received",
-                result,
+                result
             );
         }
     }
@@ -183,7 +180,7 @@ function eventsArgsInner(args: ChatEventsArgs["args"]): ApiChatEventsArgsInner["
 export async function chatEventsBatchResponse(
     principal: Principal,
     requests: ChatEventsArgs[],
-    candid: ApiChatEventsResponse,
+    candid: ApiChatEventsResponse
 ): Promise<ChatEventsBatchResponse> {
     const responses = [] as ChatEventsResponse[];
     for (let i = 0; i < requests.length; i++) {
@@ -195,14 +192,14 @@ export async function chatEventsBatchResponse(
                 principal,
                 args.context.chatId,
                 response.Success.chat_last_updated,
-                true,
+                true
             );
 
             responses.push(
                 error ?? {
                     kind: "success",
                     result: eventsSuccessResponse(response.Success),
-                },
+                }
             );
         } else if ("ReplicaNotUpToDate" in response) {
             responses.push({
@@ -229,7 +226,7 @@ export async function chatEventsBatchResponse(
 
 export function joinChannelResponse(
     candid: ApiJoinChannelResponse,
-    communityId: string,
+    communityId: string
 ): JoinGroupResponse {
     if ("Success" in candid) {
         return { kind: "success", group: communityChannelSummary(candid.Success, communityId) };
@@ -308,17 +305,6 @@ export function registerUserResponse(candid: ApiRegisterUserResponse): RegisterU
     throw new UnsupportedValueError("Unexpected ApiRegisterUserResponse type received", candid);
 }
 
-export function inviteUsersResponse(
-    candid: ApiInviteUsersResponse | ApiInviteUsersToChannelResponse,
-): InviteUsersResponse {
-    if ("Success" in candid) {
-        return "success";
-    } else {
-        console.warn("InviteUsersResponse was unsuccessful", candid);
-        return "failure";
-    }
-}
-
 export function joinCommunityResponse(candid: ApiJoinCommunityResponse): JoinCommunityResponse {
     if ("Success" in candid) {
         return { kind: "success", community: communitySummary(candid.Success) };
@@ -333,7 +319,7 @@ export function joinCommunityResponse(candid: ApiJoinCommunityResponse): JoinCom
 }
 
 export function apiVerifiedCredentialArgs(
-    domain: VerifiedCredentialArgs,
+    domain: VerifiedCredentialArgs
 ): ApiVerifiedCredentialGateArgs {
     return {
         user_ii_principal: Principal.fromText(domain.userIIPrincipal),
diff --git a/frontend/openchat-agent/src/services/openchatAgent.ts b/frontend/openchat-agent/src/services/openchatAgent.ts
index 917b949eb6..ef10b8f19c 100644
--- a/frontend/openchat-agent/src/services/openchatAgent.ts
+++ b/frontend/openchat-agent/src/services/openchatAgent.ts
@@ -146,7 +146,6 @@ import type {
     UpdateMarketMakerConfigResponse,
     ProposalVoteDetails,
     SetMessageReminderResponse,
-    InviteUsersResponse,
     DeclineInvitationResponse,
     AccessGate,
     JoinCommunityResponse,
@@ -769,54 +768,38 @@ export class OpenChatAgent extends EventTarget {
         }
     }
 
-    async inviteUsersToCommunity(
-        id: CommunityIdentifier,
-        userIds: string[],
-        callerUsername: string
-    ): Promise<InviteUsersResponse> {
-        if (!userIds.length) {
-            return Promise.resolve<InviteUsersResponse>("success");
-        }
-
-        if (offline()) return Promise.resolve("failure");
-
-        const localUserIndex = await this.communityClient(id.communityId).localUserIndex();
-        return this.getLocalUserIndexClient(localUserIndex).inviteUsersToCommunity(
-            id.communityId,
-            userIds,
-            callerUsername
-        );
-    }
-
     async inviteUsers(
-        chatId: MultiUserChatIdentifier,
+        id: MultiUserChatIdentifier | CommunityIdentifier,
         userIds: string[],
         callerUsername: string
-    ): Promise<InviteUsersResponse> {
+    ): Promise<boolean> {
         if (!userIds.length) {
-            return Promise.resolve<InviteUsersResponse>("success");
+            return Promise.resolve(true);
         }
 
-        if (offline()) return Promise.resolve("failure");
+        if (offline()) return Promise.resolve(false);
 
-        switch (chatId.kind) {
-            case "group_chat": {
-                const localUserIndex = await this.getGroupClient(chatId.groupId).localUserIndex();
+        switch (id.kind) {
+            case "community": {
+                const localUserIndex = await this.communityClient(id.communityId).localUserIndex();
                 const localUserIndexClient = this.getLocalUserIndexClient(localUserIndex);
-                return localUserIndexClient.inviteUsersToGroup(
-                    chatId.groupId,
+                return localUserIndexClient.inviteUsersToCommunity(
+                    id.communityId,
                     userIds,
                     callerUsername
                 );
             }
+            case "group_chat": {
+                const localUserIndex = await this.getGroupClient(id.groupId).localUserIndex();
+                const localUserIndexClient = this.getLocalUserIndexClient(localUserIndex);
+                return localUserIndexClient.inviteUsersToGroup(id.groupId, userIds, callerUsername);
+            }
             case "channel": {
-                const localUserIndex = await this.communityClient(
-                    chatId.communityId
-                ).localUserIndex();
+                const localUserIndex = await this.communityClient(id.communityId).localUserIndex();
                 const localUserIndexClient = this.getLocalUserIndexClient(localUserIndex);
                 return localUserIndexClient.inviteUsersToChannel(
-                    chatId.communityId,
-                    chatId.channelId,
+                    id.communityId,
+                    id.channelId,
                     userIds,
                     callerUsername
                 );
@@ -3639,6 +3622,22 @@ export class OpenChatAgent extends EventTarget {
         return this.userClient.configureWallet(config);
     }
 
+    cancelInvites(
+        id: MultiUserChatIdentifier | CommunityIdentifier,
+        userIds: string[]
+    ): Promise<boolean> {
+        if (offline()) return Promise.resolve(false);
+
+        switch (id.kind) {
+            case "group_chat":
+                return this.getGroupClient(id.groupId).cancelInvites(userIds);
+            case "channel":
+                return this.communityClient(id.communityId).cancelInvites(id.channelId, userIds);
+            case "community":
+                return this.communityClient(id.communityId).cancelInvites(undefined, userIds);
+        }
+    }
+
     async clearCachedData(): Promise<void> {
         await Promise.all([
             clearCache(this.principal.toString()),
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index cbc2d4f98e..3e157f2644 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -332,7 +332,6 @@ import type {
     AccessGate,
     ProposalVoteDetails,
     MessageReminderCreatedContent,
-    InviteUsersResponse,
     CommunityPermissions,
     CommunitySummary,
     CreateCommunityResponse,
@@ -4625,33 +4624,85 @@ export class OpenChat extends OpenChatAgentWorker {
         return this.sendRequest({ kind: "removeSubscription", subscription });
     }
 
-    private inviteUsersLocally(chatId: ChatIdentifier, userIds: string[]): void {
-        chatStateStore.updateProp(chatId, "invitedUsers", (b) => new Set([...b, ...userIds]));
+    private inviteUsersLocally(
+        id: MultiUserChatIdentifier | CommunityIdentifier,
+        userIds: string[],
+    ): void {
+        if (id.kind === "community") {
+            communityStateStore.updateProp(id, "invitedUsers", (b) => new Set([...b, ...userIds]));
+        } else {
+            chatStateStore.updateProp(id, "invitedUsers", (b) => new Set([...b, ...userIds]));
+        }
     }
 
-    private uninviteUsersLocally(chatId: ChatIdentifier, userIds: string[]): void {
-        chatStateStore.updateProp(chatId, "invitedUsers", (b) => {
-            return new Set([...b].filter((u) => !userIds.includes(u)));
-        });
+    private uninviteUsersLocally(
+        id: MultiUserChatIdentifier | CommunityIdentifier,
+        userIds: string[],
+    ): void {
+        if (id.kind === "community") {
+            communityStateStore.updateProp(id, "invitedUsers", (b) => {
+                return new Set([...b].filter((u) => !userIds.includes(u)));
+            });
+
+            const community = this._liveState.communities.get({
+                kind: "community",
+                communityId: id.communityId,
+            });
+
+            if (community !== undefined) {
+                for (const channel of community.channels) {
+                    this.uninviteUsersLocally(channel.id, userIds);
+                }
+            }
+        } else {
+            chatStateStore.updateProp(id, "invitedUsers", (b) => {
+                return new Set([...b].filter((u) => !userIds.includes(u)));
+            });
+        }
     }
 
-    inviteUsers(chatId: MultiUserChatIdentifier, userIds: string[]): Promise<InviteUsersResponse> {
-        this.inviteUsersLocally(chatId, userIds);
+    inviteUsers(
+        id: MultiUserChatIdentifier | CommunityIdentifier,
+        userIds: string[],
+    ): Promise<boolean> {
+        this.inviteUsersLocally(id, userIds);
         return this.sendRequest({
             kind: "inviteUsers",
-            chatId,
+            id,
             userIds,
             callerUsername: this._liveState.user.username,
         })
             .then((resp) => {
-                if (resp !== "success") {
-                    this.uninviteUsersLocally(chatId, userIds);
+                if (!resp) {
+                    this.uninviteUsersLocally(id, userIds);
                 }
                 return resp;
             })
             .catch(() => {
-                this.uninviteUsersLocally(chatId, userIds);
-                return "failure";
+                this.uninviteUsersLocally(id, userIds);
+                return false;
+            });
+    }
+
+    cancelInvites(
+        id: MultiUserChatIdentifier | CommunityIdentifier,
+        userIds: string[],
+    ): Promise<boolean> {
+        this.uninviteUsersLocally(id, userIds);
+        return this.sendRequest({
+            kind: "cancelInvites",
+            id,
+            userIds,
+        })
+            .then((resp) => {
+                if (!resp) {
+                    this.inviteUsersLocally(id, userIds);
+                }
+                return resp;
+            })
+            .catch(() => {
+                this.inviteUsersLocally(id, userIds);
+                return false;
             });
     }
 
@@ -4670,39 +4721,6 @@ export class OpenChat extends OpenChatAgentWorker {
         });
     }
 
-    private inviteUsersToCommunityLocally(id: CommunityIdentifier, userIds: string[]): void {
-        communityStateStore.updateProp(id, "invitedUsers", (b) => new Set([...b, ...userIds]));
-    }
-
-    private uninviteUsersToCommunityLocally(id: CommunityIdentifier, userIds: string[]): void {
-        communityStateStore.updateProp(id, "invitedUsers", (b) => {
-            return new Set([...b].filter((u) => !userIds.includes(u)));
-        });
-    }
-
-    inviteUsersToCommunity(
-        id: CommunityIdentifier,
-        userIds: string[],
-    ): Promise<InviteUsersResponse> {
-        this.inviteUsersToCommunityLocally(id, userIds);
-        return this.sendRequest({
-            kind: "inviteUsersToCommunity",
-            id,
-            userIds,
-            callerUsername: this._liveState.user.username,
-        })
-            .then((resp) => {
-                if (resp !== "success") {
-                    this.uninviteUsersToCommunityLocally(id, userIds);
-                }
-                return resp;
-            })
-            .catch(() => {
-                this.uninviteUsersToCommunityLocally(id, userIds);
-                return "failure";
-            });
-    }
-
     removeCommunityMember(id: CommunityIdentifier, userId: string): Promise<RemoveMemberResponse> {
         communityStateStore.updateProp(id, "members", (ms) => {
             ms.delete(userId);
diff --git a/frontend/openchat-shared/src/domain/chat/chat.ts b/frontend/openchat-shared/src/domain/chat/chat.ts
index fe32b005f3..3c281519b3 100644
--- a/frontend/openchat-shared/src/domain/chat/chat.ts
+++ b/frontend/openchat-shared/src/domain/chat/chat.ts
@@ -1895,8 +1895,6 @@ export type SuccessJoinedCommunity = {
     community: CommunitySummary;
 };
 
-export type InviteUsersResponse = "success" | "failure";
-
 export type MarkReadRequest = {
     readUpTo: number | undefined;
     chatId: ChatIdentifier;
diff --git a/frontend/openchat-shared/src/domain/worker.ts b/frontend/openchat-shared/src/domain/worker.ts
index 1048f37344..e470908f38 100644
--- a/frontend/openchat-shared/src/domain/worker.ts
+++ b/frontend/openchat-shared/src/domain/worker.ts
@@ -46,7 +46,6 @@ import type {
     UpdateGroupResponse,
     UpdatesResult,
     WithdrawCryptocurrencyResponse,
-    InviteUsersResponse,
     ResetInviteCodeResponse,
     AddHotGroupExclusionResponse,
     RemoveHotGroupExclusionResponse,
@@ -214,7 +213,6 @@ export type WorkerRequest =
     | ChangeRole
     | RemoveMember
     | InviteUsers
-    | InviteUsersToCommunity
     | PushSub
     | RemoveSub
     | SubscriptionExists
@@ -397,7 +395,8 @@ export type WorkerRequest =
     | ConfigureWallet
     | ClearCachedData
     | SetCommunityReferral
-    | GetExternalAchievements;
+    | GetExternalAchievements
+    | CancelInvites;
 
 type GetExternalAchievements = {
     kind: "getExternalAchievements";
@@ -783,19 +782,12 @@ type RemoveMember = {
 };
 
 type InviteUsers = {
-    chatId: MultiUserChatIdentifier;
+    id: MultiUserChatIdentifier | CommunityIdentifier;
     userIds: string[];
     callerUsername: string;
     kind: "inviteUsers";
 };
 
-type InviteUsersToCommunity = {
-    id: CommunityIdentifier;
-    userIds: string[];
-    callerUsername: string;
-    kind: "inviteUsersToCommunity";
-};
-
 type RemoveSub = {
     subscription: PushSubscriptionJSON;
     kind: "removeSubscription";
@@ -1350,7 +1342,6 @@ export type WorkerResponseInner =
     | GroupChatSummary[]
     | RegisterProposalVoteResponse
     | ChangeRoleResponse
-    | InviteUsersResponse
     | RemoveMemberResponse
     | RegisterUserResponse
     | EditMessageResponse
@@ -1767,6 +1758,12 @@ type ChitLeaderboard = {
     kind: "chitLeaderboard";
 };
 
+type CancelInvites = {
+    kind: "cancelInvites";
+    id: MultiUserChatIdentifier | CommunityIdentifier;
+    userIds: string[];
+};
+
 export type ConnectToWorkerResponse = GetOpenChatIdentityResponse["kind"];
 
 // prettier-ignore
@@ -1883,9 +1880,7 @@ export type WorkerResult<T> = T extends Init
     : T extends RemoveSub
     ? void
     : T extends InviteUsers
-    ? InviteUsersResponse
-    : T extends InviteUsersToCommunity
-    ? InviteUsersResponse
+    ? boolean
     : T extends RemoveMember
     ? RemoveMemberResponse
     : T extends ChangeRole
@@ -2148,4 +2143,6 @@ export type WorkerResult<T> = T extends Init
     ? void
     : T extends GetExternalAchievements
     ? ExternalAchievement[]
+    : T extends CancelInvites
+    ? boolean
     : never;
diff --git a/frontend/openchat-worker/src/worker.ts b/frontend/openchat-worker/src/worker.ts
index 7c32539d1d..f12d9f44c3 100644
--- a/frontend/openchat-worker/src/worker.ts
+++ b/frontend/openchat-worker/src/worker.ts
@@ -727,19 +727,7 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 executeThenReply(
                     payload,
                     correlationId,
-                    agent.inviteUsers(payload.chatId, payload.userIds, payload.callerUsername),
-                );
-                break;
-
-            case "inviteUsersToCommunity":
-                executeThenReply(
-                    payload,
-                    correlationId,
-                    agent.inviteUsersToCommunity(
-                        payload.id,
-                        payload.userIds,
-                        payload.callerUsername,
-                    ),
+                    agent.inviteUsers(payload.id, payload.userIds, payload.callerUsername),
                 );
                 break;
 
@@ -1844,6 +1832,14 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 executeThenReply(payload, correlationId, agent.getExternalAchievements());
                 break;
 
+            case "cancelInvites":
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.cancelInvites(payload.id, payload.userIds),
+                );
+                break;
+
             default:
                 logger?.debug("WORKER: unknown message kind received: ", kind);
         }