From d8531f09a7bf9564deb9dd75726649e8fa2b8579 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:10:43 +0800
Subject: [PATCH 01/24] feat(api): add get groups query by type

---
 apps/api/src/app/groups/groups.controller.ts  | 11 +++++++++--
 .../api/src/app/groups/groups.service.test.ts | 19 +++++++++++++++++++
 apps/api/src/app/groups/groups.service.ts     | 10 +++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/app/groups/groups.controller.ts b/apps/api/src/app/groups/groups.controller.ts
index bf1bc24e..c7654253 100644
--- a/apps/api/src/app/groups/groups.controller.ts
+++ b/apps/api/src/app/groups/groups.controller.ts
@@ -31,6 +31,7 @@ import { UpdateGroupsDto } from "./dto/update-groups.dto"
 import { GroupsService } from "./groups.service"
 import { mapGroupToResponseDTO } from "./groups.utils"
 import { RemoveGroupsDto } from "./dto/remove-groups.dto"
+import { GroupType } from "./types"
 
 @ApiTags("groups")
 @Controller("groups")
@@ -40,13 +41,19 @@ export class GroupsController {
     @Get()
     @ApiQuery({ name: "adminId", required: false, type: String })
     @ApiQuery({ name: "memberId", required: false, type: String })
+    @ApiQuery({ name: "type", required: false, type: String })
     @ApiOperation({ description: "Returns the list of groups." })
     @ApiCreatedResponse({ type: Group, isArray: true })
     async getGroups(
         @Query("adminId") adminId: string,
-        @Query("memberId") memberId: string
+        @Query("memberId") memberId: string,
+        @Query("type") type: GroupType
     ) {
-        const groups = await this.groupsService.getGroups({ adminId, memberId })
+        const groups = await this.groupsService.getGroups({
+            adminId,
+            memberId,
+            type
+        })
         const groupIds = groups.map((group) => group.id)
         const fingerprints = await this.groupsService.getFingerprints(groupIds)
 
diff --git a/apps/api/src/app/groups/groups.service.test.ts b/apps/api/src/app/groups/groups.service.test.ts
index d3f6e07d..fafc0957 100644
--- a/apps/api/src/app/groups/groups.service.test.ts
+++ b/apps/api/src/app/groups/groups.service.test.ts
@@ -259,6 +259,25 @@ describe("GroupsService", () => {
 
             expect(result).toHaveLength(1)
         })
+
+        it("Should return a list of groups by group type", async () => {
+            await groupsService.createGroup(
+                {
+                    name: "OnChainGroup",
+                    description: "This is a description",
+                    type: "on-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
+                "admin02"
+            )
+
+            const result = await groupsService.getGroups({
+                type: "on-chain"
+            })
+
+            expect(result).toHaveLength(1)
+        })
     })
 
     describe("# getGroup", () => {
diff --git a/apps/api/src/app/groups/groups.service.ts b/apps/api/src/app/groups/groups.service.ts
index 72d2e264..581439a0 100644
--- a/apps/api/src/app/groups/groups.service.ts
+++ b/apps/api/src/app/groups/groups.service.ts
@@ -18,7 +18,7 @@ import { CreateGroupDto } from "./dto/create-group.dto"
 import { UpdateGroupDto } from "./dto/update-group.dto"
 import { Group } from "./entities/group.entity"
 import { Member } from "./entities/member.entity"
-import { MerkleProof } from "./types"
+import { GroupType, MerkleProof } from "./types"
 import { getAndCheckAdmin } from "../utils"
 
 @Injectable()
@@ -816,6 +816,7 @@ export class GroupsService {
     async getGroups(filters?: {
         adminId?: string
         memberId?: string
+        type?: GroupType
     }): Promise<Group[]> {
         let where = {}
 
@@ -834,6 +835,13 @@ export class GroupsService {
             }
         }
 
+        if (filters?.type) {
+            where = {
+                type: filters.type,
+                ...where
+            }
+        }
+
         return this.groupRepository.find({
             relations: { members: true },
             where,

From b4663fc2607e43a28b94fcd80c7d72ea80b6e3d7 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:13:17 +0800
Subject: [PATCH 02/24] feat(api): add getGroups filter by name

---
 apps/api/src/app/groups/groups.controller.ts   | 7 +++++--
 apps/api/src/app/groups/groups.service.test.ts | 8 ++++++++
 apps/api/src/app/groups/groups.service.ts      | 8 ++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/api/src/app/groups/groups.controller.ts b/apps/api/src/app/groups/groups.controller.ts
index c7654253..214d46f4 100644
--- a/apps/api/src/app/groups/groups.controller.ts
+++ b/apps/api/src/app/groups/groups.controller.ts
@@ -42,17 +42,20 @@ export class GroupsController {
     @ApiQuery({ name: "adminId", required: false, type: String })
     @ApiQuery({ name: "memberId", required: false, type: String })
     @ApiQuery({ name: "type", required: false, type: String })
+    @ApiQuery({ name: "name", required: false, type: String })
     @ApiOperation({ description: "Returns the list of groups." })
     @ApiCreatedResponse({ type: Group, isArray: true })
     async getGroups(
         @Query("adminId") adminId: string,
         @Query("memberId") memberId: string,
-        @Query("type") type: GroupType
+        @Query("type") type: GroupType,
+        @Query("name") name: string
     ) {
         const groups = await this.groupsService.getGroups({
             adminId,
             memberId,
-            type
+            type,
+            name
         })
         const groupIds = groups.map((group) => group.id)
         const fingerprints = await this.groupsService.getFingerprints(groupIds)
diff --git a/apps/api/src/app/groups/groups.service.test.ts b/apps/api/src/app/groups/groups.service.test.ts
index fafc0957..8d668675 100644
--- a/apps/api/src/app/groups/groups.service.test.ts
+++ b/apps/api/src/app/groups/groups.service.test.ts
@@ -278,6 +278,14 @@ describe("GroupsService", () => {
 
             expect(result).toHaveLength(1)
         })
+
+        it("Should return a list of groups by group name", async () => {
+            const result = await groupsService.getGroups({
+                name: "OnChainGroup"
+            })
+
+            expect(result).toHaveLength(1)
+        })
     })
 
     describe("# getGroup", () => {
diff --git a/apps/api/src/app/groups/groups.service.ts b/apps/api/src/app/groups/groups.service.ts
index 581439a0..b97656c5 100644
--- a/apps/api/src/app/groups/groups.service.ts
+++ b/apps/api/src/app/groups/groups.service.ts
@@ -817,6 +817,7 @@ export class GroupsService {
         adminId?: string
         memberId?: string
         type?: GroupType
+        name?: string
     }): Promise<Group[]> {
         let where = {}
 
@@ -842,6 +843,13 @@ export class GroupsService {
             }
         }
 
+        if (filters?.name) {
+            where = {
+                name: filters.name,
+                ...where
+            }
+        }
+
         return this.groupRepository.find({
             relations: { members: true },
             where,

From f059b6275461b322a412963a9107250e6c77531c Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:15:00 +0800
Subject: [PATCH 03/24] feat(dashboard): auto create associated group when
 creating on-chain group

---
 .../new-group-stepper/final-preview-step.tsx    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/apps/dashboard/src/components/new-group-stepper/final-preview-step.tsx b/apps/dashboard/src/components/new-group-stepper/final-preview-step.tsx
index 147df4b8..13e22d52 100644
--- a/apps/dashboard/src/components/new-group-stepper/final-preview-step.tsx
+++ b/apps/dashboard/src/components/new-group-stepper/final-preview-step.tsx
@@ -34,6 +34,23 @@ export default function FinalPreviewStep({
 
                 const groupId = groupIdBigNumber.toString()
 
+                const description = `This group is associated to the on-chain group ${groupId}`
+                const response = await bandadaAPI.createGroup(
+                    groupId,
+                    description,
+                    group.type,
+                    16,
+                    3600
+                )
+
+                if (response === null) {
+                    setLoading(false)
+                    alert(
+                        "Some error occured when creating the off-chain association group"
+                    )
+                    return
+                }
+
                 navigate(`/groups/on-chain/${groupId}`)
             } catch (error) {
                 setLoading(false)

From a32e31a27d845820cee7a64a1e5090f5648ecaf8 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:36:44 +0800
Subject: [PATCH 04/24] feat(dashboard): add getGroups filter by type; add
 getGroupByName

---
 apps/dashboard/src/api/bandadaAPI.ts | 33 +++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/apps/dashboard/src/api/bandadaAPI.ts b/apps/dashboard/src/api/bandadaAPI.ts
index 3ff2f726..9f96db60 100644
--- a/apps/dashboard/src/api/bandadaAPI.ts
+++ b/apps/dashboard/src/api/bandadaAPI.ts
@@ -40,17 +40,23 @@ export async function generateMagicLink(
  * @param adminId The admin id.
  * @returns The list of groups or null.
  */
-export async function getGroups(adminId?: string): Promise<Group[] | null> {
+export async function getGroups(
+    adminId?: string,
+    type?: GroupType
+): Promise<Group[] | null> {
     try {
-        const url = adminId
-            ? `${API_URL}/groups/?adminId=${adminId}`
-            : `${API_URL}/groups/`
+        const groupType = type || "off-chain"
+        let url = `${API_URL}/groups/?type=${groupType}`
+
+        if (adminId) {
+            url += `&?adminId=${adminId}`
+        }
 
         const groups = await request(url)
 
         return groups.map((group: Group) => ({
             ...group,
-            type: "off-chain"
+            type: groupType
         }))
     } catch (error: any) {
         console.error(error)
@@ -59,6 +65,21 @@ export async function getGroups(adminId?: string): Promise<Group[] | null> {
     }
 }
 
+/**
+ * It returns the list of groups by group name.
+ * @param name
+ * @returns The group details.
+ */
+export async function getGroupByName(name: string): Promise<Group[] | null> {
+    try {
+        return await request(`${API_URL}/groups/?name=${name}`)
+    } catch (error: any) {
+        console.error(error)
+        createAlert(error.response.data.message)
+        return null
+    }
+}
+
 /**
  * It returns details of a specific group.
  * @param groupId The group id.
@@ -109,7 +130,7 @@ export async function createGroup(
             ]
         })
 
-        return { ...groups.at(0), type: "off-chain" }
+        return { ...groups.at(0) }
     } catch (error: any) {
         console.error(error)
         createAlert(error.response.data.message)

From 61f069b9b875dae9734a755f05f824213753b248 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:37:54 +0800
Subject: [PATCH 05/24] feat(dashboard): add getAssociatedGroup for dashboard

---
 apps/dashboard/src/api/semaphoreAPI.ts | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/apps/dashboard/src/api/semaphoreAPI.ts b/apps/dashboard/src/api/semaphoreAPI.ts
index 3409fca8..b87eb233 100644
--- a/apps/dashboard/src/api/semaphoreAPI.ts
+++ b/apps/dashboard/src/api/semaphoreAPI.ts
@@ -1,6 +1,7 @@
 import { SemaphoreSubgraph } from "@semaphore-protocol/data"
 import { Group } from "../types"
 import parseGroupName from "../utils/parseGroupName"
+import { getGroupByName } from "./bandadaAPI"
 
 const ETHEREUM_NETWORK = import.meta.env.VITE_ETHEREUM_NETWORK
 
@@ -63,3 +64,49 @@ export async function getGroup(groupId: string): Promise<Group | null> {
         return null
     }
 }
+
+/**
+ * It returns the details of a specific on-chain group together with the associated off-chain group details.
+ * @param groupId
+ * @returns The group details.
+ */
+export async function getAssociatedGroup(
+    groupId: string
+): Promise<Group | null> {
+    try {
+        const group = await subgraph.getGroup(groupId, {
+            members: true
+        })
+
+        const bandadaGroup = await getGroupByName(group.id)
+
+        if (bandadaGroup && bandadaGroup.length > 0) {
+            const members = group.members as string[]
+            members.push(...bandadaGroup[0].members)
+
+            return {
+                id: group.id,
+                name: parseGroupName(group.id),
+                treeDepth: group.merkleTree.depth,
+                fingerprintDuration: 3600,
+                members,
+                admin: group.admin as string,
+                type: "on-chain"
+            }
+        }
+
+        return {
+            id: group.id,
+            name: parseGroupName(group.id),
+            treeDepth: group.merkleTree.depth,
+            fingerprintDuration: 3600,
+            members: group.members as string[],
+            admin: group.admin as string,
+            type: "on-chain"
+        }
+    } catch (error) {
+        console.error(error)
+
+        return null
+    }
+}

From d7b03e264b8a6765a013f2655296453c910399d5 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:38:45 +0800
Subject: [PATCH 06/24] feat(dashboard): enable generateInviteLink to on-chain
 groups

---
 .../src/components/add-member-modal.tsx       | 124 ++++++++++--------
 1 file changed, 67 insertions(+), 57 deletions(-)

diff --git a/apps/dashboard/src/components/add-member-modal.tsx b/apps/dashboard/src/components/add-member-modal.tsx
index 6fd5ed9a..4ae18fc8 100644
--- a/apps/dashboard/src/components/add-member-modal.tsx
+++ b/apps/dashboard/src/components/add-member-modal.tsx
@@ -147,7 +147,21 @@ ${memberIds.join("\n")}
     }, [onClose, _memberIds, group, signer])
 
     const generateInviteLink = useCallback(async () => {
-        const inviteLink = await bandadaAPI.generateMagicLink(group.id)
+        let inviteLink = null
+
+        if (group.type === "off-chain") {
+            inviteLink = await bandadaAPI.generateMagicLink(group.id)
+        } else {
+            const associatedGroup = await bandadaAPI.getGroupByName(group.name)
+
+            if (associatedGroup && associatedGroup.length > 0) {
+                inviteLink = await bandadaAPI.generateMagicLink(
+                    associatedGroup[0].id
+                )
+            } else {
+                alert("No associated on-chain group found")
+            }
+        }
 
         if (inviteLink === null) {
             return
@@ -212,63 +226,59 @@ ${memberIds.join("\n")}
                         </Box>
                     )}
 
-                    {group.type === "off-chain" && (
-                        <Box mb="30px">
-                            <Text mb="10px" color="balticSea.800">
-                                {!group.credentials
-                                    ? "Share invite link"
-                                    : "Share access link"}
-                            </Text>
-
-                            <InputGroup size="lg">
-                                <Input
-                                    pr="50px"
-                                    placeholder={
-                                        !group.credentials
-                                            ? "Invite link"
-                                            : "Access link"
-                                    }
-                                    value={_clientLink}
-                                    isDisabled
-                                />
-                                <InputRightElement mr="5px">
-                                    <Tooltip
-                                        label={hasCopied ? "Copied!" : "Copy"}
-                                        closeOnClick={false}
-                                        hasArrow
-                                    >
-                                        <IconButton
-                                            variant="link"
-                                            aria-label="Copy invite link"
-                                            onClick={onCopy}
-                                            onMouseDown={(e) =>
-                                                e.preventDefault()
-                                            }
-                                            icon={
-                                                <Icon
-                                                    color="sunsetOrange.600"
-                                                    boxSize="5"
-                                                    as={FiCopy}
-                                                />
-                                            }
-                                        />
-                                    </Tooltip>
-                                </InputRightElement>
-                            </InputGroup>
-
-                            {!group.credentials && (
-                                <Button
-                                    mt="10px"
-                                    variant="link"
-                                    color="balticSea.600"
-                                    textDecoration="underline"
-                                    onClick={generateInviteLink}
+                    <Box mb="30px">
+                        <Text mb="10px" color="balticSea.800">
+                            {!group.credentials
+                                ? "Share invite link"
+                                : "Share access link"}
+                        </Text>
+
+                        <InputGroup size="lg">
+                            <Input
+                                pr="50px"
+                                placeholder={
+                                    !group.credentials
+                                        ? "Invite link"
+                                        : "Access link"
+                                }
+                                value={_clientLink}
+                                isDisabled
+                            />
+                            <InputRightElement mr="5px">
+                                <Tooltip
+                                    label={hasCopied ? "Copied!" : "Copy"}
+                                    closeOnClick={false}
+                                    hasArrow
                                 >
-                                    Generate new link
-                                </Button>
-                            )}
-                        </Box>
-                    )}
+                                    <IconButton
+                                        variant="link"
+                                        aria-label="Copy invite link"
+                                        onClick={onCopy}
+                                        onMouseDown={(e) => e.preventDefault()}
+                                        icon={
+                                            <Icon
+                                                color="sunsetOrange.600"
+                                                boxSize="5"
+                                                as={FiCopy}
+                                            />
+                                        }
+                                    />
+                                </Tooltip>
+                            </InputRightElement>
+                        </InputGroup>
+
+                        {!group.credentials && (
+                            <Button
+                                mt="10px"
+                                variant="link"
+                                color="balticSea.600"
+                                textDecoration="underline"
+                                onClick={generateInviteLink}
+                            >
+                                Generate new link
+                            </Button>
+                        )}
+                    </Box>
 
                     <Button
                         width="100%"

From 033d585c04b289f847b07568b271106a894ccf88 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:47:13 +0800
Subject: [PATCH 07/24] refactor(dashboard): refactor getAssociatedGroup

---
 apps/dashboard/src/api/semaphoreAPI.ts | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/apps/dashboard/src/api/semaphoreAPI.ts b/apps/dashboard/src/api/semaphoreAPI.ts
index b87eb233..a6ea7121 100644
--- a/apps/dashboard/src/api/semaphoreAPI.ts
+++ b/apps/dashboard/src/api/semaphoreAPI.ts
@@ -78,21 +78,11 @@ export async function getAssociatedGroup(
             members: true
         })
 
+        const members = group.members as string[]
         const bandadaGroup = await getGroupByName(group.id)
 
         if (bandadaGroup && bandadaGroup.length > 0) {
-            const members = group.members as string[]
             members.push(...bandadaGroup[0].members)
-
-            return {
-                id: group.id,
-                name: parseGroupName(group.id),
-                treeDepth: group.merkleTree.depth,
-                fingerprintDuration: 3600,
-                members,
-                admin: group.admin as string,
-                type: "on-chain"
-            }
         }
 
         return {
@@ -100,7 +90,7 @@ export async function getAssociatedGroup(
             name: parseGroupName(group.id),
             treeDepth: group.merkleTree.depth,
             fingerprintDuration: 3600,
-            members: group.members as string[],
+            members,
             admin: group.admin as string,
             type: "on-chain"
         }

From ebdd85db48db938c85e4c4e7808dcca55dca8ab5 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:55:18 +0800
Subject: [PATCH 08/24] feat(dashboard): add remove on-chain/associated group
 member

---
 apps/dashboard/src/pages/group.tsx | 67 ++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx
index 9eaafc80..2b706c37 100644
--- a/apps/dashboard/src/pages/group.tsx
+++ b/apps/dashboard/src/pages/group.tsx
@@ -39,7 +39,7 @@ import { useSigner } from "wagmi"
 import { getSemaphoreContract } from "@bandada/utils"
 import { Group as Semaphorev4Group } from "@semaphore-protocol/core"
 import * as bandadaApi from "../api/bandadaAPI"
-import { getGroup as getOnchainGroup } from "../api/semaphoreAPI"
+import * as semaphoreApi from "../api/semaphoreAPI"
 import image1 from "../assets/image1.svg"
 import AddMemberModal from "../components/add-member-modal"
 import { Group } from "../types"
@@ -75,7 +75,7 @@ export default function GroupPage(): JSX.Element {
             if (groupId) {
                 const group =
                     groupType === "on-chain"
-                        ? await getOnchainGroup(groupId)
+                        ? await semaphoreApi.getAssociatedGroup(groupId)
                         : await bandadaApi.getGroup(groupId)
 
                 if (group === null) {
@@ -161,32 +161,55 @@ export default function GroupPage(): JSX.Element {
                     return
                 }
 
-                try {
-                    const semaphore = getSemaphoreContract(
-                        "sepolia",
-                        signer as any
-                    )
+                const semaphoreGroup = await semaphoreApi.getGroup(_group!.id)
 
-                    const semaphorev4Group = new Semaphorev4Group(
-                        _group!.members
-                    )
+                if (
+                    semaphoreGroup &&
+                    semaphoreGroup.members.includes(memberId)
+                ) {
+                    try {
+                        const semaphore = getSemaphoreContract(
+                            "sepolia",
+                            signer as any
+                        )
 
-                    const index = semaphorev4Group.indexOf(memberId)
+                        const semaphorev4Group = new Semaphorev4Group(
+                            _group!.members
+                        )
 
-                    const merkleProof =
-                        semaphorev4Group.generateMerkleProof(index)
+                        const index = semaphorev4Group.indexOf(memberId)
 
-                    await semaphore.removeMember(
-                        _group!.id,
-                        memberId,
-                        merkleProof.siblings
-                    )
-                } catch (error) {
-                    alert(
-                        "Some error occurred! Check if you're on Sepolia network and the transaction is signed and completed"
+                        const merkleProof =
+                            semaphorev4Group.generateMerkleProof(index)
+
+                        await semaphore.removeMember(
+                            _group!.id,
+                            memberId,
+                            merkleProof.siblings
+                        )
+                    } catch (error) {
+                        alert(
+                            "Some error occurred! Check if you're on Sepolia network and the transaction is signed and completed"
+                        )
+                        return
+                    }
+                }
+
+                const associatedGroup = await bandadaApi.getGroupByName(
+                    _group!.name
+                )
+
+                if (
+                    associatedGroup &&
+                    associatedGroup.length > 0 &&
+                    associatedGroup[0].members.includes(memberId)
+                ) {
+                    await bandadaApi.removeMember(
+                        associatedGroup[0].id,
+                        memberId
                     )
-                    return
                 }
+
                 _group!.members = _group!.members.map((m) =>
                     m !== memberId ? m : "0"
                 )

From 0f61e1444e4ca3062def0227ea97b97c78c6a733 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:25:40 +0800
Subject: [PATCH 09/24] feat(dashboard): add group type to getGroupByName

---
 apps/dashboard/src/api/bandadaAPI.ts               | 11 +++++++++--
 apps/dashboard/src/api/semaphoreAPI.ts             |  2 +-
 apps/dashboard/src/components/add-member-modal.tsx |  5 ++++-
 apps/dashboard/src/pages/group.tsx                 |  3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/dashboard/src/api/bandadaAPI.ts b/apps/dashboard/src/api/bandadaAPI.ts
index 9f96db60..22ab216a 100644
--- a/apps/dashboard/src/api/bandadaAPI.ts
+++ b/apps/dashboard/src/api/bandadaAPI.ts
@@ -70,9 +70,16 @@ export async function getGroups(
  * @param name
  * @returns The group details.
  */
-export async function getGroupByName(name: string): Promise<Group[] | null> {
+export async function getGroupByName(
+    name: string,
+    type?: GroupType
+): Promise<Group[] | null> {
     try {
-        return await request(`${API_URL}/groups/?name=${name}`)
+        const groupType = type || "off-chain"
+
+        return await request(
+            `${API_URL}/groups/?name=${name}&?type=${groupType}`
+        )
     } catch (error: any) {
         console.error(error)
         createAlert(error.response.data.message)
diff --git a/apps/dashboard/src/api/semaphoreAPI.ts b/apps/dashboard/src/api/semaphoreAPI.ts
index a6ea7121..6ea01323 100644
--- a/apps/dashboard/src/api/semaphoreAPI.ts
+++ b/apps/dashboard/src/api/semaphoreAPI.ts
@@ -79,7 +79,7 @@ export async function getAssociatedGroup(
         })
 
         const members = group.members as string[]
-        const bandadaGroup = await getGroupByName(group.id)
+        const bandadaGroup = await getGroupByName(group.id, "on-chain")
 
         if (bandadaGroup && bandadaGroup.length > 0) {
             members.push(...bandadaGroup[0].members)
diff --git a/apps/dashboard/src/components/add-member-modal.tsx b/apps/dashboard/src/components/add-member-modal.tsx
index 4ae18fc8..fffb415c 100644
--- a/apps/dashboard/src/components/add-member-modal.tsx
+++ b/apps/dashboard/src/components/add-member-modal.tsx
@@ -152,7 +152,10 @@ ${memberIds.join("\n")}
         if (group.type === "off-chain") {
             inviteLink = await bandadaAPI.generateMagicLink(group.id)
         } else {
-            const associatedGroup = await bandadaAPI.getGroupByName(group.name)
+            const associatedGroup = await bandadaAPI.getGroupByName(
+                group.name,
+                "on-chain"
+            )
 
             if (associatedGroup && associatedGroup.length > 0) {
                 inviteLink = await bandadaAPI.generateMagicLink(
diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx
index 2b706c37..7c69868a 100644
--- a/apps/dashboard/src/pages/group.tsx
+++ b/apps/dashboard/src/pages/group.tsx
@@ -196,7 +196,8 @@ export default function GroupPage(): JSX.Element {
                 }
 
                 const associatedGroup = await bandadaApi.getGroupByName(
-                    _group!.name
+                    _group!.name,
+                    "on-chain"
                 )
 
                 if (

From f29b4b92bee866ba4e5cde518ea35b8786026fed Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:49:19 +0800
Subject: [PATCH 10/24] test(api,api-sdk): fix test

---
 apps/api/src/app/groups/groups.service.test.ts | 1 +
 libs/api-sdk/src/index.test.ts                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/api/src/app/groups/groups.service.test.ts b/apps/api/src/app/groups/groups.service.test.ts
index 19d41f8b..70219b23 100644
--- a/apps/api/src/app/groups/groups.service.test.ts
+++ b/apps/api/src/app/groups/groups.service.test.ts
@@ -100,6 +100,7 @@ describe("GroupsService", () => {
                 {
                     name: "Group3",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 15,
                     fingerprintDuration: 3600
                 },
diff --git a/libs/api-sdk/src/index.test.ts b/libs/api-sdk/src/index.test.ts
index fd9a8424..d20cc178 100644
--- a/libs/api-sdk/src/index.test.ts
+++ b/libs/api-sdk/src/index.test.ts
@@ -325,6 +325,7 @@ describe("Bandada API SDK", () => {
                     {
                         name: "Group3",
                         description: "This is a new group",
+                        type: "off-chain",
                         treeDepth: 15,
                         fingerprintDuration: 3600
                     }

From 916e3f4b8d0b59cf5fe4e05ef952c65056504210 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:29:04 +0800
Subject: [PATCH 11/24] feat(api-sdk): add get groups by type, name, and
 associated groups

---
 libs/api-sdk/src/apiSdk.ts     |  41 ++++++++-
 libs/api-sdk/src/groups.ts     |  96 +++++++++++++++++++-
 libs/api-sdk/src/index.test.ts | 155 +++++++++++++++++++++++++++++++++
 3 files changed, 289 insertions(+), 3 deletions(-)

diff --git a/libs/api-sdk/src/apiSdk.ts b/libs/api-sdk/src/apiSdk.ts
index 18f7975b..00ae4e88 100644
--- a/libs/api-sdk/src/apiSdk.ts
+++ b/libs/api-sdk/src/apiSdk.ts
@@ -4,7 +4,8 @@ import {
     Invite,
     GroupCreationDetails,
     GroupUpdateDetails,
-    DashboardUrl
+    DashboardUrl,
+    GroupType
 } from "./types"
 import checkParameter from "./checkParameter"
 import {
@@ -24,7 +25,10 @@ import {
     removeMembersByApiKey,
     getGroupsByAdminId,
     getGroupsByMemberId,
-    getCredentialGroupJoinUrl
+    getCredentialGroupJoinUrl,
+    getAssociatedGroups,
+    getGroupsByName,
+    getGroupsByType
 } from "./groups"
 import { createInvite, getInvite } from "./invites"
 
@@ -111,6 +115,39 @@ export default class ApiSdk {
         return groups
     }
 
+    /**
+     * Returns the list of groups by type.
+     * @param type "onchain" or "offchain".
+     * @returns List of groups by type.
+     */
+    async getGroupsByType(type: GroupType): Promise<Group[]> {
+        const groups = await getGroupsByType(this._config, type)
+
+        return groups
+    }
+
+    /**
+     * Returns the list of groups by name.
+     * @param name Group name.
+     * @returns List of groups by name.
+     */
+    async getGroupsByName(name: string): Promise<Group[]> {
+        const groups = await getGroupsByName(this._config, name)
+
+        return groups
+    }
+
+    /**
+     * Returns the list of associated groups.
+     * @param name Group name.
+     * @returns List of associated groups.
+     */
+    async getAssociatedGroups(name: string): Promise<Group[]> {
+        const groups = await getAssociatedGroups(this._config, name)
+
+        return groups
+    }
+
     /**
      * Creates a group using the API key.
      * @param groupCreationDetails Data to create the group.
diff --git a/libs/api-sdk/src/groups.ts b/libs/api-sdk/src/groups.ts
index 9efafea3..6575a0f1 100644
--- a/libs/api-sdk/src/groups.ts
+++ b/libs/api-sdk/src/groups.ts
@@ -3,7 +3,8 @@ import type {
     GroupCreationDetails,
     Group,
     GroupUpdateDetails,
-    DashboardUrl
+    DashboardUrl,
+    GroupType
 } from "./types"
 
 const url = "/groups"
@@ -95,6 +96,99 @@ export async function getGroupsByMemberId(
     return groups
 }
 
+/**
+ * Returns the list of groups by type.
+ * @param type "on-chain" or "off-chain".
+ * @returns List of groups by type.
+ */
+export async function getGroupsByType(
+    config: object,
+    type: GroupType
+): Promise<Group[]> {
+    const requestUrl = `${url}?type=${type}`
+
+    let groups = await request(requestUrl, config)
+
+    groups = groups.map((group: any) => {
+        let credentials
+
+        try {
+            credentials = JSON.parse(group.credentials)
+        } catch (error) {
+            credentials = null
+        }
+
+        return {
+            ...group,
+            credentials
+        }
+    })
+
+    return groups
+}
+
+/**
+ * Returns the list of groups by name.
+ * @param name Group name.
+ * @returns List of groups by name.
+ */
+export async function getGroupsByName(
+    config: object,
+    name: string
+): Promise<Group[]> {
+    const requestUrl = `${url}?name=${name}`
+
+    let groups = await request(requestUrl, config)
+
+    groups = groups.map((group: any) => {
+        let credentials
+
+        try {
+            credentials = JSON.parse(group.credentials)
+        } catch (error) {
+            credentials = null
+        }
+
+        return {
+            ...group,
+            credentials
+        }
+    })
+
+    return groups
+}
+
+/**
+ * Returns the list of associated groups.
+ * @param name Group name.
+ * @returns List of associated groups.
+ */
+export async function getAssociatedGroups(
+    config: object,
+    name: string
+): Promise<Group[]> {
+    const requestUrl = `${url}?name=${name}&?type=on-chain`
+
+    let groups = await request(requestUrl, config)
+
+    groups = groups.map((group: any) => {
+        let credentials
+
+        try {
+            credentials = JSON.parse(group.credentials)
+        } catch (error) {
+            credentials = null
+        }
+
+        return {
+            ...group,
+            credentials
+        }
+    })
+
+    return groups
+}
+
 /**
  * Creates one or more groups with the provided details.
  * @param groupsCreationDetails Data to create the groups.
diff --git a/libs/api-sdk/src/index.test.ts b/libs/api-sdk/src/index.test.ts
index d20cc178..e3376170 100644
--- a/libs/api-sdk/src/index.test.ts
+++ b/libs/api-sdk/src/index.test.ts
@@ -629,6 +629,161 @@ describe("Bandada API SDK", () => {
                 expect(groups[0].credentials).toBeNull()
             })
         })
+        describe("#getGroupsByType", () => {
+            it("Should return all groups by type", async () => {
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: "Group1",
+                            description: "This is a new group",
+                            type: "off-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: ["1"],
+                            credentials: null
+                        }
+                    ])
+                )
+
+                const type = "off-chain"
+
+                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const groups: Group[] = await apiSdk.getGroupsByType(type)
+                expect(groups).toHaveLength(1)
+            })
+            it("Should return all groups by type and null in the credentials that don't have a valid JSON string", async () => {
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: "Group1",
+                            description: "This is a new group",
+                            type: "off-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: ["1"],
+                            credentials: {}
+                        }
+                    ])
+                )
+
+                const type = "off-chain"
+
+                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const groups: Group[] = await apiSdk.getGroupsByType(type)
+                expect(groups).toHaveLength(1)
+                expect(groups[0].credentials).toBeNull()
+            })
+        })
+        describe("#getGroupsByName", () => {
+            it("Should return all groups by name", async () => {
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: "Group1",
+                            description: "This is a new group",
+                            type: "off-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: ["1"],
+                            credentials: null
+                        }
+                    ])
+                )
+
+                const name = "Group1"
+
+                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const groups: Group[] = await apiSdk.getGroupsByName(name)
+                expect(groups).toHaveLength(1)
+            })
+            it("Should return all groups by name and null in the credentials that don't have a valid JSON string", async () => {
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: "Group1",
+                            description: "This is a new group",
+                            type: "off-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: ["1"],
+                            credentials: {}
+                        }
+                    ])
+                )
+
+                const name = "Group1"
+
+                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const groups: Group[] = await apiSdk.getGroupsByName(name)
+                expect(groups).toHaveLength(1)
+                expect(groups[0].credentials).toBeNull()
+            })
+        })
+        describe("#getAssociatedGroups", () => {
+            it("Should return all the associated groups", async () => {
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: "Group1",
+                            description: "This is a new group",
+                            type: "on-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: ["1"],
+                            credentials: null
+                        }
+                    ])
+                )
+
+                const name = "Group1"
+
+                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const groups: Group[] = await apiSdk.getAssociatedGroups(name)
+                expect(groups).toHaveLength(1)
+                expect(groups[0].type).toBe("on-chain")
+            })
+            it("Should return all the associated groups and null in the credentials that don't have a valid JSON string", async () => {
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: "Group1",
+                            description: "This is a new group",
+                            type: "on-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: ["1"],
+                            credentials: {}
+                        }
+                    ])
+                )
+
+                const name = "Group1"
+
+                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const groups: Group[] = await apiSdk.getAssociatedGroups(name)
+                expect(groups).toHaveLength(1)
+                expect(groups[0].type).toBe("on-chain")
+                expect(groups[0].credentials).toBeNull()
+            })
+        })
         describe("#getGroup", () => {
             it("Should return a group", async () => {
                 requestMocked.mockImplementationOnce(() =>

From 78b92e17658ad40c89a28662d0f069fe18ffe40d Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:29:48 +0800
Subject: [PATCH 12/24] docs(api-sdk): update docs for new api-sdk

---
 libs/api-sdk/README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/libs/api-sdk/README.md b/libs/api-sdk/README.md
index bc860d53..063e5836 100644
--- a/libs/api-sdk/README.md
+++ b/libs/api-sdk/README.md
@@ -350,6 +350,39 @@ const memberId = "1"
 const groups = await apiSdk.getGroupsByMemberId(memberId)
 ```
 
+## Get groups by type
+
+\# **getGroupsByType**(): _Promise\<Group[]>_
+
+Returns the list of groups by type.
+
+```ts
+const type = "off-chain"
+const groups = await apiSdk.getGroupsByType(type)
+```
+
+## Get groups by name
+
+\# **getGroupsByName**(): _Promise\<Group[]>_
+
+Returns the list of groups by name.
+
+```ts
+const name = "Group1"
+const groups = await apiSdk.getGroupsByName(name)
+```
+
+## Get associated groups
+
+\# **getAssociatedGroups**(): _Promise\<Group[]>_
+
+Returns the list of associated groups.
+
+```ts
+const name = "Group1"
+const groups = await apiSdk.getAssociatedGroups(name)
+```
+
 ## Is group member
 
 \# **isGroupMember**(): _Promise\<boolean>_

From 2e98c2dfdec12331b58c16b5f3dc80f20f50350f Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Mon, 28 Oct 2024 16:36:59 +0800
Subject: [PATCH 13/24] test(api-sdk): fix test to match new apisdk constant

---
 libs/api-sdk/src/index.test.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/api-sdk/src/index.test.ts b/libs/api-sdk/src/index.test.ts
index 67cfc173..ac8f4174 100644
--- a/libs/api-sdk/src/index.test.ts
+++ b/libs/api-sdk/src/index.test.ts
@@ -645,7 +645,7 @@ describe("Bandada API SDK", () => {
 
                 const type = "off-chain"
 
-                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
                 const groups: Group[] = await apiSdk.getGroupsByType(type)
                 expect(groups).toHaveLength(1)
             })
@@ -669,7 +669,7 @@ describe("Bandada API SDK", () => {
 
                 const type = "off-chain"
 
-                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
                 const groups: Group[] = await apiSdk.getGroupsByType(type)
                 expect(groups).toHaveLength(1)
                 expect(groups[0].credentials).toBeNull()
@@ -696,7 +696,7 @@ describe("Bandada API SDK", () => {
 
                 const name = "Group1"
 
-                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
                 const groups: Group[] = await apiSdk.getGroupsByName(name)
                 expect(groups).toHaveLength(1)
             })
@@ -720,7 +720,7 @@ describe("Bandada API SDK", () => {
 
                 const name = "Group1"
 
-                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
                 const groups: Group[] = await apiSdk.getGroupsByName(name)
                 expect(groups).toHaveLength(1)
                 expect(groups[0].credentials).toBeNull()
@@ -747,7 +747,7 @@ describe("Bandada API SDK", () => {
 
                 const name = "Group1"
 
-                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
                 const groups: Group[] = await apiSdk.getAssociatedGroups(name)
                 expect(groups).toHaveLength(1)
                 expect(groups[0].type).toBe("on-chain")
@@ -772,7 +772,7 @@ describe("Bandada API SDK", () => {
 
                 const name = "Group1"
 
-                apiSdk = new ApiSdk(SupportedUrl.DEV)
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
                 const groups: Group[] = await apiSdk.getAssociatedGroups(name)
                 expect(groups).toHaveLength(1)
                 expect(groups[0].type).toBe("on-chain")

From 0fa239de7590b62b2c712273ddbd0e9169e495ee Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:09:13 +0800
Subject: [PATCH 14/24] feat(api-sdk): add create associated group

---
 libs/api-sdk/README.md         | 14 ++++++++++++++
 libs/api-sdk/src/apiSdk.ts     | 18 +++++++++++++++++-
 libs/api-sdk/src/groups.ts     | 32 ++++++++++++++++++++++++++++++++
 libs/api-sdk/src/index.test.ts | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/libs/api-sdk/README.md b/libs/api-sdk/README.md
index 063e5836..e6f6aa1c 100644
--- a/libs/api-sdk/README.md
+++ b/libs/api-sdk/README.md
@@ -202,6 +202,20 @@ const apiKey = "70f07d0d-6aa2-4fe1-b4b9-06c271a641dc"
 const group = await apiSdk.createGroup(groupCreateDetails, apiKey)
 ```
 
+## Create associated group
+
+\# **createAssociatedGroup**(): _Promise\<Group>_
+
+Creates an associated group to an on-chain group.
+
+```ts
+const onchainGroupId = "1"
+const apiKey = "70f07d0d-6aa2-4fe1-b4b9-06c271a641dc"
+
+const associatedGroup = await apiSdk.createAssociatedGroup(onchainGroupId, apiKey)
+```
+
+
 ## Create groups
 
 \# **createGroups**(): _Promise\<Group[]>_
diff --git a/libs/api-sdk/src/apiSdk.ts b/libs/api-sdk/src/apiSdk.ts
index 00ae4e88..a18ba4ff 100644
--- a/libs/api-sdk/src/apiSdk.ts
+++ b/libs/api-sdk/src/apiSdk.ts
@@ -28,7 +28,8 @@ import {
     getCredentialGroupJoinUrl,
     getAssociatedGroups,
     getGroupsByName,
-    getGroupsByType
+    getGroupsByType,
+    createAssociatedGroup
 } from "./groups"
 import { createInvite, getInvite } from "./invites"
 
@@ -199,6 +200,21 @@ export default class ApiSdk {
         return groups
     }
 
+    /**
+     * Creates an associated group to an on-chain group using the API key.
+     * @param groupId The group id of the on-chain group.
+     * @param apiKey The API key of the admin of the group.
+     * @returns The created associated group.
+     */
+    async createAssociatedGroup(
+        groupId: string,
+        apiKey: string
+    ): Promise<Group> {
+        const group = await createAssociatedGroup(this._config, groupId, apiKey)
+
+        return group[0]
+    }
+
     /**
      * Removes a group using the API key.
      * @param groupId The group id.
diff --git a/libs/api-sdk/src/groups.ts b/libs/api-sdk/src/groups.ts
index 6575a0f1..b0be1631 100644
--- a/libs/api-sdk/src/groups.ts
+++ b/libs/api-sdk/src/groups.ts
@@ -226,6 +226,38 @@ export async function createGroups(
     return req
 }
 
+/**
+ * Creates an associated group to an on-chain group.
+ * @param groupId The group id.
+ * @param apiKey API Key of the admin.
+ * @returns The created associated group.
+ */
+export async function createAssociatedGroup(
+    config: object,
+    groupId: string,
+    apiKey: string
+): Promise<Group> {
+    const groupCreationDetails = {
+        name: groupId,
+        description: `This group is associated to the on-chain group ${groupId}`,
+        type: "on-chain",
+        treeDepth: 16,
+        fingerprintDuration: 3600
+    }
+
+    const newConfig: any = {
+        method: "post",
+        data: groupCreationDetails,
+        ...config
+    }
+
+    newConfig.headers["x-api-key"] = apiKey
+
+    const req = await request(url, newConfig)
+
+    return req
+}
+
 /**
  * Removes the group.
  * @param groupId The group id.
diff --git a/libs/api-sdk/src/index.test.ts b/libs/api-sdk/src/index.test.ts
index ac8f4174..f48173f3 100644
--- a/libs/api-sdk/src/index.test.ts
+++ b/libs/api-sdk/src/index.test.ts
@@ -245,6 +245,39 @@ describe("Bandada API SDK", () => {
                     JSON.stringify(expectedGroup.credentials)
                 )
             })
+            it("Should create an associated group", async () => {
+                const groupId = "1"
+                const apiKey = "70f07d0d-6aa2-4fe1-b4b9-06c271a641dc"
+
+                requestMocked.mockImplementationOnce(() =>
+                    Promise.resolve([
+                        {
+                            id: "10402173435763029700781503965100",
+                            name: groupId,
+                            description: `This is an associated group to the on-chain group ${groupId}`,
+                            type: "on-chain",
+                            admin: "0xdf558148e66850ac48dbe2c8119b0eefa7d08bfd19c997c90a142eb97916b847",
+                            treeDepth: 16,
+                            fingerprintDuration: 3600,
+                            createdAt: "2023-07-15T08:21:05.000Z",
+                            members: [],
+                            credentials: null
+                        }
+                    ])
+                )
+
+                const apiSdk: ApiSdk = new ApiSdk(SupportedUrl.DEV)
+                const group: Group = await apiSdk.createAssociatedGroup(
+                    groupId,
+                    apiKey
+                )
+
+                expect(group.name).toBe(groupId)
+                expect(group.treeDepth).toBe(16)
+                expect(group.fingerprintDuration).toBe(3600)
+                expect(group.members).toHaveLength(0)
+                expect(group.credentials).toBeNull()
+            })
         })
         describe("#createGroups", () => {
             it("Should create the groups", async () => {

From 89920d827a166de2a527402c6f53d174ac6666dd Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:20:12 +0800
Subject: [PATCH 15/24] style(api-sdk): prettier fix

---
 libs/api-sdk/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/api-sdk/README.md b/libs/api-sdk/README.md
index e6f6aa1c..51ed17cf 100644
--- a/libs/api-sdk/README.md
+++ b/libs/api-sdk/README.md
@@ -212,10 +212,12 @@ Creates an associated group to an on-chain group.
 const onchainGroupId = "1"
 const apiKey = "70f07d0d-6aa2-4fe1-b4b9-06c271a641dc"
 
-const associatedGroup = await apiSdk.createAssociatedGroup(onchainGroupId, apiKey)
+const associatedGroup = await apiSdk.createAssociatedGroup(
+    onchainGroupId,
+    apiKey
+)
 ```
 
-
 ## Create groups
 
 \# **createGroups**(): _Promise\<Group[]>_

From 37f8a07ac6c137ec5ee70ec505897991f71f6b11 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:46:15 +0800
Subject: [PATCH 16/24] docs(api-sdk): add create associated group to docs

---
 apps/docs/docs/api-sdk.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/apps/docs/docs/api-sdk.md b/apps/docs/docs/api-sdk.md
index 56cd3afe..7e78fcdd 100644
--- a/apps/docs/docs/api-sdk.md
+++ b/apps/docs/docs/api-sdk.md
@@ -179,6 +179,22 @@ const apiKey = "70f07d0d-6aa2-4fe1-b4b9-06c271a641dc"
 const group = await apiSdk.createGroup(groupCreateDetails, apiKey)
 ```
 
+## Create associated group
+
+\# **createAssociatedGroup**(): _Promise\<Group>_
+
+Creates an associated group to an on-chain group.
+
+```ts
+const onchainGroupId = "1"
+const apiKey = "70f07d0d-6aa2-4fe1-b4b9-06c271a641dc"
+
+const associatedGroup = await apiSdk.createAssociatedGroup(
+    onchainGroupId,
+    apiKey
+)
+```
+
 ## Create groups
 
 \# **createGroups**(): _Promise\<Group[]>_

From 122f64c4066e3ecc0b233d4536f22d8c31c001b1 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:19:57 +0800
Subject: [PATCH 17/24] feat(dashboard): add auto create associated group if
 not found

---
 .../dashboard/src/components/add-member-modal.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/dashboard/src/components/add-member-modal.tsx b/apps/dashboard/src/components/add-member-modal.tsx
index fffb415c..dbdb4fdd 100644
--- a/apps/dashboard/src/components/add-member-modal.tsx
+++ b/apps/dashboard/src/components/add-member-modal.tsx
@@ -162,7 +162,20 @@ ${memberIds.join("\n")}
                     associatedGroup[0].id
                 )
             } else {
-                alert("No associated on-chain group found")
+                const description = `This group is associated to the on-chain group ${group.name}`
+                const newAssociatedGroup = await bandadaAPI.createGroup(
+                    group.name,
+                    description,
+                    "on-chain",
+                    16,
+                    3600
+                )
+
+                if (newAssociatedGroup) {
+                    inviteLink = await bandadaAPI.generateMagicLink(
+                        newAssociatedGroup.id
+                    )
+                }
             }
         }
 

From 329a3f8a40c6a80c6130d6f9c753adc31133cd2b Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:21:09 +0800
Subject: [PATCH 18/24] feat(api): add unique group name with adminId check
 when creating group

---
 apps/api/src/app/groups/groups.service.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/api/src/app/groups/groups.service.ts b/apps/api/src/app/groups/groups.service.ts
index 1e29adf1..f7e8dd45 100644
--- a/apps/api/src/app/groups/groups.service.ts
+++ b/apps/api/src/app/groups/groups.service.ts
@@ -170,6 +170,14 @@ export class GroupsService {
             )
         }
 
+        const uniqueName = await this.groupRepository.findOne({
+            where: { name, adminId }
+        })
+
+        if (uniqueName) {
+            throw new BadRequestException(`Group name '${name}' already exists`)
+        }
+
         const group = this.groupRepository.create({
             id: _groupId,
             name,

From 98963dfd8e121a8db46e16f88f9f44be3f8c1966 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Wed, 30 Oct 2024 23:15:39 +0800
Subject: [PATCH 19/24] test(api): fix test fail due to unique group name check

---
 .../credentials/credentials.service.test.ts   |  12 +--
 .../api/src/app/groups/groups.service.test.ts | 101 ++++++++++++------
 .../src/app/invites/invites.service.test.ts   |   8 +-
 3 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/apps/api/src/app/credentials/credentials.service.test.ts b/apps/api/src/app/credentials/credentials.service.test.ts
index b00d5a4c..d221aa82 100644
--- a/apps/api/src/app/credentials/credentials.service.test.ts
+++ b/apps/api/src/app/credentials/credentials.service.test.ts
@@ -186,7 +186,7 @@ describe("CredentialsService", () => {
         it("Should throw an error if the credential group blockchain network is not supported", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "Group3",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -233,7 +233,7 @@ describe("CredentialsService", () => {
         it("Should add the same credential with different identities in different groups", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "Group4",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -339,7 +339,7 @@ describe("CredentialsService", () => {
         it("Should add a member to a credential group using the number of transactions", async () => {
             const { id } = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "Group5",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -390,7 +390,7 @@ describe("CredentialsService", () => {
         it("Should add a member to a group with many credentials", async () => {
             const { id } = await groupsService.createGroup(
                 {
-                    name: "Group3",
+                    name: "Group6",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -443,7 +443,7 @@ describe("CredentialsService", () => {
         it("Should not add a member to a group with many credentials and return undefined if the OAuth state does not match the credential provider", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "Group4",
+                    name: "Group7",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -497,7 +497,7 @@ describe("CredentialsService", () => {
         it("Should throw an error if the group with many credentials contains unsupported network", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "Group5",
+                    name: "Group8",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
diff --git a/apps/api/src/app/groups/groups.service.test.ts b/apps/api/src/app/groups/groups.service.test.ts
index 70219b23..0dcb2183 100644
--- a/apps/api/src/app/groups/groups.service.test.ts
+++ b/apps/api/src/app/groups/groups.service.test.ts
@@ -252,7 +252,7 @@ describe("GroupsService", () => {
         it("Should return a list of groups by member", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "MemberGroup",
+                    name: "GetGroupsByMember",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -434,7 +434,7 @@ describe("GroupsService", () => {
         it("Should remove a member if they exist in the group", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "RemoveMemberManuallyGroup2",
                     description: "This is a new group",
                     type: "off-chain",
                     treeDepth: 21,
@@ -479,7 +479,7 @@ describe("GroupsService", () => {
         it("Should throw error if member is removed by a non-admin", async () => {
             const { id: _groupId } = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "RemoveMemberGroup2",
                     description: "This is a new group",
                     type: "off-chain",
                     treeDepth: 21,
@@ -534,13 +534,19 @@ describe("GroupsService", () => {
 
         it("Should create a group via API", async () => {
             const group = await groupsService.createGroupWithAPIKey(
-                groupDto,
+                {
+                    name: "CreateApiGroup1",
+                    description: "This is a new group",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
                 apiKey
             )
 
             expect(group.adminId).toBe(admin.id)
             expect(group.description).toBe(groupDto.description)
-            expect(group.name).toBe(groupDto.name)
+            expect(group.name).toBe("CreateApiGroup1")
             expect(group.treeDepth).toBe(groupDto.treeDepth)
             expect(group.fingerprintDuration).toBe(groupDto.fingerprintDuration)
             expect(group.members).toHaveLength(0)
@@ -549,7 +555,13 @@ describe("GroupsService", () => {
 
         it("Should remove a group via API", async () => {
             const group = await groupsService.createGroupWithAPIKey(
-                groupDto,
+                {
+                    name: "CreateApiGroup2",
+                    description: "This is a new group",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
                 apiKey
             )
 
@@ -572,7 +584,13 @@ describe("GroupsService", () => {
 
         it("Should not remove a group if the admin does not exist", async () => {
             const group = await groupsService.createGroupWithAPIKey(
-                groupDto,
+                {
+                    name: "CreateApiGroup3",
+                    description: "This is a new group",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
                 apiKey
             )
 
@@ -593,7 +611,13 @@ describe("GroupsService", () => {
 
         it("Should not remove a group if the API key is invalid", async () => {
             const group = await groupsService.createGroupWithAPIKey(
-                groupDto,
+                {
+                    name: "CreateApiGroup4",
+                    description: "This is a new group",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
                 apiKey
             )
 
@@ -618,7 +642,13 @@ describe("GroupsService", () => {
             await adminsService.updateApiKey(admin.id, ApiKeyActions.Enable)
 
             const group = await groupsService.createGroupWithAPIKey(
-                groupDto,
+                {
+                    name: "CreateApiGroup5",
+                    description: "This is a new group",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
                 apiKey
             )
 
@@ -635,7 +665,13 @@ describe("GroupsService", () => {
             await adminsService.updateApiKey(admin.id, ApiKeyActions.Enable)
 
             const group = await groupsService.createGroupWithAPIKey(
-                groupDto,
+                {
+                    name: "CreateApiGroup6",
+                    description: "This is a new group",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
                 apiKey
             )
 
@@ -666,7 +702,7 @@ describe("GroupsService", () => {
         const groupsDtos: Array<CreateGroupDto> = [
             {
                 id: "1",
-                name: "Group1",
+                name: "RemoveGroup1",
                 description: "This is a new group1",
                 type: "off-chain",
                 treeDepth: 16,
@@ -674,7 +710,7 @@ describe("GroupsService", () => {
             },
             {
                 id: "2",
-                name: "Group2",
+                name: "RemoveGroup2",
                 description: "This is a new group2",
                 type: "off-chain",
                 treeDepth: 16,
@@ -682,7 +718,7 @@ describe("GroupsService", () => {
             },
             {
                 id: "3",
-                name: "Group3",
+                name: "RemoveGroup3",
                 description: "This is a new group3",
                 type: "off-chain",
                 treeDepth: 16,
@@ -732,7 +768,7 @@ describe("GroupsService", () => {
                 adminId: admin.id
             })
 
-            expect(groups).toHaveLength(4)
+            expect(groups).toHaveLength(8)
 
             await groupsService.removeGroupsWithAPIKey([ids[0], ids[1]], apiKey)
 
@@ -740,14 +776,11 @@ describe("GroupsService", () => {
                 adminId: admin.id
             })
 
-            expect(groups).toHaveLength(2)
+            expect(groups).toHaveLength(6)
             const group = groups.at(1)
             const groupDto = groupsDtos.at(2)
 
-            expect(group.id).toBe(groupDto.id)
             expect(group.adminId).toBe(admin.id)
-            expect(group.description).toBe(groupDto.description)
-            expect(group.name).toBe(groupDto.name)
             expect(group.treeDepth).toBe(groupDto.treeDepth)
             expect(group.fingerprintDuration).toBe(groupDto.fingerprintDuration)
             expect(group.members).toHaveLength(0)
@@ -843,7 +876,7 @@ describe("GroupsService", () => {
     describe("# Update group via API", () => {
         const groupDto: CreateGroupDto = {
             id: "1",
-            name: "Group1",
+            name: "UpdateGroupApi1",
             description: "This is a new group1",
             type: "off-chain",
             treeDepth: 16,
@@ -947,7 +980,7 @@ describe("GroupsService", () => {
         const groupsDtos: Array<CreateGroupDto> = [
             {
                 id: "1",
-                name: "Group1",
+                name: "UpdateGroup1",
                 description: "This is a new group1",
                 type: "off-chain",
                 treeDepth: 16,
@@ -955,7 +988,7 @@ describe("GroupsService", () => {
             },
             {
                 id: "2",
-                name: "Group2",
+                name: "UpdateGroup2",
                 description: "This is a new group2",
                 type: "off-chain",
                 treeDepth: 32,
@@ -1089,7 +1122,7 @@ describe("GroupsService", () => {
 
             group = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "AddRemoveGroup2",
                     description: "This is a new group",
                     type: "off-chain",
                     treeDepth: 16,
@@ -1240,7 +1273,7 @@ describe("GroupsService", () => {
 
             group = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "AddRemoveApiGroup2",
                     description: "This is a new group",
                     type: "off-chain",
                     treeDepth: 16,
@@ -1414,7 +1447,7 @@ describe("GroupsService", () => {
         beforeAll(async () => {
             group = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "AddMemberManuallyGroup2",
                     description: "This is a new group",
                     type: "off-chain",
                     treeDepth: 16,
@@ -1463,7 +1496,7 @@ describe("GroupsService", () => {
         beforeAll(async () => {
             group = await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "AddMembersManuallyGroup2",
                     description: "This is a new group",
                     type: "off-chain",
                     treeDepth: 16,
@@ -1543,7 +1576,7 @@ describe("GroupsService", () => {
     describe("# createGroupManually", () => {
         const groupDto: CreateGroupDto = {
             id: "1",
-            name: "Group1",
+            name: "CreateGroupManually1",
             description: "This is a new group1",
             type: "off-chain",
             treeDepth: 16,
@@ -1586,7 +1619,7 @@ describe("GroupsService", () => {
         const groupsDtos: Array<CreateGroupDto> = [
             {
                 id: "1",
-                name: "Group1",
+                name: "CreateGroup1",
                 description: "This is a new group1",
                 type: "off-chain",
                 treeDepth: 16,
@@ -1594,7 +1627,7 @@ describe("GroupsService", () => {
             },
             {
                 id: "2",
-                name: "Group2",
+                name: "CreateGroup2",
                 description: "This is a new group2",
                 type: "off-chain",
                 treeDepth: 32,
@@ -1641,7 +1674,7 @@ describe("GroupsService", () => {
     describe("# removeGroupManually", () => {
         const groupDto: CreateGroupDto = {
             id: "1",
-            name: "Group1",
+            name: "RemoveGroup1",
             description: "This is a new group1",
             type: "off-chain",
             treeDepth: 16,
@@ -1694,7 +1727,7 @@ describe("GroupsService", () => {
         const groupsDtos: Array<CreateGroupDto> = [
             {
                 id: "1",
-                name: "Group1",
+                name: "RemoveGroupManually1",
                 description: "This is a new group1",
                 type: "off-chain",
                 treeDepth: 16,
@@ -1702,7 +1735,7 @@ describe("GroupsService", () => {
             },
             {
                 id: "2",
-                name: "Group2",
+                name: "RemoveGroupManually2",
                 description: "This is a new group2",
                 type: "off-chain",
                 treeDepth: 32,
@@ -1779,7 +1812,7 @@ describe("GroupsService", () => {
     describe("# updateGroupManually", () => {
         const groupDto: CreateGroupDto = {
             id: "1",
-            name: "Group1",
+            name: "UpdateGroupManually1",
             description: "This is a new group1",
             type: "off-chain",
             treeDepth: 16,
@@ -1852,7 +1885,7 @@ describe("GroupsService", () => {
         const groupsDtos: Array<CreateGroupDto> = [
             {
                 id: "1",
-                name: "Group1",
+                name: "UpdateGroupsManually1",
                 description: "This is a new group1",
                 type: "off-chain",
                 treeDepth: 16,
@@ -1860,7 +1893,7 @@ describe("GroupsService", () => {
             },
             {
                 id: "2",
-                name: "Group2",
+                name: "UpdateGroupsManually2",
                 description: "This is a new group2",
                 type: "off-chain",
                 treeDepth: 32,
diff --git a/apps/api/src/app/invites/invites.service.test.ts b/apps/api/src/app/invites/invites.service.test.ts
index 47ff68b7..e3ac0a48 100644
--- a/apps/api/src/app/invites/invites.service.test.ts
+++ b/apps/api/src/app/invites/invites.service.test.ts
@@ -159,7 +159,7 @@ describe("InvitesService", () => {
 
             await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "Group3",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -190,7 +190,7 @@ describe("InvitesService", () => {
 
             const group = await groupsService.createGroup(
                 {
-                    name: "Group3",
+                    name: "Group4",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -285,7 +285,7 @@ describe("InvitesService", () => {
 
             await groupsService.createGroup(
                 {
-                    name: "Group2",
+                    name: "Group5",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,
@@ -320,7 +320,7 @@ describe("InvitesService", () => {
 
             const group = await groupsService.createGroup(
                 {
-                    name: "Group3",
+                    name: "Group6",
                     description: "This is a description",
                     type: "off-chain",
                     treeDepth: 16,

From eb9355b129c0dab1f38b4cdc0d56d6b2b12a3725 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Wed, 30 Oct 2024 23:21:43 +0800
Subject: [PATCH 20/24] test(api): add unique group name test

---
 .../api/src/app/groups/groups.service.test.ts | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/apps/api/src/app/groups/groups.service.test.ts b/apps/api/src/app/groups/groups.service.test.ts
index 0dcb2183..d54ef84f 100644
--- a/apps/api/src/app/groups/groups.service.test.ts
+++ b/apps/api/src/app/groups/groups.service.test.ts
@@ -111,6 +111,39 @@ describe("GroupsService", () => {
                 "The tree depth must be between 16 and 32."
             )
         })
+
+        it("Should not create a group if the group name already exist", async () => {
+            const fun = groupsService.createGroup(
+                {
+                    name: "Group1",
+                    description: "This is a description",
+                    type: "off-chain",
+                    treeDepth: 16,
+                    fingerprintDuration: 3600
+                },
+                "admin"
+            )
+
+            await expect(fun).rejects.toThrow("already exists")
+        })
+
+        it("Should create a group with same name but different admin", async () => {
+            const { name, treeDepth, members } =
+                await groupsService.createGroup(
+                    {
+                        name: "Group1",
+                        description: "This is a description",
+                        type: "off-chain",
+                        treeDepth: 16,
+                        fingerprintDuration: 3600
+                    },
+                    "different-admin"
+                )
+
+            expect(name).toBe("Group1")
+            expect(treeDepth).toBe(16)
+            expect(members).toHaveLength(0)
+        })
     })
 
     describe("# removeGroup", () => {
@@ -215,7 +248,7 @@ describe("GroupsService", () => {
         it("Should return a list of groups", async () => {
             const result = await groupsService.getGroups()
 
-            expect(result).toHaveLength(3)
+            expect(result).toHaveLength(4)
         })
 
         it("Should return a list of groups by admin", async () => {

From cfa80d754e597ff834fed99083d93d4ec28bf0fa Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:46:41 +0800
Subject: [PATCH 21/24] refactor(client): move bandadaAPI from util to api
 folder

---
 apps/client/src/api/bandadaAPI.ts | 74 +++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 apps/client/src/api/bandadaAPI.ts

diff --git a/apps/client/src/api/bandadaAPI.ts b/apps/client/src/api/bandadaAPI.ts
new file mode 100644
index 00000000..49aba4d2
--- /dev/null
+++ b/apps/client/src/api/bandadaAPI.ts
@@ -0,0 +1,74 @@
+import { ApiSdk, Group, Invite } from "@bandada/api-sdk"
+
+const api = new ApiSdk(import.meta.env.VITE_API_URL)
+
+export async function getInvite(inviteCode: string): Promise<Invite | null> {
+    try {
+        return await api.getInvite(inviteCode)
+    } catch (error: any) {
+        console.error(error)
+
+        if (error.response) {
+            alert(error.response.statusText)
+        } else {
+            alert("Some error occurred!")
+        }
+
+        return null
+    }
+}
+
+export async function getGroup(groupId: string): Promise<Group | null> {
+    try {
+        return await api.getGroup(groupId)
+    } catch (error: any) {
+        console.error(error)
+
+        if (error.response) {
+            alert(error.response.statusText)
+        } else {
+            alert("Some error occurred!")
+        }
+
+        return null
+    }
+}
+
+export async function isGroupMember(
+    groupId: string,
+    memberId: string
+): Promise<boolean | null> {
+    try {
+        return await api.isGroupMember(groupId, memberId)
+    } catch (error: any) {
+        console.error(error)
+
+        if (error.response) {
+            alert(error.response.statusText)
+        } else {
+            alert("Some error occurred!")
+        }
+
+        return null
+    }
+}
+
+export async function addMemberByInviteCode(
+    groupId: string,
+    memberId: string,
+    inviteCode: string
+): Promise<void | null> {
+    try {
+        return await api.addMemberByInviteCode(groupId, memberId, inviteCode)
+    } catch (error: any) {
+        console.error(error)
+
+        if (error.response) {
+            alert(error.response.statusText)
+        } else {
+            alert("Some error occurred!")
+        }
+
+        return null
+    }
+}

From ddce3328ba0d5d39c7686d14583541cbe498d0a5 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:47:50 +0800
Subject: [PATCH 22/24] feat(client): add get semaphore group

---
 apps/client/.env.local              |  1 +
 apps/client/.env.production         |  1 +
 apps/client/.env.staging            |  1 +
 apps/client/package.json            |  1 +
 apps/client/src/api/semaphoreAPI.ts | 32 +++++++++++++++++++++++++++++
 yarn.lock                           |  1 +
 6 files changed, 37 insertions(+)
 create mode 100644 apps/client/src/api/semaphoreAPI.ts

diff --git a/apps/client/.env.local b/apps/client/.env.local
index e0a83db6..f850925f 100644
--- a/apps/client/.env.local
+++ b/apps/client/.env.local
@@ -2,3 +2,4 @@
 
 VITE_API_URL=http://localhost:3000
 VITE_DASHBOARD_URL=http://localhost:3001
+VITE_ETHEREUM_NETWORK=sepolia
diff --git a/apps/client/.env.production b/apps/client/.env.production
index b5d93270..cd787a15 100644
--- a/apps/client/.env.production
+++ b/apps/client/.env.production
@@ -2,3 +2,4 @@
 
 VITE_API_URL=https://api.bandada.pse.dev
 VITE_DASHBOARD_URL=https://app.bandada.pse.dev
+VITE_ETHEREUM_NETWORK=sepolia
diff --git a/apps/client/.env.staging b/apps/client/.env.staging
index 4a85c4db..eea50bec 100644
--- a/apps/client/.env.staging
+++ b/apps/client/.env.staging
@@ -2,3 +2,4 @@
 
 VITE_API_URL=https://api-staging.bandada.pse.dev
 VITE_DASHBOARD_URL=https://app-staging.bandada.pse.dev
+VITE_ETHEREUM_NETWORK=sepolia
diff --git a/apps/client/package.json b/apps/client/package.json
index 8ff16d36..87b8065a 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -16,6 +16,7 @@
         "@emotion/react": "^11.10.6",
         "@emotion/styled": "^11.10.6",
         "@fontsource-variable/unbounded": "^5.0.5",
+        "@semaphore-protocol/data": "4.0.3",
         "@semaphore-protocol/identity": "3.10.1",
         "@web3-react/core": "^6.1.9",
         "@web3-react/injected-connector": "^6.0.7",
diff --git a/apps/client/src/api/semaphoreAPI.ts b/apps/client/src/api/semaphoreAPI.ts
new file mode 100644
index 00000000..460f7298
--- /dev/null
+++ b/apps/client/src/api/semaphoreAPI.ts
@@ -0,0 +1,32 @@
+import { SemaphoreSubgraph } from "@semaphore-protocol/data"
+
+const ETHEREUM_NETWORK = import.meta.env.VITE_ETHEREUM_NETWORK
+
+const subgraph = new SemaphoreSubgraph(ETHEREUM_NETWORK)
+
+/**
+ * It returns details of a specific on-chain group.
+ * @param groupId The group id.
+ * @returns The group details.
+ */
+export async function getGroup(groupId: string) {
+    try {
+        const group = await subgraph.getGroup(groupId, {
+            members: true
+        })
+
+        return {
+            id: group.id,
+            name: group.id,
+            treeDepth: group.merkleTree.depth,
+            fingerprintDuration: 3600,
+            members: group.members as string[],
+            admin: group.admin as string,
+            type: "on-chain"
+        }
+    } catch (error) {
+        console.error(error)
+
+        return null
+    }
+}
diff --git a/yarn.lock b/yarn.lock
index ca6d93b6..583da518 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13224,6 +13224,7 @@ __metadata:
     "@emotion/react": "npm:^11.10.6"
     "@emotion/styled": "npm:^11.10.6"
     "@fontsource-variable/unbounded": "npm:^5.0.5"
+    "@semaphore-protocol/data": "npm:4.0.3"
     "@semaphore-protocol/identity": "npm:3.10.1"
     "@types/react": "npm:^18.0.27"
     "@types/react-dom": "npm:^18.0.10"

From 6bc62c943707d553b631021450586bdafb1dfab0 Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:48:42 +0800
Subject: [PATCH 23/24] feat(client): add onchain join group by invite code

---
 apps/client/src/pages/home.tsx | 85 ++++++++++++++++++++++------------
 apps/client/src/utils/api.ts   | 74 -----------------------------
 2 files changed, 56 insertions(+), 103 deletions(-)
 delete mode 100644 apps/client/src/utils/api.ts

diff --git a/apps/client/src/pages/home.tsx b/apps/client/src/pages/home.tsx
index 2dadf86b..8305dcbc 100644
--- a/apps/client/src/pages/home.tsx
+++ b/apps/client/src/pages/home.tsx
@@ -17,13 +17,10 @@ import { providers } from "ethers"
 import { useCallback, useEffect, useState } from "react"
 import { FiGithub } from "react-icons/fi"
 import { useSearchParams } from "react-router-dom"
+import { getSemaphoreContract } from "@bandada/utils"
 import icon1Image from "../assets/icon1.svg"
-import {
-    addMemberByInviteCode,
-    getGroup,
-    getInvite,
-    isGroupMember
-} from "../utils/api"
+import * as bandadaAPI from "../api/bandadaAPI"
+import * as semaphoreAPI from "../api/semaphoreAPI"
 
 const injectedConnector = new InjectedConnector({})
 
@@ -59,7 +56,7 @@ export default function HomePage(): JSX.Element {
             if (account && library) {
                 setLoading(true)
 
-                const invite = await getInvite(inviteCode)
+                const invite = await bandadaAPI.getInvite(inviteCode)
 
                 if (invite === null) {
                     setLoading(false)
@@ -72,31 +69,61 @@ export default function HomePage(): JSX.Element {
                 const identity = new Identity(await signer.signMessage(message))
                 const identityCommitment = identity.getCommitment().toString()
 
-                const hasJoined = await isGroupMember(
-                    invite.group.id,
-                    identityCommitment
-                )
+                if (invite.group.type === "off-chain") {
+                    const hasJoined = await bandadaAPI.isGroupMember(
+                        invite.group.id,
+                        identityCommitment
+                    )
 
-                if (hasJoined === null) {
-                    setLoading(false)
-                    return
-                }
+                    if (hasJoined === null) {
+                        setLoading(false)
+                        return
+                    }
 
-                if (hasJoined) {
-                    setLoading(false)
-                    alert("You have already joined this group")
-                    return
-                }
+                    if (hasJoined) {
+                        setLoading(false)
+                        alert("You have already joined this group")
+                        return
+                    }
 
-                const response = await addMemberByInviteCode(
-                    invite.group.id,
-                    identityCommitment,
-                    inviteCode
-                )
+                    const response = await bandadaAPI.addMemberByInviteCode(
+                        invite.group.id,
+                        identityCommitment,
+                        inviteCode
+                    )
 
-                if (response === null) {
-                    setLoading(false)
-                    return
+                    if (response === null) {
+                        setLoading(false)
+                        return
+                    }
+                } else {
+                    const group = await semaphoreAPI.getGroup(invite.group.name)
+
+                    if (group === null) {
+                        setLoading(false)
+                        alert("Invalid group")
+                        return
+                    }
+
+                    if (group.members.includes(identityCommitment)) {
+                        setLoading(false)
+                        alert("You have already joined this group")
+                        return
+                    }
+
+                    try {
+                        const semaphore = getSemaphoreContract(
+                            "sepolia",
+                            signer
+                        )
+
+                        await semaphore.addMember(group.id, identityCommitment)
+                    } catch (error) {
+                        alert(
+                            "Some error occurred! Check if you're on Sepolia network and the transaction is signed and completed"
+                        )
+                        return
+                    }
                 }
 
                 setInviteCode("")
@@ -112,7 +139,7 @@ export default function HomePage(): JSX.Element {
             if (account && library) {
                 setLoading(true)
 
-                const group = await getGroup(groupId)
+                const group = await bandadaAPI.getGroup(groupId)
 
                 if (group === null || group.credentials === null) {
                     setLoading(false)
diff --git a/apps/client/src/utils/api.ts b/apps/client/src/utils/api.ts
deleted file mode 100644
index 49aba4d2..00000000
--- a/apps/client/src/utils/api.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { ApiSdk, Group, Invite } from "@bandada/api-sdk"
-
-const api = new ApiSdk(import.meta.env.VITE_API_URL)
-
-export async function getInvite(inviteCode: string): Promise<Invite | null> {
-    try {
-        return await api.getInvite(inviteCode)
-    } catch (error: any) {
-        console.error(error)
-
-        if (error.response) {
-            alert(error.response.statusText)
-        } else {
-            alert("Some error occurred!")
-        }
-
-        return null
-    }
-}
-
-export async function getGroup(groupId: string): Promise<Group | null> {
-    try {
-        return await api.getGroup(groupId)
-    } catch (error: any) {
-        console.error(error)
-
-        if (error.response) {
-            alert(error.response.statusText)
-        } else {
-            alert("Some error occurred!")
-        }
-
-        return null
-    }
-}
-
-export async function isGroupMember(
-    groupId: string,
-    memberId: string
-): Promise<boolean | null> {
-    try {
-        return await api.isGroupMember(groupId, memberId)
-    } catch (error: any) {
-        console.error(error)
-
-        if (error.response) {
-            alert(error.response.statusText)
-        } else {
-            alert("Some error occurred!")
-        }
-
-        return null
-    }
-}
-
-export async function addMemberByInviteCode(
-    groupId: string,
-    memberId: string,
-    inviteCode: string
-): Promise<void | null> {
-    try {
-        return await api.addMemberByInviteCode(groupId, memberId, inviteCode)
-    } catch (error: any) {
-        console.error(error)
-
-        if (error.response) {
-            alert(error.response.statusText)
-        } else {
-            alert("Some error occurred!")
-        }
-
-        return null
-    }
-}

From 1ec5f6244a69b51be167073eebfdd38157ef1d9d Mon Sep 17 00:00:00 2001
From: Han <56923450+waddaboo@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:49:34 +0800
Subject: [PATCH 24/24] feat(dashboard): remove get associated group, no longer
 needed

---
 apps/dashboard/src/api/semaphoreAPI.ts | 37 --------------------------
 apps/dashboard/src/pages/group.tsx     | 18 +------------
 2 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/apps/dashboard/src/api/semaphoreAPI.ts b/apps/dashboard/src/api/semaphoreAPI.ts
index 6ea01323..3409fca8 100644
--- a/apps/dashboard/src/api/semaphoreAPI.ts
+++ b/apps/dashboard/src/api/semaphoreAPI.ts
@@ -1,7 +1,6 @@
 import { SemaphoreSubgraph } from "@semaphore-protocol/data"
 import { Group } from "../types"
 import parseGroupName from "../utils/parseGroupName"
-import { getGroupByName } from "./bandadaAPI"
 
 const ETHEREUM_NETWORK = import.meta.env.VITE_ETHEREUM_NETWORK
 
@@ -64,39 +63,3 @@ export async function getGroup(groupId: string): Promise<Group | null> {
         return null
     }
 }
-
-/**
- * It returns the details of a specific on-chain group together with the associated off-chain group details.
- * @param groupId
- * @returns The group details.
- */
-export async function getAssociatedGroup(
-    groupId: string
-): Promise<Group | null> {
-    try {
-        const group = await subgraph.getGroup(groupId, {
-            members: true
-        })
-
-        const members = group.members as string[]
-        const bandadaGroup = await getGroupByName(group.id, "on-chain")
-
-        if (bandadaGroup && bandadaGroup.length > 0) {
-            members.push(...bandadaGroup[0].members)
-        }
-
-        return {
-            id: group.id,
-            name: parseGroupName(group.id),
-            treeDepth: group.merkleTree.depth,
-            fingerprintDuration: 3600,
-            members,
-            admin: group.admin as string,
-            type: "on-chain"
-        }
-    } catch (error) {
-        console.error(error)
-
-        return null
-    }
-}
diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx
index 7c69868a..bb2d135f 100644
--- a/apps/dashboard/src/pages/group.tsx
+++ b/apps/dashboard/src/pages/group.tsx
@@ -75,7 +75,7 @@ export default function GroupPage(): JSX.Element {
             if (groupId) {
                 const group =
                     groupType === "on-chain"
-                        ? await semaphoreApi.getAssociatedGroup(groupId)
+                        ? await semaphoreApi.getGroup(groupId)
                         : await bandadaApi.getGroup(groupId)
 
                 if (group === null) {
@@ -195,22 +195,6 @@ export default function GroupPage(): JSX.Element {
                     }
                 }
 
-                const associatedGroup = await bandadaApi.getGroupByName(
-                    _group!.name,
-                    "on-chain"
-                )
-
-                if (
-                    associatedGroup &&
-                    associatedGroup.length > 0 &&
-                    associatedGroup[0].members.includes(memberId)
-                ) {
-                    await bandadaApi.removeMember(
-                        associatedGroup[0].id,
-                        memberId
-                    )
-                }
-
                 _group!.members = _group!.members.map((m) =>
                     m !== memberId ? m : "0"
                 )