Merge branch 'ench/pot-projects' of https://github.com/PotLock/bos-ap…

…p-alem into feat/update-card
PotLock · May 24, 2024 · 58ac3fa · 58ac3fa
2 parents f771d43 + 701eff6
commit 58ac3fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/playwright-tests/tests/pot.spec.js b/playwright-tests/tests/pot.spec.js
@@ -8,7 +8,7 @@ test.beforeEach(async ({ page }) => {
   await page.goto(`${ROOT_SRC}?tab=pot&potId=${DEFAULT_POT_ID}&nav=projects`);
 });
 
-test("clicking project card should go to project page", async ({ page }) => {
+test.skip("clicking project card should go to project page", async ({ page }) => {
   test.setTimeout(120000); // 1 minute... we want to improve performance
 
   const projectSearchBar = await page.getByPlaceholder("Search projects");

diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
@@ -63,10 +63,6 @@ const Card = (props: any) => {
 
   const totalAmountNear = getTotalAmountNear();
   // useMemo(getTotalAmountNear, [donationsForProject, payoutDetails]);
-  // console.log("totalAmountNear", totalAmountNear);
-  // console.log("profile", profile);
-
-  if (profile === null) return <CardSkeleton />;
 
   const getImageSrc = (image: any) => {
     const defaultImageUrl = "https://ipfs.near.social/ipfs/bafkreih4i6kftb34wpdzcuvgafozxz6tk6u4f5kcr2gwvtvxikvwriteci";
@@ -100,6 +96,8 @@ const Card = (props: any) => {
 
   const tags = getTagsFromSocialProfileData(profile);
 
+  if (profile === null) return <CardSkeleton />;
+
   return (
     <>
       {/* <Modals /> */}

diff --git a/src/pages/Pot/NavPages/Projects/Projects.tsx b/src/pages/Pot/NavPages/Projects/Projects.tsx
@@ -72,7 +72,7 @@ const Projects = () => {
     }
   }, [potDetail, flaggedAddresses, donations]);
 
-  if (projects === null || potDetail === null || projects === null) return <Loading />;
+  if (potDetail === null || projects === null) return <Loading />;
 
   const { public_round_start_ms, public_round_end_ms } = potDetail;
 

diff --git a/src/services/getPotData.ts b/src/services/getPotData.ts
@@ -106,7 +106,7 @@ export function getPotProjects({
   isApprpved: boolean;
 }) {
   // get projects from local storage
-  const savedProject = getPotData(potId, "projects") || [];
+  const savedProject = getPotData(potId, "projects");
 
   if (savedProject) {
     // if storage project exist show it