fix: minor fixes

- imporve server-side caching behaviour
- fix the URL to Hypercert
- fix the URL to original report
- remove fractional representation

Author: baumstern

components/report-details/funding-data-wrapper.tsx

@@ -53,7 +53,7 @@ const FundingDataWrapper: React.FC<FundingDataWrapperProps> = ({
   const pricePerUnit = totalAmount / Number(totalUnits);
   const percentProgress = ((fundedAmount || 0) / totalAmount) * 100;
   const minUnitAmount = 1 / pricePerUnit;
-  const dollarAmountNeeded = (totalAmount - (fundedAmount || 0)).toFixed(2);
+  const dollarAmountNeeded = String((totalAmount - (fundedAmount || 0)));
 
   return (
     <FundingProvider

components/report-details/report-sidebar.tsx

@@ -51,7 +51,7 @@ const ImpactDetails = ({ report }: { report: Report }) => {
 					))}
 				</ul>
 				<a
-					href={`https://testnet.hypercerts.org/app/view#claimId=${report.hypercertId}`}
+					href={`https://app.hypercerts.org/hypercerts/${report.hypercertId}`}
 					target="_blank"
 					rel="noopener noreferrer"
 					className={cn(
@@ -75,7 +75,7 @@ const ImpactDetails = ({ report }: { report: Report }) => {
 						"pl-0 text-vd-orange-800 hover:text-vd-orange-900 dark:text-vd-beige-100 dark:hover:text-vd-beige-100 gap-1 group",
 					)}
 				>
-					<span>What is a Hypercert?</span>
+					<span>What is Hypercert?</span>
 					<ArrowUpRight
 						size={18}
 						className="opacity-70 group-hover:translate-x-0.5 group-hover:opacity-100 group-hover:-translate-y-0.5 transition-transform duration-300 ease-in-out"

components/report-details/support/transaction-status.tsx

@@ -48,7 +48,7 @@ const TransactionStatus = ({
 					>
 						<a
 							// TODO: UPDATE FOR MAINNET WHEN READY
-							href={`https://sepolia.etherscan.io/tx/${transactionHash}`}
+							href={`https://optimistic.etherscan.io/tx/${transactionHash}`}
 							target="_blank"
 							rel="noopener noreferrer"
 							className="w-full h-full flex gap-2 justify-center items-center"

lib/directus.ts

@@ -83,7 +83,7 @@ export async function processNewContribution(
     // update the funded amount of the hypercert in server memory
     await updateFundedAmount(hypercertId, amount);
     // add the contribution to the cache
-    updateContribution(hypercertId, contribution);
+    await updateContribution(hypercertId, contribution);
   } catch (error) {
     console.error(`[server] failed to process new contribution: ${error}`);
     throw new Error(`[server] failed to process new contribution: ${error}`);

lib/impact-reports.ts

@@ -1,17 +1,14 @@
 import "server-only";
 
 import {
-  HypercertClaimdata,
   HypercertClient,
-  type HypercertMetadata,
 } from "@hypercerts-org/sdk";
 import { Mutex } from "async-mutex";
 
 import type { Report } from "@/types";
 import { getCMSReports, getFundedAmountByHCId } from "./directus";
 import { getOrders } from "./marketplace";
 import { delay } from "./utils";
-import { getHypercertsByCreator } from "@/hypercerts/getHypercertsByCreator";
 import { getHypercertsByOwner } from "@/hypercerts/getHypercertsByOwner";
 import { FragmentOf } from "gql.tada";
 
@@ -61,38 +58,19 @@ export const fetchReports = async (): Promise<Report[]> => {
       // step 3: get orders from marketplace
       const orders = await getOrders(_reports);
 
-      // TODO: remove this when we don't need dummy order
-      if (process.env.DEPLOY_ENV === "production") {
-        const orderMap = new Map(orders.map(order => [order?.hypercertId, order]));
-
-
-        reports = _reports.map(report => {
-          const order = orderMap.get(report.hypercertId);
-          if (order) {
-            report.order = order;
-          } else if (report.fundedSoFar < report.totalCost) {
-            console.warn(`[server] No order found for hypercert ${report.hypercertId}`);
-          }
-          return report;
-        });
-
-      } else {
-        reports = _reports.map((report) => {
-          for (const order of orders) {
-            if (order) {
-              report.order = order;
-              break;
-            }
-          }
-          // warn if there is no order for a report that is not fully funded
-          if (!report.order && report.fundedSoFar < report.totalCost) {
-            console.warn(
-              `[server] No order found for hypercert ${report.hypercertId}`,
-            );
-          }
-          return report;
-        });
-      }
+      const orderMap = new Map(orders.map(order => [order?.hypercertId, order]));
+
+
+      reports = _reports.map(report => {
+        const order = orderMap.get(report.hypercertId);
+        if (order) {
+          report.order = order;
+        } else if (report.fundedSoFar < report.totalCost) {
+          console.warn(`[server] No order found for hypercert ${report.hypercertId}`);
+        }
+        return report;
+      });
+
       console.log(`[server] total fetched reports: ${reports.length}`);
     }
 
@@ -111,7 +89,7 @@ export const fetchReports = async (): Promise<Report[]> => {
  */
 export const fetchReportBySlug = async (slug: string): Promise<Report> => {
   try {
-    const reports = await fetchReports();
+    let reports = await getReports();
 
     const foundReport = reports.find((report: Report) => report.slug === slug);
     if (!foundReport) {
@@ -129,9 +107,9 @@ export const fetchReportByHCId = async (
   hypercertId: string,
 ): Promise<Report> => {
   try {
-    const reports = await fetchReports();
+    let reports = await getReports();
 
-    const foundReport = reports.find(
+    const foundReport = reports?.find(
       (report: Report) => report.hypercertId === hypercertId,
     );
     if (!foundReport) {
@@ -148,11 +126,8 @@ export const fetchReportByHCId = async (
   }
 };
 
-export const getReports = (): Report[] => {
-  if (reports) {
-    return reports;
-  }
-  return [];
+export const getReports = async (): Promise<Report[]> => {
+  return reports ?  reports ?? [] as Report[] : await fetchReports();
 };
 
 /**
@@ -277,7 +252,6 @@ const updateReports = async (): Promise<Report[]> => {
         title: claim?.metadata?.name,
         summary: claim?.metadata?.description,
         image: "https://directus.voicedeck.org/assets/" + cmsReport.image,
-        originalReportUrl: claim?.metadata?.external_url,
         category: claim?.metadata?.work_scope?.[0],
         workTimeframe: `${(new Date(Number(claim.metadata?.work_timeframe_from) * 1000)).toLocaleDateString()} - ${(new Date(Number(claim.metadata?.work_timeframe_to) * 1000)).toLocaleDateString()}`,
         impactScope: claim?.metadata?.impact_scope?.[0],
@@ -298,6 +272,7 @@ const updateReports = async (): Promise<Report[]> => {
         dateUpdated: cmsReport.date_updated,
         byline: cmsReport.byline,
         totalCost: Number(cmsReport.total_cost),
+        originalReportUrl: cmsReport.original_report_url,
         fundedSoFar: await getFundedAmountByHCId(claim.hypercert_id as string),
       } as Report;
     });
@@ -327,7 +302,7 @@ export const updateFundedAmount = async (
   const release = await reportsMutex.acquire();
 
   try {
-    const reports = getReports();
+    const reports = await getReports();
     const report = reports.find((r) => r.hypercertId === hypercertId);
     if (report) {
       report.fundedSoFar += amount;