tmp fix

gitcoinco · Apr 30, 2024 · 0cde040 · 0cde040
1 parent 6d8e793
commit 0cde040
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/packages/common/src/allo/allo.ts b/packages/common/src/allo/allo.ts
@@ -137,6 +137,7 @@ export interface Allo {
       index: number;
       status: ApplicationStatus;
     }[];
+    strategy?: RoundCategory;
   }) => AlloOperation<
     Result<void>,
     {

diff --git a/packages/common/src/allo/backends/allo-v2.ts b/packages/common/src/allo/backends/allo-v2.ts
@@ -691,6 +691,7 @@ export class AlloV2 implements Allo {
       index: number;
       status: ApplicationStatus;
     }[];
+    strategy?: RoundCategory;
   }): AlloOperation<
     Result<void>,
     {
@@ -700,12 +701,32 @@ export class AlloV2 implements Allo {
     }
   > {
     return new AlloOperation(async ({ emit }) => {
-      // Note: This is for both Direct and Quadratic Funding Grants
-      const strategyInstance = new DonationVotingMerkleDistributionStrategy({
-        chain: this.chainId,
-        poolId: BigInt(args.roundId),
-        address: args.strategyAddress,
-      });
+      let strategyInstance;
+
+      switch (args.strategy) {
+        case RoundCategory.QuadraticFunding: {
+
+        strategyInstance = new DonationVotingMerkleDistributionStrategy({
+            chain: this.chainId,
+            poolId: BigInt(args.roundId),
+            address: args.strategyAddress,
+          });
+          break;
+        }
+
+        case RoundCategory.Direct: {
+          strategyInstance = new DirectGrantsLiteStrategy({
+            chain: this.chainId,
+            poolId: BigInt(args.roundId),
+            address: args.strategyAddress,
+          });
+          break;
+        }
+
+        default:
+          const err = new AlloError("Unsupported strategy");
+          return error(err);
+      }
 
       const totalApplications = await strategyInstance.recipientsCounter();
 

diff --git a/packages/round-manager/src/assets/manager-logo.svg b/packages/round-manager/src/assets/manager-logo.svg
diff --git a/packages/round-manager/src/context/application/BulkUpdateGrantApplicationContext.tsx b/packages/round-manager/src/context/application/BulkUpdateGrantApplicationContext.tsx
@@ -19,8 +19,9 @@ import { datadogLogs } from "@datadog/browser-logs";
 import { waitForSubgraphSyncTo } from "../../features/api/subgraph";
 import { Signer } from "@ethersproject/abstract-signer";
 import { useWallet } from "../../features/common/Auth";
-import { Allo, RoundStrategyType } from "common";
+import { Allo, RoundStrategyType, getRoundStrategyType } from "common";
 import { Address } from "viem";
+import { RoundCategory } from "data-layer";
 
 export interface BulkUpdateGrantApplicationState {
   roundId: string;
@@ -171,6 +172,7 @@ async function _bulkUpdateGrantApplication({
   signer,
   context,
   roundId,
+  roundStrategy,
   roundStrategyAddress,
   applications,
   selectedApplications,
@@ -180,6 +182,8 @@ async function _bulkUpdateGrantApplication({
   try {
     context.setContractUpdatingStatus(ProgressStatus.IN_PROGRESS);
 
+    const strategy = roundStrategy == "DirectGrants" ? RoundCategory.Direct : RoundCategory.QuadraticFunding;
+
     const result = await allo
       .bulkUpdateApplicationStatus({
         roundId,
@@ -193,6 +197,7 @@ async function _bulkUpdateGrantApplication({
         })),
         // FIXME: use getAddress when tests stop failing because of it
         strategyAddress: roundStrategyAddress as Address,
+        strategy: strategy,
       })
       .on("transactionStatus", (tx) => {
         if (tx.type === "success") {