resolve conflicts

gitcoinco · Mar 7, 2022 · 7c7d0f8 · 7c7d0f8
2 parents 37a0636 + 9750be8
commit 7c7d0f8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/app/assets/v2/js/cart-ethereum-polygon.js b/app/assets/v2/js/cart-ethereum-polygon.js
@@ -269,8 +269,8 @@ Vue.component('grantsCartEthereumPolygon', {
           return;
         }
 
-        // Some grants are multisig, so we display modal to prompt the split of the cart
-        if (this.multisigGrants.length < this.grantsByTenant.length) {
+        // If some grants are multisig, we display modal to prompt the split of the cart
+        if (this.multisigGrants.length > 0 && this.multisigGrants.length < this.grantsByTenant.length) {
           this.polygon.showModal = true;
           return;
         }

diff --git a/app/grants/templates/grants/cart/eth_polygon.html b/app/grants/templates/grants/cart/eth_polygon.html
@@ -2,7 +2,7 @@
 {% load static i18n %}
 <b-tab title-link-class="nav-line" id="ETH_POLYGON" v-if="grantsCountByTenant.ETH_POLYGON !== undefined">
   <template v-slot:title><img class="mr-2" src="{% static 'v2/images/chains/ethereum.svg' %}" alt="" height="16">
-     <b>Ethereum / Polygon ([[grantsCountByTenant.ETH || 0]])</b>
+    <b>Ethereum / Polygon ([[grantsCountByTenant.ETH_POLYGON || 0]])</b>
   </template>
   <div class="row">
     <!-- Left Section -->

diff --git a/app/grants/templates/grants/cart/polygon_modal.html b/app/grants/templates/grants/cart/polygon_modal.html
@@ -37,7 +37,7 @@
   </template>
 
   <!-- Main content -->
-  <template v-if="multisigGrants.length < grantsByTenant.length" v-slot:default="{ hide }">
+  <template v-if="multisigGrants.length > 0 && multisigGrants.length < grantsByTenant.length" v-slot:default="{ hide }">
     <div class="px-4 text-left">
       <h3 class="mb-3 text-black">Only some of these Grants can receive funds on Polygon</h3>
       <p class="text-grey-400 font-body">

diff --git a/app/retail/templates/mission.html b/app/retail/templates/mission.html
@@ -221,6 +221,16 @@ <h4>Transcending the Individualist & Collectivist Divide - Kevin Owocki @ DAO Re
               <br>
               <br>
 
+              <h4>Quadratic Funding for Colorado - ETHDenver 2022 </h4>
+              <iframe width="650" height="350" src="https://www.youtube.com/embed/9KzzXOa78OU?list=PLvTrX8LNPbPkED8-JxUsFMzoicKRmsrfn" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+              <br>
+              <br>
+
+              <h4>Take the Green Pill - ETHDenver 2022 </h4>
+              <iframe width="650" height="350" src="https://www.youtube.com/embed/qP7wqLWV33M?list=PLvTrX8LNPbPkED8-JxUsFMzoicKRmsrfn" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+              <br>
+              <br>
+