fix all occurrences

gitcoinco · Feb 16, 2024 · d6e8343 · d6e8343
1 parent 85f696e
commit d6e8343
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/packages/round-manager/src/features/common/Utils.ts b/packages/round-manager/src/features/common/Utils.ts
@@ -1,4 +1,9 @@
-import { ROUND_PAYOUT_DIRECT, ROUND_PAYOUT_MERKLE } from "common";
+import {
+  ROUND_PAYOUT_DIRECT,
+  ROUND_PAYOUT_MERKLE,
+  ROUND_PAYOUT_DIRECT_OLD,
+  ROUND_PAYOUT_MERKLE_OLD,
+} from "common";
 
 export const verticalTabStyles = (selected: boolean) =>
   selected
@@ -13,11 +18,11 @@ export const horizontalTabStyles = (selected: boolean) =>
 export const getPayoutRoundDescription = (key: string) => {
   switch (key) {
     case ROUND_PAYOUT_MERKLE:
+    case ROUND_PAYOUT_MERKLE_OLD:
       return "Quadratic Funding";
-      break;
     case ROUND_PAYOUT_DIRECT:
+    case ROUND_PAYOUT_DIRECT_OLD:
       return "Direct Grant";
-      break;
     default:
       return key;
       break;

diff --git a/packages/round-manager/src/features/round/ViewApplicationPage.tsx b/packages/round-manager/src/features/round/ViewApplicationPage.tsx
@@ -68,8 +68,7 @@ import { useDebugMode } from "../../hooks";
 import { getPayoutRoundDescription } from "../common/Utils";
 import moment from "moment";
 import ApplicationDirectPayout from "./ApplicationDirectPayout";
-
-const ROUND_PAYOUT_DIRECT = "DIRECT";
+import { ROUND_PAYOUT_DIRECT_OLD as ROUND_PAYOUT_DIRECT } from "common";
 
 type Status = "done" | "current" | "rejected" | "approved" | undefined;
 

diff --git a/packages/round-manager/src/features/round/ViewRoundPage.tsx b/packages/round-manager/src/features/round/ViewRoundPage.tsx
@@ -49,9 +49,10 @@ import { RoundDates, parseRoundDates } from "../common/parseRoundDates";
 import moment from "moment";
 import ApplicationsToApproveReject from "./ApplicationsToApproveReject";
 import ApplicationsToReview from "./ApplicationsToReview";
-
-const ROUND_PAYOUT_DIRECT = "DIRECT";
-const ROUND_PAYOUT_MERKLE = "MERKLE";
+import {
+  ROUND_PAYOUT_DIRECT_OLD as ROUND_PAYOUT_DIRECT,
+  ROUND_PAYOUT_MERKLE_OLD as ROUND_PAYOUT_MERKLE,
+} from "common";
 
 export const isDirectRound = (round: Round) =>
   round && round.payoutStrategy.strategyName === ROUND_PAYOUT_DIRECT;

diff --git a/packages/round-manager/src/features/round/__tests__/ApplicationDirectPayout.test.tsx b/packages/round-manager/src/features/round/__tests__/ApplicationDirectPayout.test.tsx
@@ -9,7 +9,7 @@ import {
 import "@testing-library/jest-dom/extend-expect";
 import ApplicationDirectPayout from "../ApplicationDirectPayout";
 import { makeGrantApplicationData, makeRoundData } from "../../../test-utils";
-import { ROUND_PAYOUT_DIRECT } from "common";
+import { ROUND_PAYOUT_DIRECT_OLD as ROUND_PAYOUT_DIRECT } from "common";
 
 import { useWallet } from "../../common/Auth";
 import { useDisconnect, useNetwork, useSwitchNetwork } from "wagmi";

diff --git a/packages/round-manager/src/features/round/__tests__/ApplicationsToReview.test.tsx b/packages/round-manager/src/features/round/__tests__/ApplicationsToReview.test.tsx
@@ -27,7 +27,7 @@ import {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { ApplicationStatus, ProgressStatus } from "../../api/types";
 import { errorModalDelayMs } from "../../../constants";
-import { ROUND_PAYOUT_DIRECT } from "common";
+import { ROUND_PAYOUT_DIRECT_OLD as ROUND_PAYOUT_DIRECT } from "common";
 
 jest.mock("../../api/application");
 jest.mock("../../common/Auth", () => ({

diff --git a/packages/round-manager/src/features/round/__tests__/ViewApplicationPage.test.tsx b/packages/round-manager/src/features/round/__tests__/ViewApplicationPage.test.tsx
@@ -36,7 +36,7 @@ import {
 import { GrantApplication, ProgressStatus } from "../../api/types";
 import { errorModalDelayMs } from "../../../constants";
 import moment from "moment";
-import { ROUND_PAYOUT_DIRECT } from "common";
+import { ROUND_PAYOUT_DIRECT_OLD as ROUND_PAYOUT_DIRECT } from "common";
 
 jest.mock("../../api/application");
 jest.mock("../../common/Auth");