payout

gitcoinco · May 2, 2024 · 6ec7b5f · 6ec7b5f
1 parent 3c00278
commit 6ec7b5f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/packages/common/src/allo/backends/allo-v1.ts b/packages/common/src/allo/backends/allo-v1.ts
@@ -1242,7 +1242,7 @@ export class AlloV1 implements Allo {
         return error(new AlloError("vault is required"));
       }
 
-      if (!args.applicationIndex) {
+      if (typeof args.applicationIndex !== "number") {
         return error(new AlloError("applicationIndex is required"));
       }
 

diff --git a/packages/round-manager/src/context/application/usePayout.ts b/packages/round-manager/src/context/application/usePayout.ts
@@ -117,6 +117,7 @@ export function usePayout() {
           recipientAddress: payoutWallet,
           recipientId: applicationId,
           applicationIndex: applicationIndex,
+          vault: payoutVault,
         })
         .on("transaction", (res) => {
           if (res.type === "success") {

diff --git a/packages/round-manager/src/features/round/ApplicationDirectPayout.tsx b/packages/round-manager/src/features/round/ApplicationDirectPayout.tsx
@@ -21,6 +21,7 @@ import { getPayoutTokenOptions } from "../api/payoutTokens";
 import { usePayouts } from "./usePayouts";
 import { Hex } from "viem";
 import { useDataLayer } from "data-layer";
+import { getConfig } from "common/src/config";
 
 const schema = yup.object().shape({
   amount: yup
@@ -152,14 +153,18 @@ export default function ApplicationDirectPayout({
     }
 
     if (allo) {
+      console.log("applicationIndex", application.applicationIndex);
       try {
+        const isV2 = getConfig().allo.version === "allo-v2";
+
         await triggerPayout({
           address,
           signer,
           token: tokenInfo,
-          applicationId: application.anchorAddress as Hex,
+          applicationId: (application.anchorAddress ||
+            application.projectId) as Hex,
           applicationIndex: application.applicationIndex,
-          roundId: round.id as Hex,
+          roundId: isV2 ? (round.id as Hex) : (round.payoutStrategy.id as Hex),
           roundAddress: round.payoutStrategy.id as Hex,
           payoutAmount: BigInt(amountBN.toString()),
           payoutVault: data.address as Hex,
@@ -168,7 +173,7 @@ export default function ApplicationDirectPayout({
           allo,
         });
 
-        window.location.reload();
+        // window.location.reload();
       } catch (error) {
         console.error(error);
         setTimeout(() => {

diff --git a/packages/round-manager/src/features/round/usePayouts.tsx b/packages/round-manager/src/features/round/usePayouts.tsx
@@ -24,20 +24,12 @@ export function usePayouts(args: {
         return [];
       }
 
-      console.log("Fetching payouts", {
-        chainId: args.chainId,
-        roundId: args.roundId,
-        recipientId: args.projectId,
-      });
-
       const result = await args.dataLayer.getPayoutsByChainIdRoundIdProjectId({
         chainId: args.chainId,
         roundId: args.roundId,
         projectId: args.projectId,
       });
 
-      console.log("result", result);
-
       const payouts =
         result.applications[0]
           .applicationsPayoutsByChainIdAndRoundIdAndApplicationId;