From 9913c2c1bd839cc09f052e554f96d717bf1a8306 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Mon, 8 Feb 2021 11:07:34 -0700
Subject: [PATCH 1/6] bad str() , fixeds
 https://sentry.io/organizations/gitcoin/issues/2206513735/?project=1398424&query=is%3Aunresolved&statsPeriod=14d

---
 app/dashboard/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index f97098e87ee..0364623453c 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -4932,7 +4932,7 @@ class BlockedIP(SuperModel):
 
     def __str__(self):
         """Return the string representation of a BlockedIP."""
-        return f'<BlockedIP: {self.ip_address}>'
+        return f'<BlockedIP: {self.addr}>'
 
 
 class Sponsor(SuperModel):

From ca8e097d3e7e676cb4060b14aaa5023d1938a084 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Mon, 8 Feb 2021 15:32:08 -0300
Subject: [PATCH 2/6] fix hackathon events to mtc

---
 app/dashboard/templates/dashboard/hackathon/onboard.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/dashboard/templates/dashboard/hackathon/onboard.html b/app/dashboard/templates/dashboard/hackathon/onboard.html
index f603479b6d7..7e1ceb2bdb8 100644
--- a/app/dashboard/templates/dashboard/hackathon/onboard.html
+++ b/app/dashboard/templates/dashboard/hackathon/onboard.html
@@ -510,9 +510,9 @@ <h4 class="font-header font-weight-bold pt-0 mb-5">{{ question.text }}{{ questio
           const sendRegister = fetchData(url, 'POST', data, {'X-CSRFToken': csrftoken});
 
           $('[data-registration]').attr('disabled', true);
-          $.when(sendRegister).then((response) => {
+          $.when(sendRegister).then(async(response) => {
 
-            sendMtcEvent(name)
+            await sendMtcEvent(name)
             _alert('You have now registered for this hackathon.', 'success');
             document.location.href = response.redirect;
           })

From 799398b0af9ca27e869eecb9b0c3bd2f872799d5 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Mon, 8 Feb 2021 16:03:56 -0300
Subject: [PATCH 3/6] missing await

---
 app/dashboard/templates/dashboard/hackathon/onboard.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/dashboard/templates/dashboard/hackathon/onboard.html b/app/dashboard/templates/dashboard/hackathon/onboard.html
index 7e1ceb2bdb8..947eb409920 100644
--- a/app/dashboard/templates/dashboard/hackathon/onboard.html
+++ b/app/dashboard/templates/dashboard/hackathon/onboard.html
@@ -532,8 +532,8 @@ <h4 class="font-header font-weight-bold pt-0 mb-5">{{ question.text }}{{ questio
             const sendRegister = fetchData(url, 'POST', data, {'X-CSRFToken': csrftoken});
 
             $('#poll-submit').attr('disabled', true);
-            $.when(sendRegister).then((response) => {
-              sendMtcEvent(name)
+            $.when(sendRegister).then(async(response) => {
+              await sendMtcEvent(name)
               _alert('You have now registered for this hackathon.', 'success');
               console.log(response)
               document.location.href = response.redirect;

From 41cfb5fe71aceb8f9053b1e8999e1f4f41434dde Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Mon, 8 Feb 2021 20:18:19 -0300
Subject: [PATCH 4/6] remove crossorigin

---
 app/app/templates/shared/sentry.html             |  2 +-
 app/dashboard/templates/ftux/avatar.html         | 10 +++++-----
 app/grants/templates/grants/faq.html             |  2 +-
 app/grants/templates/grants/index.html           |  2 +-
 app/inbox/templates/inbox.html                   |  2 +-
 .../templates/shared/ptokens_buy_faq.html        |  6 +++---
 app/ptokens/templates/shared/ptokens_faq.html    |  6 +++---
 .../templates/shared/ptokens_make_faq.html       |  2 +-
 app/retail/templates/email_unsubscribed.html     |  4 ++--
 .../emails/recap/weekly_founder_recap.html       | 16 ++++++++--------
 app/retail/templates/shared/footer_scripts.html  |  2 +-
 .../templates/shared/footer_scripts_lite.html    |  2 +-
 app/retail/templates/shared/head.html            |  6 +++---
 13 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/app/templates/shared/sentry.html b/app/app/templates/shared/sentry.html
index 7efab7eee9c..dbf37d44faf 100644
--- a/app/app/templates/shared/sentry.html
+++ b/app/app/templates/shared/sentry.html
@@ -15,7 +15,7 @@
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 {% endcomment %}
 {% if raven_js_dsn %}
-  <script src="https://cdn.ravenjs.com/{{ raven_js_version|default_if_none:'3.26.4' }}/raven.min.js" crossorigin="anonymous"></script>
+  <script src="https://cdn.ravenjs.com/{{ raven_js_version|default_if_none:'3.26.4' }}/raven.min.js"  ></script>
   <script>
     var ravenOptions = {
       release: '{{ release }}',
diff --git a/app/dashboard/templates/ftux/avatar.html b/app/dashboard/templates/ftux/avatar.html
index 4cb6b6af00a..64e24e5ee83 100644
--- a/app/dashboard/templates/ftux/avatar.html
+++ b/app/dashboard/templates/ftux/avatar.html
@@ -226,10 +226,10 @@ <h3 id="section-title">
           {% if ids|length > 1 %}
             <div class="category {{category}} {% if category != 'background' %}hidden{% endif %}">
               {% for id in ids %}
-                <img class=tdselection data-id="{{id}}" 
-                data-src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}" 
-                data-altsrc="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}" 
-                {% if category == 'background' %}src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"{%endif%}>            
+                <img class=tdselection data-id="{{id}}"
+                data-src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"
+                data-altsrc="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"
+                {% if category == 'background' %}src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"{%endif%}>
               {% endfor %}
             </div>
           {% endif %}
@@ -251,7 +251,7 @@ <h3 id="section-title">
 {% endif %}
 
 <script src="{% static "v2/js/lib/jquery.js" %}"></script>
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
 <script>
   var profileId = '{{ profile_id }}';
   var options = {
diff --git a/app/grants/templates/grants/faq.html b/app/grants/templates/grants/faq.html
index 56098899da3..67e866198b4 100644
--- a/app/grants/templates/grants/faq.html
+++ b/app/grants/templates/grants/faq.html
@@ -60,4 +60,4 @@ <h5 class="accordion font-subheader">Where can I see my Grant contribution histo
     </div>
   </div>
 </section>
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
diff --git a/app/grants/templates/grants/index.html b/app/grants/templates/grants/index.html
index 22dc2df78be..5d561cc9446 100644
--- a/app/grants/templates/grants/index.html
+++ b/app/grants/templates/grants/index.html
@@ -202,7 +202,7 @@
     <script src="{% static "v2/js/grants/index.js" %}"></script>
     <script src="{% static "v2/js/grants/funding.js" %}"></script>
     <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
-    <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+    <script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
 </body>
 
 
diff --git a/app/inbox/templates/inbox.html b/app/inbox/templates/inbox.html
index 1cb3f9001a5..20299895dc4 100644
--- a/app/inbox/templates/inbox.html
+++ b/app/inbox/templates/inbox.html
@@ -88,6 +88,6 @@
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' with slim=1 %}
     <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
-    <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+    <script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
   </body>
 </html>
diff --git a/app/ptokens/templates/shared/ptokens_buy_faq.html b/app/ptokens/templates/shared/ptokens_buy_faq.html
index 60b587fa44a..fa6f6b37047 100644
--- a/app/ptokens/templates/shared/ptokens_buy_faq.html
+++ b/app/ptokens/templates/shared/ptokens_buy_faq.html
@@ -36,8 +36,8 @@ <h5 class="accordion">Where do I see a user’s time token?</h5>
     <div class="mb-3 faq-item">
       <h5 class="accordion">How do I use a time token?</h5>
       <div class="panel">
-        <p>Once you’ve acquired a time token, you’ll need to submit a redemption request. 
-        This request can be used on any of the Creators listed uses, and only for those uses. 
+        <p>Once you’ve acquired a time token, you’ll need to submit a redemption request.
+        This request can be used on any of the Creators listed uses, and only for those uses.
         Please note that it’s up to the creator to determine whether or not your request is appropriate, so please give them 24-48 hours to respond to your request.</p>
       </div>
     </div>
@@ -56,4 +56,4 @@ <h5 class="accordion">A Creator accepted my request and did not meet my expectat
       </div>
     </div>
 
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
diff --git a/app/ptokens/templates/shared/ptokens_faq.html b/app/ptokens/templates/shared/ptokens_faq.html
index eca7a71be6c..92a7127557a 100644
--- a/app/ptokens/templates/shared/ptokens_faq.html
+++ b/app/ptokens/templates/shared/ptokens_faq.html
@@ -37,8 +37,8 @@ <h5 class="accordion">Where do I see a user’s time token?</h5>
     <div class="mb-3 faq-item">
       <h5 class="accordion">How do I use a time token?</h5>
       <div class="panel">
-        <p>Once you’ve acquired a time token, you’ll need to submit a redemption request. 
-        This request can be used on any of the Creators listed uses, and only for those uses. 
+        <p>Once you’ve acquired a time token, you’ll need to submit a redemption request.
+        This request can be used on any of the Creators listed uses, and only for those uses.
         Please note that it’s up to the creator to determine whether or not your request is appropriate, so please give them 24-48 hours to respond to your request.</p>
       </div>
     </div>
@@ -57,4 +57,4 @@ <h5 class="accordion">A Creator accepted my request and did not meet my expectat
       </div>
     </div>
 </section>
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
diff --git a/app/ptokens/templates/shared/ptokens_make_faq.html b/app/ptokens/templates/shared/ptokens_make_faq.html
index f4a1ebf9936..0a96d5a2bb8 100644
--- a/app/ptokens/templates/shared/ptokens_make_faq.html
+++ b/app/ptokens/templates/shared/ptokens_make_faq.html
@@ -61,4 +61,4 @@ <h5 class="accordion">What happens when I accept a request?</h5>
       </div>
     </div>
 
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
diff --git a/app/retail/templates/email_unsubscribed.html b/app/retail/templates/email_unsubscribed.html
index 964f1616889..5cae518d0a9 100644
--- a/app/retail/templates/email_unsubscribed.html
+++ b/app/retail/templates/email_unsubscribed.html
@@ -48,5 +48,5 @@ <h6 class="mt-4">{% trans 'Unsubscribe Successful' %}</h6>
 
 <!-- jQuery -->
 <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
-</html>
\ No newline at end of file
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
+</html>
diff --git a/app/retail/templates/emails/recap/weekly_founder_recap.html b/app/retail/templates/emails/recap/weekly_founder_recap.html
index f024b634ec6..6539d17fcb1 100644
--- a/app/retail/templates/emails/recap/weekly_founder_recap.html
+++ b/app/retail/templates/emails/recap/weekly_founder_recap.html
@@ -18,7 +18,7 @@
 {% load i18n humanize %}
 {% load static %}
 {% block content %}
-<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"  >
   <style type="text/css">
     .g-icon {
       width: 1em;
@@ -63,13 +63,13 @@
       color: #C70018;
       border-color: #D2D2D2;
     }
-    
+
     .bold {
       font-weight: bold;
     }
     .header {
        /*width: 100%;*/
-       border-bottom: 1px solid; 
+       border-bottom: 1px solid;
        margin-top: 3em;
     }
     .leftAlign {
@@ -82,7 +82,7 @@
     .imgGitcoinStyle {
       max-height:50px; max-width:100%; border:2px solid #1AB56D; border-radius:100%;
     }
-    .contentOverall { 
+    .contentOverall {
       padding-bottom: 3em;
       padding-top: 1em;
     }
@@ -91,7 +91,7 @@
     }
     .section_row_entry {
       padding-bottom: 1.5em;
-      
+
     }
     body {
       background-color: #f2f6f9;
@@ -101,7 +101,7 @@
       justify-content: center; /* align horizontal */
       align-items: center; /* align vertical */
     }
-    
+
     @media (max-width: 576px) {
       .middlecenter-2 {
         display: flex;
@@ -110,7 +110,7 @@
       }
     }
     @media (min-width: 576px) {
-      
+
       .middlecenter-2 {
         text-align: left;
         align-items: left;
@@ -127,7 +127,7 @@
       <h2>{% trans "Your weekly bounties recap" %}</h2>
       <div>{{ select_params.to }} - {{ select_params.from }}</div>
       <div class="bold">{{profile.handle}}</div>
-    
+
       {% for section in sections %}
         <div class="{{section.header_css}} header leftAlign">
           <i class="g-icon g-icon__dot-circle"></i>&nbsp;{{section.header_name}}
diff --git a/app/retail/templates/shared/footer_scripts.html b/app/retail/templates/shared/footer_scripts.html
index 5708b2420b7..9fbefb2c8c3 100644
--- a/app/retail/templates/shared/footer_scripts.html
+++ b/app/retail/templates/shared/footer_scripts.html
@@ -39,7 +39,7 @@
 
 {% include 'shared/sentry.html' %}
 <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
 <script src="{% static "v2/js/lib/bootstrap-vue.min.js" %}"></script>
 <script src="https://cdn.jsdelivr.net/npm/vue-select@3.10.8"></script>
 
diff --git a/app/retail/templates/shared/footer_scripts_lite.html b/app/retail/templates/shared/footer_scripts_lite.html
index 21faa887a82..60ed63a05e3 100644
--- a/app/retail/templates/shared/footer_scripts_lite.html
+++ b/app/retail/templates/shared/footer_scripts_lite.html
@@ -36,7 +36,7 @@
 {% endif %}
 {% include 'shared/sentry.html' %}
 <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
-<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}"  ></script>
 <script src="{% static "v2/js/lib/bootstrap-vue.min.js" %}"></script>
 <script src="https://cdn.jsdelivr.net/npm/vue-select@3.10.8"></script>
 
diff --git a/app/retail/templates/shared/head.html b/app/retail/templates/shared/head.html
index 9495195d869..d167d3f0c29 100644
--- a/app/retail/templates/shared/head.html
+++ b/app/retail/templates/shared/head.html
@@ -19,7 +19,7 @@
 <meta charset="utf-8">
 <link rel="preload" href="{% static "v2/css/base.css" %}" as="style">
 <link rel="preload" href="{% static "v2/css/gitcoin.css" %}" as="style">
-<link rel="preload" href="{% static "v2/css/bootstrap.min.css" %}" as="style" crossorigin="anonymous">
+<link rel="preload" href="{% static "v2/css/bootstrap.min.css" %}" as="style"  >
 <link rel="preload" href="{% static "v2/css/top-nav.css" %}" as="style">
 <link rel="preload" href="{% static "v2/css/fontawesome-all.min.css" %}" as="style">
 <link rel="preload" href="{% static "v2/css/lib/typography.css" %}" as="style">
@@ -30,11 +30,11 @@
 <link rel="preload" href="{% static "v2/fonts/muli/muli-v12-latin-600.woff2" %}" as="font" type="font/woff2" crossorigin>
 <link rel="preload" href="{% static "v2/fonts/muli/muli-v12-latin-700.woff2" %}" as="font" type="font/woff2" crossorigin>
 
-<link rel="preload" href="{% static "v2/js/lib/bootstrap.min.js" %}" as="script" crossorigin="anonymous">
+<link rel="preload" href="{% static "v2/js/lib/bootstrap.min.js" %}" as="script"  >
 
 <link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml" />
 <link rel="stylesheet" href="{% static "v2/css/search.css" %}">
-<link rel="stylesheet" href="{% static "v2/css/bootstrap.min.css" %}" crossorigin="anonymous">
+<link rel="stylesheet" href="{% static "v2/css/bootstrap.min.css" %}"  >
 <link rel="stylesheet" href='{% static "v2/css/bootstrap-vue.min.css" %}'/>
 <link rel="stylesheet" href="{% static "v2/css/lib/typography.css" %}">
 <link rel="stylesheet" href="{% static "v2/css/fontawesome-all.min.css" %}">

From 89b20ea4d57dac8e56cd6ee1963db9c9f592f6d2 Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Tue, 9 Feb 2021 18:20:49 +0100
Subject: [PATCH 5/6] expire against modified timestamp (#8374)

---
 app/dashboard/management/commands/sync_pending_fulfillments.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dashboard/management/commands/sync_pending_fulfillments.py b/app/dashboard/management/commands/sync_pending_fulfillments.py
index 854bf9428e7..45af912c93a 100644
--- a/app/dashboard/management/commands/sync_pending_fulfillments.py
+++ b/app/dashboard/management/commands/sync_pending_fulfillments.py
@@ -65,7 +65,7 @@ def handle(self, *args, **options):
         if qr_pending_fulfillments:
             # Auto expire pending transactions
             timeout_period = timezone.now() - timedelta(minutes=20)
-            qr_pending_fulfillments.filter(created_on__lt=timeout_period).update(payout_status='expired')
+            qr_pending_fulfillments.filter(modified_on__lt=timeout_period).update(payout_status='expired')
 
             fulfillments = qr_pending_fulfillments.filter(payout_status='pending')
             for fulfillment in fulfillments.all():

From be2422cc0a3597ae46f39c14cfcd9aff6d3885f0 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 9 Feb 2021 17:12:54 -0300
Subject: [PATCH 6/6] change mautic request to patch

---
 app/assets/v2/js/mautic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/v2/js/mautic.js b/app/assets/v2/js/mautic.js
index cb63f02d20f..7be1530e123 100644
--- a/app/assets/v2/js/mautic.js
+++ b/app/assets/v2/js/mautic.js
@@ -89,7 +89,7 @@ class MauticEvent {
     // let dataMock = this.dataMock(data)
 
     fetch(contactApi, {
-      method: 'PUT',
+      method: 'PATCH',
       headers: {
         'Accept': 'application/json',
         'Content-Type': 'application/json'