Merge branch 'main' into 2431-update-contributingmd

gitcoinco · Oct 15, 2023 · 1bab7b1 · 1bab7b1
2 parents d6bf72b + ba7d589
commit 1bab7b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/grant-explorer/src/features/contributors/DonationsTable.tsx b/packages/grant-explorer/src/features/contributors/DonationsTable.tsx
@@ -55,7 +55,8 @@ export function DonationsTable(props: {
           props.contributions.map((chainContribution) => {
             const { chainId, data } = chainContribution;
             return data.map((contribution) => {
-              const token = props.tokens[contribution.token];
+              const tokenId = contribution.token.toLowerCase() + "-" + chainId;
+              const token = props.tokens[tokenId];
 
               let formattedAmount = "N/A";
 

diff --git a/packages/grant-explorer/src/features/contributors/ViewContributionHistory.tsx b/packages/grant-explorer/src/features/contributors/ViewContributionHistory.tsx
@@ -60,8 +60,12 @@ function ViewContributionHistoryFetcher(props: {
     return blockies.create({ seed: props.address.toLowerCase() }).toDataURL();
   }, [props.address]);
 
+  // tokens is a map of token address + chainId to token
   const tokens = Object.fromEntries(
-    votingTokens.map((token) => [token.address, token])
+    votingTokens.map((token) => [
+      token.address.toLowerCase() + "-" + token.chainId,
+      token,
+    ])
   );
 
   if (contributionHistory.type === "loading") {
@@ -105,7 +109,9 @@ export function ViewContributionHistory(props: {
       props.contributions.forEach((chainContribution) => {
         const { data } = chainContribution;
         data.forEach((contribution) => {
-          const token = props.tokens[contribution.token];
+          const tokenId =
+            contribution.token.toLowerCase() + "-" + chainContribution.chainId;
+          const token = props.tokens[tokenId];
           if (token) {
             totalDonations += contribution.amountUSD;
             totalUniqueContributions += 1;

diff --git a/packages/round-manager/src/features/round/RoundApplicationForm.tsx b/packages/round-manager/src/features/round/RoundApplicationForm.tsx
@@ -90,7 +90,7 @@ export const initialQuestionsDirect: SchemaQuestion[] = [
     encrypted: false,
     hidden: false,
     type: "paragraph",
-    fixed: true,
+    fixed: false,
   },
   {
     id: 3,
@@ -99,7 +99,7 @@ export const initialQuestionsDirect: SchemaQuestion[] = [
     encrypted: false,
     hidden: true,
     type: "number",
-    fixed: true,
+    fixed: false,
   },
   {
     id: 4,