feat: add rejected status handling and update UI components

Proof-Of-Humanity · Dec 31, 2024 · 1d9ceb8 · 1d9ceb8
1 parent 82a72bd
commit 1d9ceb8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/src/app/[pohid]/[chain]/[request]/page.tsx b/src/app/[pohid]/[chain]/[request]/page.tsx
@@ -98,15 +98,17 @@ export default async function Request({ params }: PageProps) {
                 Date.now() / 1000
             );
           }
-        } else return true;
+          return false;
+        }
+        return false;
       }
     } else if (request.status.id === "transferring") {
       return (
         Number(request.creationTime) + Number(contractData.humanityLifespan) <
         Date.now() / 1000
       );
     }
-    return true;
+    return false;
   };
 
   const expired = hasExpired();

diff --git a/src/components/Request/Card.tsx b/src/components/Request/Card.tsx
@@ -110,10 +110,10 @@ function Card({
   humanity: { id: pohId, winnerClaim },
   expired,
 }: CardInterface) {
-  const rejected = status === "resolved" && !winnerClaim.some(claim => claim.index === index);
-  console.log(rejected);
+  const rejected = status === "resolved" && !winnerClaim.some(claim => claim.index === index) && !revocation;
+
   const statusTitle = queryToStatus(status, revocation, expired);
-  const statusColor = colorForStatus(status, revocation, expired);
+  const statusColor = colorForStatus(status, revocation, expired,rejected);
 
   const chain = idToChain(chainId)!;
   return (
@@ -125,7 +125,11 @@ function Card({
         <div className={`h-1 w-full bg-status-${statusColor}`} />
         <div className="centered p-2 font-medium">
           <span className={`text-status-${statusColor}`}>
-            {camelToTitle(statusTitle, revocation, expired,rejected)}
+          {status === "resolved" && expired && !revocation
+              ? "Expired"
+              : rejected
+              ? "Rejected"
+              : camelToTitle(statusTitle, revocation, expired)}
           </span>
           <span className={`dot ml-2 bg-status-${statusColor}`} />
         </div>

diff --git a/src/components/Request/Grid.tsx b/src/components/Request/Grid.tsx
@@ -90,14 +90,14 @@ const isRequestExpired = (
         Number(request.humanity.registration?.expirationTime) <
           Date.now() / 1000
       );
-    } // else return (Number(request.creationTime) + Number(humanityLifespan) < Date.now() / 1000)
+    }
   } else if (request.status.id === "transferring") {
     return (
       Number(request.creationTime) + Number(humanityLifespan) <
       Date.now() / 1000
     );
   }
-  return true;
+  return false;
 };
 
 const normalize = (

diff --git a/src/config/misc.ts b/src/config/misc.ts
@@ -17,6 +17,7 @@ export const colorForStatus = (
   status: string,
   revocation: boolean,
   expired: boolean,
+  rejected: boolean,
 ) => {
   switch (status) {
     case "vouching":
@@ -29,7 +30,7 @@ export const colorForStatus = (
     case "disputed":
       return "challenged";
     case "resolved":
-      return revocation ? "removed" : expired ? "expired" : "registered";
+      return revocation ? "removed" : expired ? "expired" : rejected ? "rejected" : "registered";
     default:
       throw new Error("status error");
   }

diff --git a/tailwind.config.cjs b/tailwind.config.cjs
@@ -31,6 +31,7 @@ module.exports = {
             expired: "#333333",
             transferred: "#3F6212",
             transferring: "#ba7264",
+            rejected: "#D90429",
           },
         },
         dark: {
@@ -54,6 +55,7 @@ module.exports = {
             expired: "#DAF0FF",
             transferred: "#8BC34A",
             transferring: "#795548",
+            rejected: "#F25F5F",
           },
         },
       },
@@ -107,5 +109,8 @@ module.exports = {
     "border-status-expired",
     "border-status-transferred",
     "border-status-transferring",
+    "bg-status-rejected",
+    "text-status-rejected",
+    "border-status-rejected",
   ],
 };