Merge pull request #89 from martillansky/testnets

fix: missing registration for vouchers when profile has been transferred
Proof-Of-Humanity · Oct 15, 2024 · 0a501eb · 0a501eb
2 parents be4eeb9 + 31f5a45
commit 0a501eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -78,5 +78,6 @@
     "wagmi": "wagmi generate",
     "tsc": "tsc --noEmit && next lint",
     "func": "netlify dev"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }
diff --git a/src/data/sanitizer.ts b/src/data/sanitizer.ts
@@ -58,7 +58,7 @@ export const sanitizeRequest = async (request: RequestQuery['request'], chainId:
         request.humanity.winnerClaim[0].evidenceGroup.evidence = transferringRequest?.evidenceGroup.evidence as any;
       } else {
         //request.humanity = transferringRequestComplete?.humanity as any;
-        request.claimer = transferringRequestComplete?.claimer as any;
+        request.claimer.name = transferringRequestComplete?.claimer.name as any;
         request.evidenceGroup = transferringRequestComplete?.evidenceGroup as any;
         //request.challenges = transferringRequestComplete?.challenges as any;
       }
@@ -295,8 +295,9 @@ export const sanitizeClaimerData = async (out: Record<SupportedChainId, ClaimerQ
 
   if (voucherEvidenceChain) {
     const isClaimerIncomplete = 
-      out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.length > 0 &&
-      out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.at(0)!.evidenceGroup.evidence.length===0;
+      out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.length == 0 ||
+      (out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.length > 0 &&
+      out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.at(0)!.evidenceGroup.evidence.length===0);
 
     if (isClaimerIncomplete) {
       const lastTransf = await getProfileLastTransferringRequest(voucherEvidenceChain.id, id);
@@ -318,7 +319,14 @@ export const sanitizeClaimerData = async (out: Record<SupportedChainId, ClaimerQ
             : '';
 
       if (!!lastTransf?.transferringRequest?.evidenceGroup.evidence) {
-        out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.at(0)!.evidenceGroup.evidence = JSON.parse(JSON.stringify(lastTransf?.transferringRequest?.evidenceGroup.evidence));
+        //out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim.at(0)!.evidenceGroup.evidence = JSON.parse(JSON.stringify(lastTransf?.transferringRequest?.evidenceGroup.evidence));
+        out[voucherEvidenceChain.id].claimer!.registration!.humanity.winnerClaim = [
+          {
+            'index': lastTransf?.transferringRequest?.index, 
+            'resolutionTime': lastTransf?.transferringRequest?.lastStatusChange, 
+            'evidenceGroup': lastTransf?.transferringRequest?.evidenceGroup
+          }
+        ]
       }
     }
   } else { // If profile has been bridged, we need to look for the crossChainRegistration