fix: par-799

Author: nijoe1

packages/data-layer/src/data-layer.ts

@@ -770,6 +770,8 @@ export class DataLayer {
           id: round.strategyAddress,
           strategyName: round.strategyName,
         },
+        applicationQuestions:
+          round.applicationMetadata?.applicationSchema?.questions,
         approvedProjects: projects,
         uniqueDonorsCount: round.uniqueDonorsCount,
       },

packages/data-layer/src/data.types.ts

@@ -1,6 +1,9 @@
 import { VerifiableCredential } from "@gitcoinco/passport-sdk-types";
 import { Address } from "viem";
-import { RoundApplicationMetadata } from "./roundApplication.types";
+import {
+  RoundApplicationMetadata,
+  RoundApplicationQuestion,
+} from "./roundApplication.types";
 export type RoundPayoutType =
   | "allov1.Direct"
   | "allov1.QF"
@@ -256,6 +259,7 @@ export type RoundWithApplications = Omit<RoundGetRound, "applications"> & {
 export type RoundForExplorer = Omit<RoundGetRound, "applications"> & {
   applications: (Application & { anchorAddress: Address })[];
   uniqueDonorsCount?: number;
+  applicationMetadata?: RoundApplicationMetadata;
 };
 
 export type BaseDonorValues = {
@@ -471,6 +475,8 @@ export interface Round {
       info: string;
     };
   };
+
+  applicationQuestions?: RoundApplicationQuestion[];
   /**
    * Pointer to round metadata in a decentralized storage e.g IPFS, Ceramic etc.
    */

packages/grant-explorer/src/features/round/ViewProjectDetails.tsx

@@ -42,11 +42,16 @@ import { useGap } from "../api/gap";
 import { StatList } from "./OSO/ImpactStats";
 import { useOSO } from "../api/oso";
 import { CheckIcon, ShoppingCartIcon } from "@heroicons/react/24/outline";
-import { Application, useDataLayer } from "data-layer";
+import {
+  Application,
+  BaseQuestion,
+  Round,
+  RoundApplicationQuestion,
+  useDataLayer,
+} from "data-layer";
 import { DefaultLayout } from "../common/DefaultLayout";
 import {
   mapApplicationToProject,
-  mapApplicationToRound,
   useApplication,
 } from "../projects/hooks/useApplication";
 import { PassportWidget } from "../common/PassportWidget";
@@ -114,9 +119,9 @@ export default function ViewProjectDetails() {
     },
     dataLayer
   );
+  const { round } = useRoundById(Number(chainId), roundId);
 
   const projectToRender = application && mapApplicationToProject(application);
-  const round = application && mapApplicationToRound(application);
   round && (round.chainId = Number(chainId));
   const isSybilDefenseEnabled =
     round?.roundMetadata?.quadraticFundingConfig?.sybilDefense === true ||
@@ -207,6 +212,7 @@ export default function ViewProjectDetails() {
                 <Detail text={description} testID="project-metadata" />
                 <ApplicationFormAnswers
                   answers={projectToRender.grantApplicationFormAnswers}
+                  round={round}
                 />
               </>
             ) : (
@@ -234,7 +240,7 @@ export default function ViewProjectDetails() {
         ),
       },
     ],
-    [stats, grants, projectToRender, description, isLoading]
+    [stats, grants, projectToRender, description, round, impacts]
   );
 
   const handleTabChange = (tabIndex: number) => {
@@ -460,9 +466,27 @@ function Detail(props: { text: string; testID: string }) {
 
 function ApplicationFormAnswers(props: {
   answers: GrantApplicationFormAnswer[];
+  round: Round | undefined;
 }) {
-  // only show answers that are not empty and are not marked as hidden
-  const answers = props.answers.filter((a) => !!a.answer && !a.hidden);
+  const roundQuestions = props.round?.applicationQuestions as (BaseQuestion &
+    RoundApplicationQuestion)[];
+  if (!roundQuestions) {
+    return null;
+  }
+  let answers = roundQuestions
+    .filter((q) => !q.hidden && !q.encrypted)
+    .map((q) => ({
+      ...props.answers.find(
+        (a) =>
+          a.questionId === q.id && a.question === q.title && a.type === q.type
+      ),
+      question: q.title,
+    }))
+    .filter((a): a is GrantApplicationFormAnswer => !!a.answer);
+
+  if (answers.length === 0) {
+    answers = props.answers.filter((a) => !!a.answer && !a.hidden);
+  }
 
   if (answers.length === 0) {
     return null;