Update useConsent hook

xmtp · Sep 6, 2024 · b58da93 · b58da93
1 parent f4d3436
commit b58da93
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/packages/react-sdk/src/hooks/useConsent.test.tsx b/packages/react-sdk/src/hooks/useConsent.test.tsx
@@ -91,13 +91,12 @@ describe("useConsent", () => {
 
     await act(async () => {
       const list = await result.current.loadConsentList();
-      expect(list).toEqual([]);
+      expect(list.size).toEqual(0);
       await result.current.allow([testWallet2.account.address]);
       const list2 = await result.current.loadConsentList();
-      expect(list2.length).toEqual(1);
-      expect(list2[0].entryType).toEqual("address");
-      expect(list2[0].permissionType).toEqual("allowed");
-      expect(list2[0].value).toEqual(testWallet2.account.address);
+      expect(list2.size).toEqual(1);
+      const entry = list2.get(`address-${testWallet2.account.address}`);
+      expect(entry).toEqual("allowed");
       const entries = await getCachedConsentEntries(
         testWallet1.account.address,
         db,
@@ -118,13 +117,12 @@ describe("useConsent", () => {
 
     await act(async () => {
       const list = await result.current.refreshConsentList();
-      expect(list).toEqual([]);
+      expect(list.size).toEqual(0);
       await result.current.allow([testWallet4.account.address]);
       const list2 = await result.current.refreshConsentList();
-      expect(list2.length).toEqual(1);
-      expect(list2[0].entryType).toEqual("address");
-      expect(list2[0].permissionType).toEqual("allowed");
-      expect(list2[0].value).toEqual(testWallet4.account.address);
+      expect(list2.size).toEqual(1);
+      const entry = list2.get(`address-${testWallet4.account.address}`);
+      expect(entry).toEqual("allowed");
       const entries = await getCachedConsentEntries(
         testWallet3.account.address,
         db,

diff --git a/packages/react-sdk/src/hooks/useConsent.ts b/packages/react-sdk/src/hooks/useConsent.ts
@@ -1,4 +1,5 @@
 import { useCallback } from "react";
+import type { ConsentState } from "@xmtp/xmtp-js";
 import { useClient } from "@/hooks/useClient";
 import { useDb } from "@/hooks/useDb";
 import {
@@ -113,13 +114,19 @@ export const useConsent = () => {
       }
       const db = await getDbInstance();
       const newEntries = await client.contacts.loadConsentList(startTime);
-      if (newEntries.length > 0) {
+      if (newEntries.size > 0) {
+        const addresses = Array.from(newEntries.entries())
+          .filter(([entry]) => entry.startsWith("address-"))
+          .map(
+            ([entry, state]) =>
+              [entry.split("-")[1], state] as [string, ConsentState],
+          );
         // update DB
         await bulkPutConsentState(
-          newEntries.map((entry) => ({
-            value: entry.value,
+          addresses.map(([address, state]) => ({
+            value: address,
             type: "address",
-            state: entry.permissionType,
+            state,
             walletAddress: client.address,
           })),
           db,
@@ -138,13 +145,19 @@ export const useConsent = () => {
     const db = await getDbInstance();
     await db.table("consent").clear();
     const newEntries = await client?.contacts.refreshConsentList();
-    if (newEntries.length > 0) {
+    if (newEntries.size > 0) {
+      const addresses = Array.from(newEntries.entries())
+        .filter(([entry]) => entry.startsWith("address-"))
+        .map(
+          ([entry, state]) =>
+            [entry.split("-")[1], state] as [string, ConsentState],
+        );
       // update DB
       await bulkPutConsentState(
-        newEntries.map((entry) => ({
-          value: entry.value,
+        addresses.map(([address, state]) => ({
+          value: address,
           type: "address",
-          state: entry.permissionType,
+          state,
           walletAddress: client.address,
         })),
         db,