Merge pull request #518 from PotLock/bug/pot-donation

fix active round in donation modal
PotLock · Apr 8, 2024 · 3f7da2e · 3f7da2e
2 parents ca3eafc + 8cb1d4f
commit 3f7da2e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/apps/potlock/widget/ModalDonation/Main.jsx b/apps/potlock/widget/ModalDonation/Main.jsx
@@ -284,17 +284,15 @@ const pots = useCache(
       }),
   "active-pots"
 );
-
 useEffect(() => {
   if (potId && !activeRounds) {
     setActiveRounds([potId]);
     State.update({
       selectedRound: potId,
       donationType: multiple ? "auto" : "pot",
     });
-  } else if (!activeRounds && projectId) {
+  } else if (!activeRounds?.length && projectId) {
     if (!pots) setActiveRounds([]);
-
     (pots ?? []).forEach((pot, idx) => {
       if (pot) {
         PotSDK.asyncGetApplicationByProjectId(pot, projectId)

diff --git a/apps/potlock/widget/Project/ExternalFunding.jsx b/apps/potlock/widget/Project/ExternalFunding.jsx
@@ -29,7 +29,7 @@ const Container = styled.div`
       div {
         font-weight: 600;
       }
-      @media screen and (max-width: 768px) {
+      @media screen and (max-width: 920px) {
         div {
           display: none;
         }
@@ -52,7 +52,7 @@ const Container = styled.div`
       div {
         text-transform: capitalize;
         width: 100%;
-        max-width: 156px;
+        max-width: 120px;
         text-align: left;
         &:last-of-type {
           justify-content: right;
@@ -81,8 +81,15 @@ const Container = styled.div`
         opacity: 0;
         display: none;
       }
-      @media screen and (max-width: 768px) {
+      .date {
+        display: flex;
+        align-items: center;
+      }
+      @media screen and (max-width: 920px) {
         gap: 8px;
+        .date {
+          order: 2;
+        }
         .description {
           flex-basis: 100%;
           order: 1;
@@ -107,6 +114,11 @@ const Container = styled.div`
         }
       }
     }
+    @media screen and (max-width: 920px) {
+      .header div:not(:first-of-type) {
+        display: none;
+      }
+    }
   }
 `;