Merge pull request #1329 from AletheiaFact/bug-fix-verification-reque…

…st-recomendations BugFix: VerificationRequest
AletheiaFact · Aug 8, 2024 · f4c8fbb · f4c8fbb
2 parents 7f85ae2 + 505da94
commit f4c8fbb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/src/components/VerificationRequest/VerificationRequestList.tsx b/src/components/VerificationRequest/VerificationRequestList.tsx
@@ -21,14 +21,15 @@ const VerificationRequestList = () => {
                     title={t(
                         "verificationRequest:verificationRequestListHeader"
                     )}
-                    renderItem={(item, index) => (
+                    renderItem={(item) => (
                         <VerificationRequestCard
-                            key={index}
+                            key={item._id}
                             content={item}
                             t={t}
                             expandable={false}
                             actions={[
                                 <AletheiaButton
+                                    key={`open|${item._id}`}
                                     href={`/verification-request/${item.data_hash}`}
                                 >
                                     {t(

diff --git a/src/components/VerificationRequest/VerificationRequestProvider.tsx b/src/components/VerificationRequest/VerificationRequestProvider.tsx
@@ -34,9 +34,9 @@ export const VerificationRequestProvider = ({
     const addRecommendation = async (
         newVerificationRequest: VerificationRequest
     ): Promise<void> => {
-        const groupContent = group.content.filter(
-            (v) => v._id !== verificationRequest._id
-        );
+        const groupContent =
+            group?.content?.filter((v) => v._id !== verificationRequest._id) ||
+            [];
 
         await verificationRequestApi.updateVerificationRequest(
             verificationRequest._id,
@@ -52,10 +52,15 @@ export const VerificationRequestProvider = ({
     };
 
     const addInGroup = (newVerificationRequest: VerificationRequest): void => {
-        setGroup((prev) => ({
-            ...prev,
-            content: [...prev.content, newVerificationRequest],
-        }));
+        setGroup((prev) => {
+            if (!prev) {
+                return { content: [newVerificationRequest] };
+            }
+            return {
+                ...prev,
+                content: [...prev.content, newVerificationRequest],
+            };
+        });
     };
 
     const removeFromGroup = (verificationRequestId: string): void => {

diff --git a/src/types/Group.ts b/src/types/Group.ts
@@ -1,6 +1,6 @@
 import { VerificationRequest } from "./VerificationRequest";
 
 export type Group = {
-    _id: string;
+    _id?: string;
     content: VerificationRequest[];
 };
diff --git a/src/types/VerificationRequest.ts b/src/types/VerificationRequest.ts
@@ -8,5 +8,5 @@ export type VerificationRequest = {
     group: Group;
     date: Date;
     sources?: string[];
-    _id: string;
+    _id?: string;
 };