Merge branch 'PotLock:main' into main

PotLock · Apr 25, 2024 · ea778fa · ea778fa
2 parents 049ab39 + b5892cb
commit ea778fa
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 4 deletions.
diff --git a/apps/potlock/widget/Pots/Card.jsx b/apps/potlock/widget/Pots/Card.jsx
@@ -259,7 +259,10 @@ const Tag = (props) => (
 );
 
 return (
-  <Card href={props.hrefWithParams(`?tab=pot&potId=${potId}`)}>
+  <Card
+    href={props.hrefWithParams(`?tab=pot&potId=${potId}`)}
+    data-testid={applicationOpen ? "active-pot" : "inactive-pot"}
+  >
     <CardSection>
       <Title>{title}</Title>
       <Description>

diff --git a/apps/potlock/widget/Pots/Header.jsx b/apps/potlock/widget/Pots/Header.jsx
@@ -65,12 +65,13 @@ const applicationExists = existingApplication || applicationSuccess;
 
 const now = Date.now();
 const publicRoundOpen = now >= public_round_start_ms && now < public_round_end_ms;
+const publicRoundEnded = now > public_round_end_ms;
 
 const applicationOpen = now >= application_start_ms && now < application_end_ms;
 
 const canApply = applicationOpen && !applicationExists && !userIsChefOrGreater;
 
-const canPayoutsBeSet = userIsChefOrGreater && !cooldown_end_ms && !all_paid_out;
+const canPayoutsBeSet = userIsChefOrGreater && !all_paid_out && publicRoundEnded;
 
 const canPayoutsBeProcessed = userIsAdminOrGreater && now >= cooldown_end_ms && !all_paid_out;
 
@@ -155,6 +156,7 @@ const Fund = styled.div`
 `;
 const ButtonsWrapper = styled.div`
   display: flex;
+  flex-wrap: wrap;
   gap: 2rem;
   a,
   button {

diff --git a/apps/potlock/widget/Project/ListPage.jsx b/apps/potlock/widget/Project/ListPage.jsx
@@ -507,7 +507,7 @@ const [projects, approvedProjects] = useMemo(() => {
   return [allRegistrations, approvedProjects];
 }, allRegistrations);
 
-const featuredProjectIds = ["magicbuild.near", "potlock.near", "yearofchef.near"];
+const featuredProjectIds = ["v1.foodbank.near", "potlock.near", "yearofchef.near"];
 const featuredProjects = useMemo(
   () => projects.filter((project) => featuredProjectIds.includes(project.registrant_id)),
   projects

diff --git a/playwright-report/index.html b/playwright-report/index.html
diff --git a/playwright-tests/tests/pots.spec.js b/playwright-tests/tests/pots.spec.js
@@ -53,7 +53,16 @@ test("clicking learn more button should...", async ({ page }) => {
 });
 
 test("should show active pots", async ({ page }) => {
-  // TODO:
+  await page.goto(`${ROOT_SRC}?tab=pots`);
+
+  const activePots = page.locator('[data-testid="active-pot"]');
+
+  await activePots.first().waitFor();
+
+  const count = await activePots.count();
+  for (let i = 0; i < count; i++) {
+    await expect(activePots.nth(i)).toBeVisible();
+  }
 });
 
 test("should show completed pots", async ({ page }) => {