chore: simplify payout tokens handling

gitcoinco · Nov 22, 2023 · 12dba4d · 12dba4d
1 parent 78ef31a
commit 12dba4d
Show file tree

Hide file tree

Showing 16 changed files with 339 additions and 359 deletions.
diff --git a/packages/round-manager/src/context/application/usePayout.ts b/packages/round-manager/src/context/application/usePayout.ts
@@ -1,12 +1,12 @@
 import { Dispatch, SetStateAction, useState } from "react";
 import { ProgressStatus, ProgressStep } from "../../features/api/types";
-import { PayoutToken } from "../../features/api/utils";
 import {
   DirectPayoutStrategy__factory,
   Erc20__factory,
 } from "../../types/generated/typechain";
 import { BigNumber, ethers } from "ethers";
 import { waitForSubgraphSyncTo } from "../../features/api/subgraph";
+import { PayoutTokens } from "../../features/api/payoutTokens";
 
 export function usePayout() {
   const [contractApproveSpendStatus, setContractApproveSpendStatus] =
@@ -71,7 +71,7 @@ export function usePayout() {
   type Args = {
     address: string;
     signer: ethers.Signer;
-    token: PayoutToken;
+    token: PayoutTokens;
     projectId: string;
     applicationIndex: number;
     payoutStrategyAddress: string;

diff --git a/packages/round-manager/src/context/round/FundContractContext.tsx b/packages/round-manager/src/context/round/FundContractContext.tsx
@@ -12,7 +12,8 @@ import { fundRoundContract } from "../../features/api/application";
 import { waitForSubgraphSyncTo } from "../../features/api/subgraph";
 
 import { ProgressStatus } from "../../features/api/types";
-import { PayoutToken } from "../../features/api/utils";
+
+import { PayoutTokens } from "../../features/api/payoutTokens";
 
 export interface FundContractState {
   tokenApprovalStatus: ProgressStatus;
@@ -30,14 +31,14 @@ export interface FundContractState {
 export type FundContractParams = {
   roundId: string;
   fundAmount: number;
-  payoutToken: PayoutToken;
+  payoutToken: PayoutTokens;
 };
 
 interface SubmitFundParams {
   signer: Signer;
   context: FundContractState;
   roundId: string;
-  payoutToken: PayoutToken;
+  payoutToken: PayoutTokens;
   fundAmount: number;
 }
 
@@ -179,7 +180,7 @@ async function _fundContract({
 async function approveTokenForFunding(
   signerOrProvider: Signer,
   roundId: string,
-  token: PayoutToken,
+  token: PayoutTokens,
   amount: number,
   context: FundContractState
 ): Promise<void> {
@@ -203,7 +204,7 @@ async function approveTokenForFunding(
 async function fund(
   signerOrProvider: Signer,
   roundId: string,
-  token: PayoutToken,
+  token: PayoutTokens,
   fundAmount: number,
   context: FundContractState
 ): Promise<void> {

diff --git a/packages/round-manager/src/context/round/UpdateRoundContext.tsx b/packages/round-manager/src/context/round/UpdateRoundContext.tsx
@@ -5,9 +5,9 @@ import { saveToIPFS } from "../../features/api/ipfs";
 import { TransactionBuilder, UpdateAction } from "../../features/api/round";
 import { waitForSubgraphSyncTo } from "../../features/api/subgraph";
 import { EditedGroups, ProgressStatus, Round } from "../../features/api/types";
-import { getPayoutTokenOptions } from "../../features/api/utils";
 import { useWallet } from "../../features/common/Auth";
 import subSeconds from "date-fns/subSeconds";
+import { getPayoutTokenOptions } from "../../features/api/payoutTokens";
 
 type SetStatusFn = React.Dispatch<SetStateAction<ProgressStatus>>;
 

diff --git a/packages/round-manager/src/features/api/application.ts b/packages/round-manager/src/features/api/application.ts
@@ -1,4 +1,4 @@
-import { fetchFromIPFS, PayoutToken, pinToIPFS } from "./utils";
+import { fetchFromIPFS, pinToIPFS } from "./utils";
 import {
   AppStatus,
   GrantApplication,
@@ -19,6 +19,7 @@ import { Signer } from "@ethersproject/abstract-signer";
 import { Web3Provider } from "@ethersproject/providers";
 import { graphql_fetch } from "common";
 import { DirectPayoutStrategy__factory } from "../../types/generated/typechain";
+import { PayoutTokens } from "./payoutTokens";
 // import { verifyApplicationMetadata } from "common/src/verification";
 // import { fetchProjectOwners } from "common/src/registry";
 
@@ -484,7 +485,7 @@ export const updateApplicationList = async (
 export const fundRoundContract = async (
   roundId: string,
   signer: Signer,
-  payoutToken: PayoutToken,
+  payoutToken: PayoutTokens,
   amount: BigNumber
 ): Promise<{ txBlockNumber: number; txHash: string }> => {
   // checksum conversion