Merge branch 'main' into 2670-application-page-indexer-data

gitcoinco · Feb 7, 2024 · bb7cc96 · bb7cc96
2 parents bb48482 + 555915b
commit bb7cc96
Show file tree

Hide file tree

Showing 49 changed files with 1,830 additions and 1,407 deletions.
diff --git a/packages/builder/src/__tests__/components/application/Form.test.tsx b/packages/builder/src/__tests__/components/application/Form.test.tsx
@@ -1,11 +1,12 @@
 import "@testing-library/jest-dom";
 import { act, fireEvent, screen, waitFor } from "@testing-library/react";
 import { Store } from "redux";
+import { RoundApplicationMetadata } from "data-layer";
 import * as projects from "../../../actions/projects";
 import { web3ChainIDLoaded } from "../../../actions/web3";
 import Form from "../../../components/application/Form";
 import setupStore from "../../../store";
-import { Metadata, Round, RoundApplicationMetadata } from "../../../types";
+import { Metadata, Round } from "../../../types";
 import { addressFrom, renderWrapped } from "../../../utils/test_utils";
 import * as utils from "../../../utils/utils";
 

diff --git a/packages/builder/src/__tests__/components/grants/List.test.tsx b/packages/builder/src/__tests__/components/grants/List.test.tsx
@@ -342,7 +342,7 @@ describe("<List />", () => {
 
           renderWrapped(<List />, store);
 
-          expect(screen.getByText("Apply")).toBeInTheDocument();
+          expect(screen.getByText("Apply to Grant Round")).toBeInTheDocument();
         });
 
         test("should not be visible if user already applied", async () => {

diff --git a/packages/builder/src/__tests__/components/providers/Github.test.tsx b/packages/builder/src/__tests__/components/providers/Github.test.tsx
@@ -56,11 +56,6 @@ describe("<Github />", () => {
           store
         );
       });
-
-      // console.log(screen.debug());
-      // TO BE ENABLE
-      // should not be a problem with REACT_APP_PASSPORT_IAM_URL properly set
-      // expect(screen.queryByText("Verified")).toBeInTheDocument();
     });
 
     test("should not show the badge if the verified account is different from the current one in the form", async () => {

diff --git a/packages/builder/src/__tests__/components/rounds/Show.test.tsx b/packages/builder/src/__tests__/components/rounds/Show.test.tsx
@@ -11,6 +11,7 @@ import {
   addressFrom,
   buildProjectMetadata,
   buildRound,
+  now,
   renderWrapped,
 } from "../../../utils/test_utils";
 
@@ -42,19 +43,19 @@ describe("<Show />", () => {
     });
 
     const pastRound = buildRound({
-      address: addressFrom(1),
-      applicationsStartTime: 0,
-      applicationsEndTime: 0,
-      roundStartTime: 0,
-      roundEndTime: 0,
+      address: addressFrom(2),
+      applicationsStartTime: now - 7200,
+      applicationsEndTime: now - 3600,
+      roundStartTime: now - 3600,
+      roundEndTime: now - 600,
     });
 
     const futureRound = buildRound({
-      address: addressFrom(1),
-      applicationsStartTime: Date.now() / 1000 + 60 * 30,
-      applicationsEndTime: Date.now() / 1000 + 60 * 60,
-      roundStartTime: Date.now() / 1000 + 60 * 60,
-      roundEndTime: Date.now() / 1000 + 60 * 120,
+      address: addressFrom(3),
+      applicationsStartTime: now + 3600,
+      applicationsEndTime: now + 7200,
+      roundStartTime: now + 7200,
+      roundEndTime: now + 12000,
     });
 
     store.dispatch(web3ChainIDLoaded(5));