From 5145e2ad2ec199e9971a4ad79e368055edd363bc Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 2 Mar 2022 07:13:17 -0700
Subject: [PATCH 1/2] adds talks to mission page

---
 app/retail/templates/mission.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/retail/templates/mission.html b/app/retail/templates/mission.html
index 3afc7c1decd..617143f31a8 100644
--- 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>
+
 
 
 

From ce4b952e516a99c36f1b9540127b37fed4316fa1 Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Thu, 3 Mar 2022 06:17:19 +0100
Subject: [PATCH 2/2] fix regular cart checkout with no multisig (#10235)

---
 app/assets/v2/js/cart-ethereum-polygon.js           | 4 ++--
 app/grants/templates/grants/cart/eth_polygon.html   | 2 +-
 app/grants/templates/grants/cart/polygon_modal.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/v2/js/cart-ethereum-polygon.js b/app/assets/v2/js/cart-ethereum-polygon.js
index b20fe11320a..f2e3ba4c466 100644
--- 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
index 71b4f5c1cf3..1e317cb7c59 100644
--- 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"
-      style="padding-bottom: 2.5rem;"> <b>Ethereum / Polygon ([[grantsCountByTenant.ETH || 0]])</b></template>
+      style="padding-bottom: 2.5rem;"> <b>Ethereum / Polygon ([[grantsCountByTenant.ETH_POLYGON || 0]])</b></template>
   <div class="row">
     <!-- Left Section -->
     <div class="col-12 col-lg-8 pr-0">
diff --git a/app/grants/templates/grants/cart/polygon_modal.html b/app/grants/templates/grants/cart/polygon_modal.html
index 774dc0fc6c5..901c1f55f38 100644
--- 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">