From 3ff2a871ba4747c8d5b6407553328fcc7db2821f Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Tue, 9 Mar 2021 22:46:42 +0530
Subject: [PATCH 01/30] remove grant funding UI

---
 app/grants/templates/grants/shared/sidebar_search.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/grants/templates/grants/shared/sidebar_search.html b/app/grants/templates/grants/shared/sidebar_search.html
index 9f959e7593b..a0936a2ea4d 100644
--- a/app/grants/templates/grants/shared/sidebar_search.html
+++ b/app/grants/templates/grants/shared/sidebar_search.html
@@ -82,9 +82,6 @@
           <template v-for="grant_type in grant_types" v-if="grant_type.is_visible || round_num">
             <li class="mr-1 d-flex">
               <a @click="filterLink({type: grant_type.keyword, category: ''})"  :data-type="grant_type.keyword" :class="`d-inline-block text-truncate mr-1  ${type == grant_type.keyword ? 'selected' : ''}`">
-                <template v-if="grant_type.funding_ui != '$0k'">
-                  <b>[[grant_type.funding_ui]]</b> -
-                </template>
                 [[grant_type.label]] <sup>([[grant_type.count]])</sup>
               </a>
               <a v-b-toggle='grant_type.keyword' href="#example-collapse" @click.prevent class="mx-1">

From aee9ced91b067f9556e5acb191d9812f99dd597d Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 10:40:31 -0700
Subject: [PATCH 02/30] shuffles the ranking of collections in the UI ever few
 hours

---
 .../commands/grant_collections_shuffle.py     | 36 +++++++++++++++++++
 .../0114_grantcollection_shuffle_rank.py      | 18 ++++++++++
 app/grants/models.py                          |  1 +
 app/grants/views.py                           |  2 +-
 scripts/crontab                               |  1 +
 5 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 app/grants/management/commands/grant_collections_shuffle.py
 create mode 100644 app/grants/migrations/0114_grantcollection_shuffle_rank.py

diff --git a/app/grants/management/commands/grant_collections_shuffle.py b/app/grants/management/commands/grant_collections_shuffle.py
new file mode 100644
index 00000000000..6713d09b499
--- /dev/null
+++ b/app/grants/management/commands/grant_collections_shuffle.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+"""Define the Grant subminer management command.
+
+Copyright (C) 2020 Gitcoin Core
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""
+
+import random
+
+from django.core.management.base import BaseCommand
+
+from grants.models import GrantCollection
+
+
+class Command(BaseCommand):
+
+    help = 'grant collection shuffle'
+
+    def handle(self, *args, **options):
+        for gc in GrantCollection.objects.filter(hidden=False):
+            gc.shuffle_rank = random.randint(0,99999)
+            gc.save()
+        print('done')
diff --git a/app/grants/migrations/0114_grantcollection_shuffle_rank.py b/app/grants/migrations/0114_grantcollection_shuffle_rank.py
new file mode 100644
index 00000000000..068d288460d
--- /dev/null
+++ b/app/grants/migrations/0114_grantcollection_shuffle_rank.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2021-03-09 17:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0113_grantapikey'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='grantcollection',
+            name='shuffle_rank',
+            field=models.PositiveIntegerField(db_index=True, default=1),
+        ),
+    ]
diff --git a/app/grants/models.py b/app/grants/models.py
index 5926157bac1..a43b4f40023 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -2044,6 +2044,7 @@ class GrantCollection(SuperModel):
     cache = JSONField(default=dict, blank=True, help_text=_('Easy access to grant info'),)
     featured = models.BooleanField(default=False, help_text=_('Show grant as featured'))
     objects = CollectionsQuerySet.as_manager()
+    shuffle_rank = models.PositiveIntegerField(default=1, db_index=True)
     curators = models.ManyToManyField(blank=True, to='dashboard.Profile', help_text=_('List of allowed curators'))
 
     def generate_cache(self):
diff --git a/app/grants/views.py b/app/grants/views.py
index c9c678c0b15..60c25445e4b 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -482,7 +482,7 @@ def grants(request):
     return grants_by_grant_type(request, _type)
 
 
-def get_collections(user, keyword, sort='-modified_on', collection_id=None, following=None,
+def get_collections(user, keyword, sort='-shuffle_rank', collection_id=None, following=None,
                     idle_grants=None, only_contributions=None, featured=False):
     three_months_ago = timezone.now() - datetime.timedelta(days=90)
 
diff --git a/scripts/crontab b/scripts/crontab
index b831bfbc9fa..6d7035727ca 100644
--- a/scripts/crontab
+++ b/scripts/crontab
@@ -128,6 +128,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
 1 1 * * * cd gitcoin/coin; bash scripts/run_management_command.bash create_pagerank  > /var/log/gitcoin/create_pagerank.log  2>&1
 
 1 */4 * * * cd gitcoin/coin; bash scripts/run_management_command.bash grant_vitalik_shuffle  > /var/log/gitcoin/grant_vitalik_shuffle.log  2>&1
+1 */3 * * * cd gitcoin/coin; bash scripts/run_management_command.bash grant_collections_shuffle  > /var/log/gitcoin/grant_collections_shuffle.log  2>&1
 3 */8 * * * cd gitcoin/coin; bash scripts/run_management_command.bash re_rank_quests  > /var/log/gitcoin/re_rank_quests.log  2>&1
 
 

From 78aef88302c497fe10df8f2daeb6cddaee6bacd8 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 14:33:24 -0700
Subject: [PATCH 03/30] fixes the clr calcs for which round a grant is in

---
 app/grants/models.py                          | 10 ++++++--
 .../management/commands/create_page_cache.py  | 25 -------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index a43b4f40023..9df9e34ccfd 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -219,6 +219,12 @@ class Meta:
     def __str__(self):
         return f"{self.round_num}"
 
+    @property
+    def happening_now(self):
+        # returns true if we are within the time range for this round
+        now = timezone.now()
+        return now >= self.start_date and now <= self.end_date
+
     @property
     def grants(self):
 
@@ -573,9 +579,9 @@ def calc_clr_round(self):
         clr_round = None
 
         # create_grant_active_clr_mapping
-        clr_rounds = GrantCLR.objects.filter(is_active=True)
+        clr_rounds = GrantCLR.objects.all()
         for this_clr_round in clr_rounds:
-            if self in this_clr_round.grants.all():
+            if self in this_clr_round.grants.all() and this_clr_round.is_active and this_clr_round.happening_now:
                 self.in_active_clrs.add(this_clr_round)
             else:
                 self.in_active_clrs.remove(this_clr_round)
diff --git a/app/perftools/management/commands/create_page_cache.py b/app/perftools/management/commands/create_page_cache.py
index 68a091cc45c..11ceae13a50 100644
--- a/app/perftools/management/commands/create_page_cache.py
+++ b/app/perftools/management/commands/create_page_cache.py
@@ -94,33 +94,8 @@ def create_grant_active_clr_mapping():
     # Upate grants mppping to active CLR rounds
     # NOTE: deprecated; this has been replaced by create_grant_clr_cache
     # by Owocki 12/16/2020
-    # return
-    from grants.models import Grant, GrantCLR
-
-    grants = Grant.objects.all()
-    clr_rounds = GrantCLR.objects.all()
-
-    # remove all old mapping
-    for clr_round in clr_rounds:
-        _grants = clr_round.grants
-        for _grant in grants:
-            _grant.in_active_clrs.remove(clr_round)
-            _grant.save()
-
     return
 
-    # update new mapping
-    # active_clr_rounds = clr_rounds.filter(is_active=True)
-    # for clr_round in active_clr_rounds:
-    #     grants_in_clr_round = grants.filter(**clr_round.grant_filters)
-
-    #     for grant in grants_in_clr_round:
-    #         grant_has_mapping_to_round = grant.in_active_clrs.filter(pk=clr_round.pk).exists()
-
-    #         if not grant_has_mapping_to_round:
-    #             grant.in_active_clrs.add(clr_round)
-    #             grant.save()
-
 def create_hack_event_cache():
     from dashboard.models import HackathonEvent
     for he in HackathonEvent.objects.all():

From 676398aa62ca01cd92841ad82ef36baf72cd01b4 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 15:04:02 -0700
Subject: [PATCH 04/30] perf optimization for clr round calc

---
 app/grants/models.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index 9df9e34ccfd..ba0c592492b 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -581,10 +581,11 @@ def calc_clr_round(self):
         # create_grant_active_clr_mapping
         clr_rounds = GrantCLR.objects.all()
         for this_clr_round in clr_rounds:
-            if self in this_clr_round.grants.all() and this_clr_round.is_active and this_clr_round.happening_now:
+            if this_clr_round.is_active and this_clr_round.happening_now and self in this_clr_round.grants.all():
                 self.in_active_clrs.add(this_clr_round)
             else:
-                self.in_active_clrs.remove(this_clr_round)
+                if this_clr_round in self.in_active_clrs.all():
+                    self.in_active_clrs.remove(this_clr_round)
 
         # create_grant_clr_cache
         if self.in_active_clrs.count() > 0 and self.is_clr_eligible:

From c5f7d6fb1e67a172bf8639a245a47984c764f4bd Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 15:13:45 -0700
Subject: [PATCH 05/30] dont let inactive grants ever be in a round

---
 app/grants/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index ba0c592492b..0d155af5f54 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -581,7 +581,8 @@ def calc_clr_round(self):
         # create_grant_active_clr_mapping
         clr_rounds = GrantCLR.objects.all()
         for this_clr_round in clr_rounds:
-            if this_clr_round.is_active and this_clr_round.happening_now and self in this_clr_round.grants.all():
+            add_to_round = self.active and not self.hidden and this_clr_round.is_active and this_clr_round.happening_now and self in this_clr_round.grants.all()
+            if add_to_round:
                 self.in_active_clrs.add(this_clr_round)
             else:
                 if this_clr_round in self.in_active_clrs.all():

From cca33e2933c4b840d855e1b8dd362cd5e9188917 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 15:23:08 -0700
Subject: [PATCH 06/30] start dates and end dates didnt make sense

---
 app/grants/templates/grants/shared/active_clr_round.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/grants/templates/grants/shared/active_clr_round.html b/app/grants/templates/grants/shared/active_clr_round.html
index 38b78f4f816..abcb9d03cf0 100644
--- a/app/grants/templates/grants/shared/active_clr_round.html
+++ b/app/grants/templates/grants/shared/active_clr_round.html
@@ -41,7 +41,7 @@ <h5 class="font-weight-bold my-auto">
                     {% endif %}
                     <br />
                     <small class="font-body font-weight-semibold">
-                      {{active_round.start_date | date:'m/Y'}} - {{active_round.end_date | date:'m/Y'}}
+                      {{active_round.start_date | date:'m/d'}} - {{active_round.end_date | date:'m/d'}}
                     </small>
                   </h5>
                 </div>

From c73ba50f272bccc93e0919873e32cac0c13fd893 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Tue, 9 Mar 2021 19:36:48 -0700
Subject: [PATCH 07/30] small fix for the stats tab

---
 app/grants/templates/grants/detail/tabs.html | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/grants/templates/grants/detail/tabs.html b/app/grants/templates/grants/detail/tabs.html
index 7ff28de2118..8181d8282ea 100644
--- a/app/grants/templates/grants/detail/tabs.html
+++ b/app/grants/templates/grants/detail/tabs.html
@@ -299,7 +299,11 @@ <h4>{{ele.0}}: (avg {{ele.1.1|floatformat:2}})</h4>
                     {{ele.created_on|date:"Y/m/d"}}
                   </td>
                   <td>
-                    {{ele.data.impressions}}
+                    {% if ele.data.impressions > 0 %}
+                      {{ele.data.impressions}}
+                    {% else %}
+                      0
+                    {% endif %}
                   </td>
                   <td>
                     {{ele.data.in_cart}}
@@ -312,14 +316,6 @@ <h4>{{ele.0}}: (avg {{ele.1.1|floatformat:2}})</h4>
               </table>
               {% endif %}
 
-              <p class="sub-title font-weight-semibold font-caption mt-4 mb-1 pt-1">Contribution History (in USD)</p>
-              <div class="chart_container__content">
-                <div id="grant_chart"></div>
-              </div>
-              <div class="grant-status-list">
-                <p><span class="box box_1"></span>{% trans "Contributions" %}</p>
-                <p><span class="box box_2"></span>{% trans "CLR Matching Funds" %}</p>
-              </div>
             </div>
           </div>
           <script>

From 9b2b3d7de123488efed7202a24e7ec14b7b89103 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 21:28:52 -0700
Subject: [PATCH 08/30] show blockexplorer url of transaction in email, retires
 old "x times" language in emails (#8520)

* block explorer url on emails

* show the block explorer URL in emails

* update

Co-authored-by: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
---
 app/grants/models.py                                 | 10 ++++++++++
 .../templates/emails/grants/new_supporter.html       | 12 +++++++-----
 app/retail/templates/emails/grants/new_supporter.txt |  4 ++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index 0d155af5f54..eb956423d8b 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -1699,6 +1699,16 @@ class Contribution(SuperModel):
     )
     anonymous = models.BooleanField(default=False, help_text=_('Whether users can view the profile for this project or not'))
 
+    @property
+    def blockexplorer_url(self):
+        if self.checkout_type == 'eth_zksync':
+            return f'https://zkscan.io/explorer/transactions/{self.split_tx_id.replace("sync-tx:", "")}'
+        if self.checkout_type == 'eth_std':
+            network_sub = f"{{self.subscription.network}}." if self.subscription and self.subscription.network != 'mainnet' else ''
+            return f'https://{network_sub}etherscan.io/tx/{self.split_tx_id}'
+        # TODO: support all block explorers for diff chains
+        return ''
+
     def get_absolute_url(self):
         return self.subscription.grant.url + '?tab=transactions'
 
diff --git a/app/retail/templates/emails/grants/new_supporter.html b/app/retail/templates/emails/grants/new_supporter.html
index 7022965eedf..e710e5a7d67 100644
--- a/app/retail/templates/emails/grants/new_supporter.html
+++ b/app/retail/templates/emails/grants/new_supporter.html
@@ -61,13 +61,9 @@ <h1 style="text-transform: none;">{{ grant.title }}{% trans " has a new supporte
   <a class="supporterName" href="{% url 'profile' subscription.contributor_profile.handle %}">
     {{ subscription.contributor_profile.handle }}
   </a>
-  <p>{% trans "has begun contributing" %}</p>
+  <p>{% trans "has contributed" %}</p>
   <p style="padding-top:0;margin-top:.5rem">
     <strong>{{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} </strong>
-      {% if subscription.num_tx_approved > 1 %}
-        {% trans "every" %} {{ subscription.frequency }} {{ subscription.frequency_unit }}
-      {% endif %}
-    <strong> {{subscription.num_tx_approved|floatformat}} time{{ subscription.num_tx_approved|pluralize }}</strong>
   </p>
 
   {% if subscription.comments %}
@@ -83,8 +79,14 @@ <h1 style="text-transform: none;">{{ grant.title }}{% trans " has a new supporte
   {% endif %}
   <p>
     <a href="{{grant.url}}" class="button" style="display: inline-block; margin-top:10px;">View Grant</a>
+    {% if subscription.subscription_contribution.first.blockexplorer_url %}
+      <br>
+      <br>
+      <a href="{{subscription.subscription_contribution.first.blockexplorer_url}}">View transaction</a>
+    {% endif %}
 
   </p>
 </div>
 <hr>
 {% endblock %}
+
diff --git a/app/retail/templates/emails/grants/new_supporter.txt b/app/retail/templates/emails/grants/new_supporter.txt
index 934ea8e626f..447dce5a2eb 100644
--- a/app/retail/templates/emails/grants/new_supporter.txt
+++ b/app/retail/templates/emails/grants/new_supporter.txt
@@ -12,9 +12,9 @@
 
 {{ subscription.amount_per_period|floatformat:4|intcomma }}
 
-{% trans " has begun contributing" %}
+{% trans " has contributed" %}
 
-{{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} {% trans "per" %} {{ subscription.frequency }} {{ subscription.frequency_unit }}
+{{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }}
 
 {% trans "You can see the transaction on Etherscan" %} at
 {% if subscription.network == 'mainnet' %}

From d9d28f513de600fca170af5be0e8b043c0286fe4 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <ksowocki@gmail.com>
Date: Tue, 9 Mar 2021 21:29:00 -0700
Subject: [PATCH 09/30] fixes the pixelation of the collection images, and also
 allows generation of them without creating a collection (esp upon checkout)
 (#8523)

* img fixes for grants

* make fix

* performance considerations

* removes imgs

* Update grant-thanks-modal.js

Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
---
 app/app/static_storage.py                     | 10 +++---
 app/app/urls.py                               | 10 +++---
 app/assets/v2/js/grants/grant-thanks-modal.js |  8 +++++
 app/grants/admin.py                           | 15 +++++++++
 app/grants/models.py                          |  2 +-
 app/grants/urls.py                            | 20 ++++++------
 app/grants/utils.py                           | 10 ++++--
 app/grants/views.py                           | 31 ++++++++++++++++---
 app/retail/templates/admin/change_form.html   |  2 ++
 .../templates/shared/grant_thanks_modal.html  |  7 +++--
 10 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/app/app/static_storage.py b/app/app/static_storage.py
index 224de2426a5..dba05a1b880 100644
--- a/app/app/static_storage.py
+++ b/app/app/static_storage.py
@@ -36,7 +36,7 @@ def save(self, name, content):
         # Record the clean file content (pre gzip)
         file_content = content.file
         # Save remote copy to S3
-        super(SilentFileStorage, self).save(name, content)    
+        super(SilentFileStorage, self).save(name, content)
         # Only save files that are part of the compress blocks locally
         if ".scss" in name or ".js" in name or ".css" in name:
             # restore the clean file_content
@@ -52,14 +52,12 @@ def exists(self, name):
         # Check file exists on S3
         exists = super(SilentFileStorage, self).exists(name)
         # This is a hack to get a status report during S3ManifestStaticStorage._postProcess
-        print("INFO " + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + 
-            " - Checking for matching file hash on S3 - " + name + ": " + (
-                "Skipping based on matching file hashes" if exists else "Hashes did not match"
-            )
+        print(
+            "INFO " + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + " - Checking for matching file hash on S3 - " +
+            name + ": " + ("Skipping based on matching file hashes" if exists else "Hashes did not match")
         )
         return exists
 
-
     def url(self, name, force=True):
         """Handle catching bad URLs and return the name if route is unavailable."""
         try:
diff --git a/app/app/urls.py b/app/app/urls.py
index 17a655fd4c0..34194349d78 100644
--- a/app/app/urls.py
+++ b/app/app/urls.py
@@ -55,6 +55,7 @@
 from avatar.router import router as avatar_router
 from dashboard.router import router as dbrouter
 from grants.router import router as grant_router
+from grants.views import cart_thumbnail
 from kudos.router import router as kdrouter
 
 from .sitemaps import sitemaps
@@ -120,6 +121,9 @@
     re_path(r'^dynamic/kudos/(?P<kudos_id>\d+)/(?P<name>\w*)', kudos.views.image, name='kudos_dynamic_img'),
     re_path(r'^kudos/new/?', kudos.views.newkudos, name='newkudos'),
 
+
+    path('dynamic/grants_cart_thumb/<str:profile>/<str:grants>', cart_thumbnail, name='cart_thumbnail'),
+
     # mailing list
     url('mailing_list/funders/', dashboard.views.funders_mailing_list),
     url('mailing_list/hunters/', dashboard.views.hunters_mailing_list),
@@ -160,11 +164,7 @@
         dashboard.views.authenticate_idena,
         name='authenticate_idena'
     ),
-    url(
-        r'^api/v0.1/profile/(?P<handle>.*)/logout_idena',
-        dashboard.views.logout_idena,
-        name='logout_idena'
-    ),
+    url(r'^api/v0.1/profile/(?P<handle>.*)/logout_idena', dashboard.views.logout_idena, name='logout_idena'),
     url(
         r'^api/v0.1/profile/(?P<handle>.*)/recheck_idena_status',
         dashboard.views.recheck_idena_status,
diff --git a/app/assets/v2/js/grants/grant-thanks-modal.js b/app/assets/v2/js/grants/grant-thanks-modal.js
index e62a790c755..ce2f6c1970d 100644
--- a/app/assets/v2/js/grants/grant-thanks-modal.js
+++ b/app/assets/v2/js/grants/grant-thanks-modal.js
@@ -3,6 +3,7 @@ Vue.component('contribution-thanks-modal', {
   data: function() {
     return {
       modalId: 'contribution-thanks',
+      imgURL: '',
       numberOfContributions: 0,
       donations: [],
       tweetUrl: ''
@@ -12,6 +13,13 @@ Vue.component('contribution-thanks-modal', {
     const checkoutData = CartData.loadCheckedOut();
     const shouldShow = checkoutData.length > 0;
 
+    let grant_ids = '';
+
+    for (let i = 0; i < checkoutData.length; i++) {
+      grant_ids = grant_ids + checkoutData[i]['grant_id'] + ',';
+    }
+
+    this.imgURL = '/dynamic/grants_cart_thumb/' + document.contxt['github_handle'] + '/' + grant_ids;
     this.numberOfContributions = checkoutData.length;
 
     this.tweetUrl = `https://twitter.com/intent/tweet?text=I just funded ${this.numberOfContributions} grants on @gitcoin ${CartData.share_url()}`;
diff --git a/app/grants/admin.py b/app/grants/admin.py
index dee7af6cfff..588481ba5c8 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -479,6 +479,21 @@ def response_change(self, request, obj):
 class GrantCollectionAdmin(admin.ModelAdmin):
     list_display = ['pk', 'title', 'description', 'hidden', 'cache', 'featured']
     raw_id_fields = ['profile', 'grants', 'curators']
+    readonly_fields = ['img']
+
+
+    def response_change(self, request, obj):
+        if "_generate_cache" in request.POST:
+            obj.generate_cache()
+            self.message_user(request, "generated cache")
+        return redirect(obj.admin_url)
+
+    def img(self, instance):
+        try:
+            html = f'<img src="{instance.cover.url}">'
+            return mark_safe(html)
+        except:
+            return "N/A"
 
 
 class GrantBrandingRoutingPolicyAdmin(admin.ModelAdmin):
diff --git a/app/grants/models.py b/app/grants/models.py
index eb956423d8b..57285f5e83d 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -2077,7 +2077,7 @@ def generate_cache(self):
         }
 
         try:
-            cover = generate_collection_thumbnail(self, 348, 175)
+            cover = generate_collection_thumbnail(self, 348 * 5, 175 * 5)
             filename = f'thumbnail_{self.id}.png'
             buffer = BytesIO()
             cover.save(fp=buffer, format='PNG')
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 5a90e3a89fc..6368fbdab5f 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -20,15 +20,15 @@
 from django.urls import path, re_path
 
 from grants.views import (
-    add_grant_from_collection, bulk_fund, bulk_grants_for_cart, cancel_grant_v1, clr_grants, collection_thumbnail,
-    contribute_to_grants_v1, contribution_addr_from_all_as_json, contribution_addr_from_grant_as_json,
-    contribution_addr_from_grant_during_round_as_json, contribution_addr_from_round_as_json,
-    contribution_info_from_grant_during_round_as_json, create_matching_pledge_v1, flag, get_collection,
-    get_collections_list, get_ethereum_cart_data, get_grant_payload, get_grants, get_interrupted_contributions,
-    get_replaced_tx, grant_activity, grant_categories, grant_details, grant_details_api, grant_details_contributions,
-    grant_details_contributors, grant_edit, grant_fund, grant_new, grant_new_whitelabel, grants, grants_addr_as_json,
-    grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_info, grants_landing, grants_stats_view,
-    ingest_contributions, ingest_contributions_view, invoice, leaderboard, manage_ethereum_cart_data,
+    add_grant_from_collection, bulk_fund, bulk_grants_for_cart, cancel_grant_v1, cart_thumbnail, clr_grants,
+    collection_thumbnail, contribute_to_grants_v1, contribution_addr_from_all_as_json,
+    contribution_addr_from_grant_as_json, contribution_addr_from_grant_during_round_as_json,
+    contribution_addr_from_round_as_json, contribution_info_from_grant_during_round_as_json, create_matching_pledge_v1,
+    flag, get_collection, get_collections_list, get_ethereum_cart_data, get_grant_payload, get_grants,
+    get_interrupted_contributions, get_replaced_tx, grant_activity, grant_categories, grant_details, grant_details_api,
+    grant_details_contributions, grant_details_contributors, grant_edit, grant_fund, grant_new, grant_new_whitelabel,
+    grants, grants_addr_as_json, grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_info, grants_landing,
+    grants_stats_view, ingest_contributions, ingest_contributions_view, invoice, leaderboard, manage_ethereum_cart_data,
     new_matching_partner, profile, quickstart, remove_grant_from_collection, save_collection, subscription_cancel,
     toggle_grant_favorite, verify_grant,
 )
@@ -60,6 +60,8 @@
     path('bulk_cart', bulk_grants_for_cart, name='bulk_grants_for_cart'),
     path('<int:grant_id>/favorite', toggle_grant_favorite, name='favorite_grant'),
     path('activity', grant_activity, name='log_activity'),
+
+    path('cart_thumb/<str:profile>/<str:grants>', cart_thumbnail, name='cart_thumbnail'),
     path('<int:grant_id>/<slug:grant_slug>', grant_details, name='details'),
     path('<int:grant_id>/<slug:grant_slug>/', grant_details, name='details2'),
     path('collections/<int:collection_id>/thumbnail', collection_thumbnail, name='get_collection_thumbnail'),
diff --git a/app/grants/utils.py b/app/grants/utils.py
index 9bc46336774..5fe35c628b3 100644
--- a/app/grants/utils.py
+++ b/app/grants/utils.py
@@ -193,6 +193,12 @@ def add_grant_to_active_clrs(grant):
 
 
 def generate_collection_thumbnail(collection, width, heigth):
+    grants = collection.grants.all()
+    profile = collection.profile
+    return generate_img_thumbnail_helper(grants, profile, width, heigth)
+
+
+def generate_img_thumbnail_helper(grants, profile, width, heigth):
     MARGIN = int(width / 30)
     MID_MARGIN = int(width / 90)
     BG = (111, 63, 245)
@@ -207,8 +213,6 @@ def generate_collection_thumbnail(collection, width, heigth):
     GRANT_BOX = (GRANT_WIDTH, GRANT_HEIGHT)
     media_url = '' if 'media' not in MEDIA_URL else BASE_URL[:-1]
 
-    grants = collection.grants.all()
-
     logos = []
     for grant in grants:
         if grant.logo:
@@ -226,7 +230,7 @@ def generate_collection_thumbnail(collection, width, heigth):
         logos.append(None)
 
     thumbail = Image.new('RGBA', IMAGE_BOX, color=BG)
-    avatar_url = f'{media_url}{collection.profile.avatar_url}'
+    avatar_url = f'{media_url}{profile.avatar_url}'
     fd = urllib.request.urlopen(avatar_url)
 
     # Make rounder profile avatar img
diff --git a/app/grants/views.py b/app/grants/views.py
index 60c25445e4b..f4abc78bdcd 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -70,11 +70,14 @@
 from economy.utils import convert_amount, convert_token_to_usdt
 from gas.utils import conf_time_spread, eth_usd_conv_rate, gas_advisories, recommend_min_gas_price_to_confirm_in_time
 from grants.models import (
-    CartActivity, Contribution, Flag, Grant, GrantBrandingRoutingPolicy, GrantCategory, GrantCLR, GrantCollection,
-    GrantType, GrantAPIKey, MatchPledge, PhantomFunding, Subscription,
+    CartActivity, Contribution, Flag, Grant, GrantAPIKey, GrantBrandingRoutingPolicy, GrantCategory, GrantCLR,
+    GrantCollection, GrantType, MatchPledge, PhantomFunding, Subscription,
 )
 from grants.tasks import process_grant_creation_admin_email, process_grant_creation_email, update_grant_metadata
-from grants.utils import emoji_codes, generate_collection_thumbnail, get_user_code, is_grant_team_member, sync_payout
+from grants.utils import (
+    emoji_codes, generate_collection_thumbnail, generate_img_thumbnail_helper, get_user_code, is_grant_team_member,
+    sync_payout,
+)
 from inbox.utils import send_notification_to_user_from_gitcoinbot
 from kudos.models import BulkTransferCoupon, Token
 from marketing.mails import (
@@ -2535,6 +2538,7 @@ def grants_bulk_add(request, grant_str):
     views = redis.incr(key)
 
     grants_data = grant_str.split(':')[0].split(',')
+    grant_ids = []
 
     for ele in grants_data:
         # new format will support amount and token in the URL separated by ;
@@ -2544,6 +2548,7 @@ def grants_bulk_add(request, grant_str):
             grants[grant_id] = {
                 'id': int(grant_id)
             }
+            grant_ids.append(grant_id)
 
             if len(grant_data) == 3:  # backward compatibility
                 grants[grant_id]['amount'] = grant_data[1]
@@ -2551,7 +2556,9 @@ def grants_bulk_add(request, grant_str):
 
     by_whom = ""
     prefix = ""
+    handle = ''
     try:
+        handle = f"{grant_str.split(':')[1]}"
         by_whom = f"by {grant_str.split(':')[1]}"
         prefix = f"{grant_str.split(':')[2]} : "
     except:
@@ -2568,9 +2575,11 @@ def grants_bulk_add(request, grant_str):
     grant_titles = ", ".join([grant['obj'].title for grant in grants])
     title = f"{prefix}{len(grants)} Grants in Shared Cart {by_whom} : Viewed {views} times"
 
+    grant_ids = ",".join([str(ele) for ele in grant_ids])
+    avatar_url = f'/dynamic/grants_cart_thumb/{handle}/{grant_ids}'
     context = {
         'grants': grants,
-        'avatar_url': request.build_absolute_uri(static('v2/images/twitter_cards/grants9.png')),
+        'avatar_url': avatar_url,
         'title': title,
         'card_desc': "Click to Add All to Cart: " + grant_titles
 
@@ -3145,6 +3154,20 @@ def add_grant_from_collection(request, collection_id):
         'grants': grants,
     })
 
+@cache_page(60 * 60)
+def cart_thumbnail(request, profile, grants):
+    width = int(request.GET.get('w', 348 * 5))
+    height = int(request.GET.get('h', 175 * 5))
+    grant_ids = grants.split(",")
+    grant_ids = [ele for ele in grant_ids if ele]
+    grants = Grant.objects.filter(pk__in=grant_ids)[:4]
+    profile = Profile.objects.get(handle=profile.lower())
+    thumbnail = generate_img_thumbnail_helper(grants, profile, width, height)
+
+    response = HttpResponse(content_type="image/png")
+    thumbnail.save(response, "PNG")
+
+    return response
 
 @login_required
 @staff_member_required
diff --git a/app/retail/templates/admin/change_form.html b/app/retail/templates/admin/change_form.html
index c696b6e6a4e..4814b7d5236 100644
--- a/app/retail/templates/admin/change_form.html
+++ b/app/retail/templates/admin/change_form.html
@@ -40,6 +40,8 @@
       <input type="submit" value="Recalculate CLR" name="_calc_clr" value="1">
       <input type="submit" value="Mark as Fraud" name="_mark_fraud" value="1">
       <input type="submit" value="Approve Grant" name="_approve_grant" value="1">
+    {% elif 'grantcollection/' in request.build_absolute_uri %}
+      <input type="submit" value="Generate Cache" name="_generate_cache" value="1">
     {% elif 'grantclr/' in request.build_absolute_uri %}
       <input type="submit" value="Recalculate CLR" name="_recalculate_clr" value="1">
     {% elif 'granttype/' in request.build_absolute_uri %}
diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index 082f5a5f983..0a6fc659d34 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -31,17 +31,18 @@
         </div>
         <div class="mx-3 mx-md-5 pb-4">
           <div class="d-inline-flex flex-column-reverse flex-md-column text-left text-md-center">
-            <h3 class="mb-0 mb-md-5 d-flex-inline">Thank you for your contribution to open source!</h3>
-            <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="35%" style="max-width: 728px;" src="{% static "v2/images/grants/space-funding-woman.png" %}" />
+            <h3 class="mb-0 mb-md-5 d-flex-inline center">Thank you for your contribution!</h3>
+            <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="75%" style="max-width: 728px;" :src="imgURL" />
           </div>
           <div class="mt-5 my-4">
+
             You've successfully contributed to [[numberOfContributions]] grants:
           </div>
           <hr />
           <div>
             <template v-for="donation in donations">
               <div class="my-3">
-                [[donation.grant_title]]<br />
+                <a :href="donation.grant_url" target="_blank">[[donation.grant_title]]</a><br />
                 [[donation.grant_donation_amount]] [[donation.grant_donation_currency]]
                 <span v-if="donation.grant_donation_clr_match > 0" class="text-success"> + [[donation.grant_donation_clr_match]] DAI matching</span>
               </div>

From 1c0f34544bea95551dbdf54a1b9351d2d9a58328 Mon Sep 17 00:00:00 2001
From: Graham Dixon <graham@gitcoin.co>
Date: Wed, 10 Mar 2021 13:24:55 +0000
Subject: [PATCH 10/30] WIP: Gpg/round-9-regressions (#8517)

* Adds formatting to amount_received on grants-details

* Adds dynamic collection img to the thank you modal

* Adds missing semicolon

* Fixes flex-wrapping on team grid

* fix clr collection filter

* change field url pattern max lenght

* Fixes bug in grant-collection vue  (activeCollection=True)

* add banners change function to collections

* scape inline css

* fix landing

* fix fat finger

* Ensures html encoded text will be safely decoded in to vue/jsrender templates

* Updates teams grid (improves padding)

* fix round title

* fix migrations

* use display text instead of round num

Co-authored-by: octavioamu <octavioamuchastegui@gmail.com>
Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
---
 app/assets/v2/js/grants/components.js         |   3 +-
 app/assets/v2/js/grants/grant-thanks-modal.js |  26 ++-
 app/assets/v2/js/grants/index.js              |   4 +-
 app/assets/v2/js/vue-components.js            |   2 +-
 app/dashboard/templates/bounty/details2.html  |   2 +-
 .../templates/dashboard/explorer.html         |   3 +-
 .../templates/project/detail/info.html        |   2 +-
 .../migrations/0115_auto_20210310_0532.py     |  18 ++
 app/grants/models.py                          |  19 +-
 .../templates/grants/components/card.html     |   4 +-
 .../grants/components/collection.html         | 169 +++++++++---------
 .../grants/detail/template-grant-details.html |   6 +-
 app/grants/templates/grants/index.html        |   4 +-
 app/grants/templates/grants/landingpage.html  |   1 +
 .../grants/shared/landing_grants.html         |   4 +-
 app/grants/views.py                           |   7 +-
 .../templates/shared/grant_thanks_modal.html  |   8 +-
 app/retail/templates/shared/result.html       |   2 +-
 18 files changed, 174 insertions(+), 110 deletions(-)
 create mode 100644 app/grants/migrations/0115_auto_20210310_0532.py

diff --git a/app/assets/v2/js/grants/components.js b/app/assets/v2/js/grants/components.js
index b2a325c1e08..562495f37e8 100644
--- a/app/assets/v2/js/grants/components.js
+++ b/app/assets/v2/js/grants/components.js
@@ -115,8 +115,9 @@ Vue.component('grant-card', {
 });
 
 Vue.component('grant-collection', {
+  template: '#grant-collection',
   delimiters: [ '[[', ']]' ],
-  props: [ 'collection', 'small' ],
+  props: [ 'collection', 'small', 'activeCollection' ],
   methods: {
     shareCollection: function() {
       let testingCodeToCopy = document.querySelector(`#collection-${this.collection.id}`);
diff --git a/app/assets/v2/js/grants/grant-thanks-modal.js b/app/assets/v2/js/grants/grant-thanks-modal.js
index ce2f6c1970d..a7de0a9b05c 100644
--- a/app/assets/v2/js/grants/grant-thanks-modal.js
+++ b/app/assets/v2/js/grants/grant-thanks-modal.js
@@ -6,7 +6,21 @@ Vue.component('contribution-thanks-modal', {
       imgURL: '',
       numberOfContributions: 0,
       donations: [],
-      tweetUrl: ''
+      tweetUrl: '',
+      current_type: 'collections',
+      hideCollectionButtons: true,
+      collection: {
+        id: 0,
+        title: '',
+        description: '',
+        grants: [],
+        hideButtons: true,
+        owner: {
+          url: document.contxt.profile_url,
+          handle: document.contxt.github_handle,
+          avatar_url: '/dynamic/avatar/' + document.contxt.github_handle
+        }
+      }
     };
   },
   mounted: function() {
@@ -29,8 +43,18 @@ Vue.component('contribution-thanks-modal', {
     }
 
     this.donations = checkoutData;
+
+    this.collection.count = checkoutData.length;
+
+    this.collection.grants = checkoutData.map((grant) => {
+
+      return {...grant, logo: grant.grant_logo };
+    });
   },
   methods: {
+    showSingleCollection() {
+      return true;
+    },
     close() {
       this.$bvModal.hide(this.modalId);
     },
diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js
index 22230cff23a..f7530d58a5c 100644
--- a/app/assets/v2/js/grants/index.js
+++ b/app/assets/v2/js/grants/index.js
@@ -323,12 +323,13 @@ if (document.getElementById('grants-showcase')) {
         this.setCurrentType(this.current_type);
         this.fetchGrants(this.page);
 
+      },
+      changeBanner: function() {
         this.regex_style = document.all_routing_policies &&
           document.all_routing_policies.find(policy => {
             return new RegExp(policy.url_pattern).test(window.location.href);
           });
         this.toggleStyle(this.regex_style || current_style);
-
       },
       clearSingleCollection: function() {
         this.grants = [];
@@ -430,6 +431,7 @@ if (document.getElementById('grants-showcase')) {
         vm.grantsNumPages = getGrants.num_pages;
         vm.grantsHasNext = getGrants.has_next;
         vm.numGrants = getGrants.count;
+        vm.changeBanner()
 
         if (vm.grantsHasNext) {
           vm.page = ++vm.page;
diff --git a/app/assets/v2/js/vue-components.js b/app/assets/v2/js/vue-components.js
index 9aeea634a0d..23a03c9b3bc 100644
--- a/app/assets/v2/js/vue-components.js
+++ b/app/assets/v2/js/vue-components.js
@@ -644,7 +644,7 @@ Vue.component('project-card', {
         <img v-else class="card-project-logo m-auto rounded shadow" height="87" width="87" :src="project.bounty.avatar_url" alt="Bounty Logo" />
       </div>
       <div class="card-body">
-        <h5 class="card-title font-weight-bold text-left">[[ project.name ]]</h5>
+        <h5 class="card-title font-weight-bold text-left" v-html="project.name"></h5>
         <div class="my-2">
           <p class="text-left text-muted font-smaller-1">
             [[ project.summary | truncate(500) ]]
diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html
index c55cc085747..639d1e763e8 100644
--- a/app/dashboard/templates/bounty/details2.html
+++ b/app/dashboard/templates/bounty/details2.html
@@ -61,7 +61,7 @@
                 <div v-if="bounty.event" class="font-subheader hackathon-alt text-center text-lg-left" id="event_name">
                   Hackathon: [[bounty.event.name]]
                 </div>
-                <h4 id="title" class="font-title p-0 text-center text-lg-left">[[bounty.title]]</h4>
+                <h4 id="title" class="font-title p-0 text-center text-lg-left" v-html="bounty.title"></h4>
                 <div class="text-center text-lg-left">
                   <div class="tags font-caption d-inline-flex d-md-flex">
                     <div class="tag token" data-toggle="tooltip" data-html="true" :title='`<div class="tooltip-info">${bounty.value_true} ${bounty.token_name} in funding from original funder.</div>`'>
diff --git a/app/dashboard/templates/dashboard/explorer.html b/app/dashboard/templates/dashboard/explorer.html
index 5641fe5d1f5..c9a1d2edba3 100644
--- a/app/dashboard/templates/dashboard/explorer.html
+++ b/app/dashboard/templates/dashboard/explorer.html
@@ -427,8 +427,7 @@ <h3 class="featured-bounties__title">
                   <div class="col-12 col-md-8 d-flex flex-column">
                     <div class="bounty-detail">
 
-                      <div class="title font-subheader">
-                        [[ bounty.title ]]
+                      <div class="title font-subheader" v-html="bounty.title">
                       </div>
                       <div class="bounty-summary">
                         <div class="info font-caption">
diff --git a/app/dashboard/templates/project/detail/info.html b/app/dashboard/templates/project/detail/info.html
index 81e27a5592e..c09232a85cc 100644
--- a/app/dashboard/templates/project/detail/info.html
+++ b/app/dashboard/templates/project/detail/info.html
@@ -30,7 +30,7 @@
             <img class="project__logo mr-3" v-if="project.logo_url" :src="project.logo_url">
             <img class="project__logo mr-3" v-else :src="project.prize.avatar">
             <div class="ml-md-3">
-              <a class="text-decoration-none" :href="project.url"><h1 class="project-title mb-2 font-weight-bold">[[ project.name ]]</h1></a>
+              <a class="text-decoration-none" :href="project.url"><h1 class="project-title mb-2 font-weight-bold" v-html="project.name"></h1></a>
               <div class="d-flex align-items-baseline">
                 <i class="fab fa-github mr-2"></i> <a class="project__url link-white font-body" :href="project.work_url">[[project.work_url]]</a>
               </div>
diff --git a/app/grants/migrations/0115_auto_20210310_0532.py b/app/grants/migrations/0115_auto_20210310_0532.py
new file mode 100644
index 00000000000..ed33c1dcb1f
--- /dev/null
+++ b/app/grants/migrations/0115_auto_20210310_0532.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2021-03-10 05:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0114_grantcollection_shuffle_rank'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='grantbrandingroutingpolicy',
+            name='url_pattern',
+            field=models.CharField(help_text='A regex url pattern', max_length=255),
+        ),
+    ]
diff --git a/app/grants/models.py b/app/grants/models.py
index 57285f5e83d..6d2f9d16aa7 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -229,12 +229,13 @@ def happening_now(self):
     def grants(self):
 
         grants = Grant.objects.filter(hidden=False, active=True, is_clr_eligible=True, link_to_new_grant=None)
+        if self.collection_filters:
+            grant_ids = GrantCollection.objects.filter(**self.collection_filters).values_list('grants', flat=True)
+            grants = grants.filter(pk__in=grant_ids)
         if self.grant_filters:
             grants = grants.filter(**self.grant_filters)
         if self.subscription_filters:
             grants = grants.filter(**self.subscription_filters)
-        if self.collection_filters:
-            grants = grants.filter(**self.collection_filters)
 
         return grants
 
@@ -629,12 +630,22 @@ def tenants(self):
 
     @property
     def calc_clr_round_nums(self):
+        """Generates CLR rounds sub_round_slug seperated by comma"""
         if self.pk:
             round_nums = [ele for ele in self.in_active_clrs.values_list('sub_round_slug', flat=True)]
             return ", ".join(round_nums)
         return ''
 
 
+    @property
+    def calc_clr_round_label(self):
+        """Generates CLR rounds display text seperated by comma"""
+        if self.pk:
+            round_nums = [ele for ele in self.in_active_clrs.values_list('display_text', flat=True)]
+            return ", ".join(round_nums)
+        return ''
+
+
     @property
     def calc_clr_prediction_curve(self):
         # [amount_donated, match amount, bonus_from_match_amount ], etc..
@@ -941,7 +952,7 @@ def save(self, update=True, *args, **kwargs):
         """Override the Grant save to optionally handle modified_on logic."""
 
         self.clr_prediction_curve = self.calc_clr_prediction_curve
-        self.clr_round_num = self.calc_clr_round_nums
+        self.clr_round_num = self.calc_clr_round_label
 
         if self.modified_on < (timezone.now() - timezone.timedelta(minutes=15)):
             from grants.tasks import update_grant_metadata
@@ -2176,7 +2187,7 @@ class GrantBrandingRoutingPolicy(SuperModel):
         blank=True,
         null=True
     )
-    url_pattern = models.CharField(max_length=50, help_text=_("A regex url pattern"))
+    url_pattern = models.CharField(max_length=255, help_text=_("A regex url pattern"))
     banner_image = models.ImageField(
         upload_to=get_upload_filename,
         help_text=_('The banner image for a grant page'),
diff --git a/app/grants/templates/grants/components/card.html b/app/grants/templates/grants/components/card.html
index 9b39e546602..8e640137ee2 100644
--- a/app/grants/templates/grants/components/card.html
+++ b/app/grants/templates/grants/components/card.html
@@ -61,7 +61,7 @@ <h2 class="font-subheader">
               <p class="mb-0">
                 <span v-if="grant.clr_round_num && grant.is_clr_eligible">
                   <!-- is on an ongoing round -->
-                  [[grant.clr_round_num]]
+                  Grants Round [[grant.clr_round_num]]
                 </span>
                 <img class="float-right" height="20" src="{% static "v2/images/chains/ethereum.svg" %}" v-if="grant.tenants.indexOf('ETH') > -1">
                 <img class="float-right" height="20" src="{% static "v2/images/chains/zcash.svg" %}" v-if="grant.tenants.indexOf('ZCASH') > -1">
@@ -220,7 +220,7 @@ <h2 class="font-subheader">
 
               <p class="mb-0" v-if="grant.clr_round_num && grant.is_clr_eligible">
                 <!-- on a round -->
-                [[grant.clr_round_num]]
+                Grants Round [[grant.clr_round_num]]
               </p>
 
             </div>
diff --git a/app/grants/templates/grants/components/collection.html b/app/grants/templates/grants/components/collection.html
index a6d5860c20b..50ed6f0f02a 100644
--- a/app/grants/templates/grants/components/collection.html
+++ b/app/grants/templates/grants/components/collection.html
@@ -1,38 +1,38 @@
   {% comment %}
   Copyright (C) 2020 Gitcoin Core
-
+  
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published
   by the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-
+  
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU Affero General Public License for more details.
-
+  
   You should have received a copy of the GNU Affero General Public License
   along with this program. If not, see <http://www.gnu.org/licenses/>.
-{% endcomment %}
-<grant-collection inline-template :collection="collection" v-on:collection:show="showSingleCollection($event)" :small="current_type !== 'collections' ">
-  <div v-if="collection" >
-    <template>
-      <div class="collection-item" v-if="small">
-        <div class="collection-item__img position-relative">
-          <div class="collection-item__img--small-grid">
-            <div class="collection-item__img__cover--small">
-              <img :src="getGrantLogo(0)" alt="" v-if="collection.grants.length >= 1">
-            </div>
-            <div class="collection-item__img__cover--small">
-              <img :src="getGrantLogo(1)" alt="" v-if="collection.grants.length >= 2">
-            </div>
-            <div class="collection-item__img__cover--small">
-              <img :src="getGrantLogo(2)" alt="" v-if="collection.grants.length >= 3">
+  {% endcomment %}
+  <script type="text/x-template" id="grant-collection">
+    <div v-if="collection" >
+      <template>
+        <div class="collection-item" v-if="small">
+          <div class="collection-item__img position-relative">
+            <div class="collection-item__img--small-grid">
+              <div class="collection-item__img__cover--small">
+                <img :src="getGrantLogo(0)" alt="" v-if="collection.grants.length >= 1">
+              </div>
+              <div class="collection-item__img__cover--small">
+                <img :src="getGrantLogo(1)" alt="" v-if="collection.grants.length >= 2">
+              </div>
+              <div class="collection-item__img__cover--small">
+                <img :src="getGrantLogo(2)" alt="" v-if="collection.grants.length >= 3">
+              </div>
             </div>
           </div>
-        </div>
-        <div class="collection-item__content px-3">
-          <div class="d-flex mb-1">
+          <div class="collection-item__content px-3">
+            <div class="d-flex mb-1">
               <div class="d-flex w-100">
                 <div class="collection-item__owner-image--large position-relative mr-2" style="top: 5px; ">
                   <a :href="collection.owner.url" target="_blank" rel="noopener noreferrer">
@@ -54,77 +54,76 @@ <h2 class="mb-1 h5 gc-font-base">
                   </div>
                 </div>
               </div>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="collection-item" v-else>
-        <div class="collection-item__img position-relative" :style="collection.cover ? 'padding: 0' : ''">
-          <div class="collection-item__img--grid" v-if="!collection.cover">
-            <div class="collection-item__img__cover">
-              <img :src="getGrantLogo(0)" alt="" v-if="collection.grants.length >= 1">
-            </div>
-            <div class="collection-item__img__cover">
-              <img :src="getGrantLogo(1)" alt="" v-if="collection.grants.length >= 2">
-            </div>
-            <div class="collection-item__img__cover">
-              <img :src="getGrantLogo(2)" alt="" v-if="collection.grants.length >= 3">
+        <div class="collection-item" v-else>
+          <div class="collection-item__img position-relative" :style="collection.cover ? 'padding: 0' : ''">
+            <div class="collection-item__img--grid" v-if="!collection.cover">
+              <div class="collection-item__img__cover">
+                <img :src="getGrantLogo(0)" alt="" v-if="collection.grants.length >= 1">
+              </div>
+              <div class="collection-item__img__cover">
+                <img :src="getGrantLogo(1)" alt="" v-if="collection.grants.length >= 2">
+              </div>
+              <div class="collection-item__img__cover">
+                <img :src="getGrantLogo(2)" alt="" v-if="collection.grants.length >= 3">
+              </div>
+              <div class="collection-item__img__cover">
+                <img :src="getGrantLogo(3)" alt="" v-if="collection.grants.length >= 4">
+              </div>
             </div>
-            <div class="collection-item__img__cover">
-              <img :src="getGrantLogo(3)" alt="" v-if="collection.grants.length >= 4">
+            <div class="collection-item__owner-image--cover" v-if="!collection.cover">
+              <img :src="collection.owner.avatar_url">
             </div>
+            <img  :src="collection.cover" alt=""  v-if="collection.cover">
           </div>
-          <div class="collection-item__owner-image--cover" v-if="!collection.cover">
-            <img :src="collection.owner.avatar_url">
-          </div>
-          <img  :src="collection.cover" alt=""  v-if="collection.cover">
-        </div>
-        <div class="collection-item__content px-3">
-          <h2 class="h5 gc-font-base">
-            [[ collection.title.slice(0,60) ]][[ collection.title.length > 60 ? '...' : '']]
-          </h2>
-
-          <div class="d-flex mb-2">
-            <a :href="collection.owner.url" class="mr-2" target="_blank" rel="noopener noreferrer">
-              <div class="d-flex">
-                <div class="collection-item__owner-image position-relative" style="top: -4px;">
-                  <img :src="collection.owner.avatar_url">
-                </div>
-                <div class="collection-item__owner-handle font-smaller-3">
-                  <span class="ml-2">
-                    [[ collection.owner.handle || 'anonymous' ]]
-                  </span>
+          <div class="collection-item__content px-3">
+            <h2 class="h5 gc-font-base">
+              [[ collection.title.slice(0,60) ]][[ collection.title.length > 60 ? '...' : '']]
+            </h2>
+            
+            <div :class="`d-flex ${!collection.hideButtons ? 'mb-2' : 'mb-4'}`" >
+              <a :href="collection.owner.url" class="mr-2" target="_blank" rel="noopener noreferrer">
+                <div class="d-flex">
+                  <div class="collection-item__owner-image position-relative" style="top: -4px;">
+                    <img :src="collection.owner.avatar_url">
+                  </div>
+                  <div class="collection-item__owner-handle font-smaller-3">
+                    <span class="ml-2">
+                      [[ collection.owner.handle || 'anonymous' ]]
+                    </span>
+                  </div>
                 </div>
-              </div>
-            </a>
-            <p class="font-weight-bold mr-2 mb-0">&middot;</p>
-            <p class="text-muted font-smaller-3 mb-0">[[ collection.count ]] grant[[collection.count > 1 ? 's' : '']]</p>
-          </div>
-          <p class="collection-item__pitch font-smaller-3 text-muted mb-2">[[ collection.description.slice(0, 140) ]][[ collection.description.length > 145 ? '...' : '']]</p>
-        </div>
-        <div class="collection-item__footer">
-          <div class="col pb-4 d-flex justify-content-between">
-            <button @click.stop="shareCollection()" class="btn btn-outline-primary font-weight-semibold mr-1">
-              <i class="fa fa-fw fa-share" aria-hidden="true"></i>
-              <input type="hidden" :id="`collection-${collection.id}`" :value="`https://gitcoin.co/grants/explorer/collections?collection_id=${collection.id}`">
-            </button>
-
-            <template v-if="$parent.activeCollection">
-              <button @click.stop="addToCart()" class="btn btn-primary font-weight-semibold ml-1" style="flex: 1 1 0px;">
-                <i class="fas fa-fw fa-cart-plus" aria-hidden="true"></i> Add to Cart
-              </button>
-            </template>
-            <template v-else>
-              <a class="btn btn-primary font-weight-semibold ml-1" :href="`/grants/explorer/collections?collection_id=${collection.id}`" style="flex: 1 1 0px;" v-if="$parent.isLandingPage">
-                <i class="fas fa-fw fa-arrow-right"></i> View
               </a>
-              <button class="btn btn-primary font-weight-semibold ml-1" @click="$emit('collection:show', collection.id)" style="flex: 1 1 0px;" v-else>
-                <i class="fas fa-fw fa-arrow-right"></i> View
+              <p class="font-weight-bold mr-2 mb-0">&middot;</p>
+              <p class="text-muted font-smaller-3 mb-0">[[ collection.count ]] grant[[collection.count > 1 ? 's' : '']]</p>
+            </div>
+            <p v-if="!collection.hideButtons" class="collection-item__pitch font-smaller-3 text-muted mb-2">[[ collection.description.slice(0, 140) ]][[ collection.description.length > 145 ? '...' : '']]</p>
+          </div>
+          <div v-if="!collection.hideButtons" class="collection-item__footer">
+            <div class="col pb-4 d-flex justify-content-between">
+              <button @click.stop="shareCollection()" class="btn btn-outline-primary font-weight-semibold mr-1">
+                <i class="fa fa-fw fa-share" aria-hidden="true"></i>
+                <input type="hidden" :id="`collection-${collection.id}`" :value="`https://gitcoin.co/grants/explorer/collections?collection_id=${collection.id}`">
               </button>
-            </template>
+              
+              <template v-if="$parent.activeCollection">
+                <button @click.stop="addToCart()" class="btn btn-primary font-weight-semibold ml-1" style="flex: 1 1 0px;">
+                  <i class="fas fa-fw fa-cart-plus" aria-hidden="true"></i> Add to Cart
+                </button>
+              </template>
+              <template v-else>
+                <a class="btn btn-primary font-weight-semibold ml-1" :href="`/grants/explorer/collections?collection_id=${collection.id}`" style="flex: 1 1 0px;" v-if="$parent.isLandingPage">
+                  <i class="fas fa-fw fa-arrow-right"></i> View
+                </a>
+                <button class="btn btn-primary font-weight-semibold ml-1" @click="$emit('collection:show', collection.id)" style="flex: 1 1 0px;" v-else>
+                  <i class="fas fa-fw fa-arrow-right"></i> View
+                </button>
+              </template>
+            </div>
           </div>
         </div>
-      </div>
-    </template>
-  </div>
-
-</grant-collection>
+      </template>
+    </div>
+  </script>
\ No newline at end of file
diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index b09c3a80253..01e40794604 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -189,7 +189,7 @@ <h3 class="col-12" v-else>
           </div>
           <div class="row mt-2">
             <div class="col col-4">
-              <h2>$[[grant.amount_received | round ]]</h2>
+              <h2>$[[grant.amount_received || 0 | round | formatNumber ]]</h2>
               <span>raised from all contributors</span>
             </div>
             <div v-if="[[ grant?.clr_prediction_curve?.[0]?.[1] ]] > 0" class="col col-4">
@@ -308,8 +308,8 @@ <h3>About</h3>
       <div class="grant-team">
         <div class="">
           <h3>Team</h3>
-          <div class="d-flex" style="gap: 16px;">
-            <div v-for="member in teamFormatted" :key="member.id" class="d-flex flex-column align-items-center" v-if="member?.text">
+          <div :class="`d-flex flex-wrap${teamFormatted.length > 3 ? ' justify-content-center' : ''}`">
+            <div v-for="member in teamFormatted" :key="member.id" class="d-flex flex-column align-items-center px-2 py-3" v-if="member?.text">
               <b-img-lazy class="rounded-circle bg-light" width="50" height="50" :src="member.avatar_url" :alt="member.text"></b-img-lazy>
               <a :href="`/profile/${member.text}`" class="">[[member.text]]</a>
             </div>
diff --git a/app/grants/templates/grants/index.html b/app/grants/templates/grants/index.html
index bbbe0f59410..c6e41b7d1e4 100644
--- a/app/grants/templates/grants/index.html
+++ b/app/grants/templates/grants/index.html
@@ -149,6 +149,7 @@
 
 
     </div>
+    {% include 'grants/components/collection.html' %}
     {% include 'grants/detail/template-grant-details.html' %}
   </div>
   {% include 'shared/analytics.html' %}
@@ -156,6 +157,7 @@
   {% include 'shared/footer.html' %}
   {% include 'grants/shared/shared_scripts.html' %}
   {{collections|json_script:"collections-object"}}
+  {{grant_bg.inline_css|json_script:"inline_css"}}
   <script src='https://cdn.jsdelivr.net/npm/quill@1.3.6/dist/quill.min.js'></script>
   <script src='https://cdn.jsdelivr.net/npm/vue-quill-editor@3.0.6/dist/vue-quill-editor.js'></script>
   <script src="{% static "v2/js/lib/quill-image-extend-module.js" %}"></script>
@@ -201,7 +203,7 @@
       document.current_style = {
         banner_image: "{{ grant_bg.banner_image }}",
         background_image: " url('{{grant_bg.background_image }}')",
-        inline_css: "{{ grant_bg.inline_css }}"
+        inline_css: JSON.parse(document.getElementById('inline_css').textContent)
       }
     {% else %}
       document.current_style = base_style
diff --git a/app/grants/templates/grants/landingpage.html b/app/grants/templates/grants/landingpage.html
index 1937d1e5ca2..44ba5a94138 100644
--- a/app/grants/templates/grants/landingpage.html
+++ b/app/grants/templates/grants/landingpage.html
@@ -93,6 +93,7 @@ <h4 class="font-weight-bold py-0 my-0 pl-0">Collections</h4>
           {% include 'grants/detail/side-cart.html' %}
         </div>
 
+    {% include 'grants/components/collection.html' %}
 
 
     </div>
diff --git a/app/grants/templates/grants/shared/landing_grants.html b/app/grants/templates/grants/shared/landing_grants.html
index 70f8b5e2e70..e5204c149f6 100644
--- a/app/grants/templates/grants/shared/landing_grants.html
+++ b/app/grants/templates/grants/shared/landing_grants.html
@@ -3,12 +3,12 @@
     <div class="container" v-cloak>
       <div :class="`infinite-container mt-4 row ${ current_type !== 'collections' ? 'vertica-scroll' : ''}`" @scroll.passive="onScroll($event)" v-if="(current_type == 'all' || current_type == 'collections') && collections && !activeCollection">
         <div :class="`col-12 col-md-6 col-xl-4 mb-4 infinite-item grant-card`" v-for="(collection, id) in collections">
-          {% include 'grants/components/collection.html' %}
+          <grant-collection :collection="collection" v-on:collection:show="showSingleCollection($event)" :small="current_type !== 'collections'"></grant-collection>
         </div>
       </div>
       <div class="infinite-container mt-4 row" @scroll.passive="onScroll($event)" v-if="activeCollection">
         <div :class="`col-12 col-md-6 col-xl-4 mb-4 infinite-item grant-card`" v-for="(collection, id) in [activeCollection]">
-          {% include 'grants/components/collection.html' with activeCollection=True %}
+          <grant-collection :collection="collection" v-on:collection:show="showSingleCollection($event)" :activeCollection="true" :small="current_type !== 'collections'"></grant-collection>
         </div>
       </div>
       <div v-if="current_type === 'collections' && !collections.length && !activeCollection">
diff --git a/app/grants/views.py b/app/grants/views.py
index f4abc78bdcd..e0acf49c6ea 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -254,7 +254,7 @@ def api_auth_profile(request):
             )
         profile = GAK.profile
 
-    GAK = {'_key': GAK.key, '_secret': GAK.secret} if GAK else None 
+    GAK = {'_key': GAK.key, '_secret': GAK.secret} if GAK else None
 
     return profile, GAK
 
@@ -745,8 +745,11 @@ def build_grants_by_type(
     _grants = Grant.objects.filter(network=network, hidden=False)
 
     if clr_round:
-        _grants = _grants.filter(**clr_round.grant_filters)
+        if clr_round.collection_filters:
+            grant_ids = GrantCollection.objects.filter(**clr_round.collection_filters).values_list('grants', flat=True)
+            _grants = _grants.filter(pk__in=grant_ids)
 
+        _grants = _grants.filter(**clr_round.grant_filters)
     if 'match_pledge_amount_' in sort:
         sort_by_clr_pledge_matching_amount = int(sort.split('amount_')[1])
     if sort in ['-amount_received_in_round', '-clr_prediction_curve__0__1']:
diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index 0a6fc659d34..d63c2d3a457 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -31,8 +31,12 @@
         </div>
         <div class="mx-3 mx-md-5 pb-4">
           <div class="d-inline-flex flex-column-reverse flex-md-column text-left text-md-center">
-            <h3 class="mb-0 mb-md-5 d-flex-inline center">Thank you for your contribution!</h3>
-            <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="75%" style="max-width: 728px;" :src="imgURL" />
+            <h3 class="mb-0 mb-md-5 d-flex-inline">Thank you for your contribution!</h3>
+            <!-- <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="35%" style="max-width: 728px;" src="{% static "v2/images/grants/space-funding-woman.png" %}" /> -->
+            <div class="align-self-center d-flex-inline mb-5 mb-md-0 col-12 col-lg-6">
+              <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="75%" style="max-width: 728px;" :src="imgURL" />
+              <!-- <grant-collection :collection="collection" v-on:collection:show="true" :small="false"></grant-collection> -->
+            </div>
           </div>
           <div class="mt-5 my-4">
 
diff --git a/app/retail/templates/shared/result.html b/app/retail/templates/shared/result.html
index 1c2ebf2d70c..7da5ee287f9 100644
--- a/app/retail/templates/shared/result.html
+++ b/app/retail/templates/shared/result.html
@@ -17,7 +17,7 @@
       <div class="hiring-alt">HIRING <i class="fa-flag far"></i></div>
       [[/if]]
       <div class="title font-subheader">
-        [[>title]]
+        [[:title]]
         [[if event != null && event != '']]
           <div class="hackathon-alt">[[>event.name]]</div>
         [[/if]]

From c4ac850086f52875ee8c5d218b75f337e1117dbf Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 08:32:27 -0700
Subject: [PATCH 11/30] fixes cart thumb size

---
 app/grants/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/grants/views.py b/app/grants/views.py
index e0acf49c6ea..cfecac606ca 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -2579,10 +2579,12 @@ def grants_bulk_add(request, grant_str):
     title = f"{prefix}{len(grants)} Grants in Shared Cart {by_whom} : Viewed {views} times"
 
     grant_ids = ",".join([str(ele) for ele in grant_ids])
-    avatar_url = f'/dynamic/grants_cart_thumb/{handle}/{grant_ids}'
+    avatar_url = f'https://gitcoin.co/dynamic/grants_cart_thumb/{handle}/{grant_ids}'
     context = {
         'grants': grants,
         'avatar_url': avatar_url,
+        'avatar_height': 875,
+        'avatar_width': 1740,
         'title': title,
         'card_desc': "Click to Add All to Cart: " + grant_titles
 

From 851de8ba7f8edb4516668ec7f822448cfdf3223c Mon Sep 17 00:00:00 2001
From: Graham Dixon <graham@gdixon.co.uk>
Date: Wed, 10 Mar 2021 15:38:10 +0000
Subject: [PATCH 12/30] Fixes current_style is undefined

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

diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js
index f7530d58a5c..e8799b31612 100644
--- a/app/assets/v2/js/grants/index.js
+++ b/app/assets/v2/js/grants/index.js
@@ -329,7 +329,7 @@ if (document.getElementById('grants-showcase')) {
           document.all_routing_policies.find(policy => {
             return new RegExp(policy.url_pattern).test(window.location.href);
           });
-        this.toggleStyle(this.regex_style || current_style);
+        this.toggleStyle(this.regex_style || document.current_style);
       },
       clearSingleCollection: function() {
         this.grants = [];

From 1ee261e4d59ac49f85fc2085a213e13c1c39cdf2 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 09:13:31 -0700
Subject: [PATCH 13/30] fixes issue with butta testing API' gs

---
 app/grants/views.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/grants/views.py b/app/grants/views.py
index cfecac606ca..e6298d47b14 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -393,9 +393,6 @@ def contribution_info_from_grant_during_round_as_json(request, grant_id, round_i
 order by grants_subscription.id desc
 
     """
-    print(query)
-    start, end = helper_grants_round_start_end_date(request, round_id)
-    query = f"select distinct contributor_address from grants_subscription where created_on BETWEEN '{start}' AND '{end}' and grant_id = '{grant_id}' {hide_wallet_address_anonymized_sql}"
     earnings = query_to_results(query)
 
     meta_data = {

From 522aab692f901f3c4b1e859db18534cff3b5c13a Mon Sep 17 00:00:00 2001
From: Graham Dixon <graham@gdixon.co.uk>
Date: Wed, 10 Mar 2021 16:52:38 +0000
Subject: [PATCH 14/30] New trust-bonus modal

---
 app/assets/v2/images/grants/trust-bonus.png   | Bin 0 -> 8658 bytes
 .../v2/js/grants/contribution-trust-bonus.js  |  20 ++++
 app/assets/v2/js/grants/grant-thanks-modal.js |  27 +----
 app/assets/v2/js/grants/index.js              |   2 +-
 app/grants/templates/grants/index.html        |   1 +
 .../shared/contribution_trust_bonus.html      |  54 +++++++++
 .../templates/shared/grant_thanks_modal.html  | 107 +++++++++---------
 7 files changed, 131 insertions(+), 80 deletions(-)
 create mode 100644 app/assets/v2/images/grants/trust-bonus.png
 create mode 100644 app/assets/v2/js/grants/contribution-trust-bonus.js
 create mode 100644 app/retail/templates/shared/contribution_trust_bonus.html

diff --git a/app/assets/v2/images/grants/trust-bonus.png b/app/assets/v2/images/grants/trust-bonus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1208704d6b31d3ee8b818bfc366a9c5445d3c648
GIT binary patch
literal 8658
zcmV;@AuZmCP)<h;3K|Lk000e1NJLTq004^s004vt1^@s6pikH;00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsHA!kWMK~#7F?R{5s
zTW6Z)b8sReK`>`ZRE}-Qk}OMd4()c2Jzd_O+VWP{%;nbJ>|XE9{(!yMKQME#HC0nJ
zuIlL-yW6Q-mL*$~rIuwSN~97giaCKq4kyg}ejpVrf`mwr1W7zyD7H)pfN-AkhUX2R
z<PcCs83n+FGRi0rWwMk}Fv?^pqhOTDQbxfjlckJ;Q6@_n1*1%sG73hSEM*joGFi$f
z7-h0N2UzUh$a=SeGV;RA+K5hP5uM6ndMbkm{S4LU*s?1CRo!^^S(z+PfUSmYIf5Yf
zx+1vU8NtAVIL3xkaBK(ufQkbzS7XyQ-?EX#vFS6|IrAk+Wcp<Zr2?s3NX(HWo3=3Y
zFp2Z0Msf4%l(=YBbvpLE5JcM+KYRfNx?6_FtH7Y2%K^&*I{%u+{adE^OcfysFTP?R
z5GoBTw&5)c-^CLnX<R%#h6`uLpr{fKzFdXf2P)Cj>Vc}ukm>H0R^SF_f{qSYxP3KC
zp9`pKma+G6>D<d3nk?CjjjI<X@Z}!{kc^u+_EsGZ9IZlaqZ=;Q>X?7FD3(3rj+iGU
zWcN2LS*FG_IQ_*SzWsU>2VV-|?cX$^rp{Q^7{Nu}CRpu4%O+Wnrn1HbMMueC!^JH8
zuZ@H=`2GLy#Vv|WKKQs5FCMRk+oLS__p%vsS;H1g6KHBzh*(cQCmOaW7`9Q@B*X1>
zJ@flQkc>G<r5s^UWcvGFKM|%xZs`q2ma(BE{`H@FFg=mM-~O%*JN5@fOp*_r9mS??
z^xwB|^QR2@2ea^KGXCac4;tDYUqv$uocu!qH#$=YRVvuCPe*fyjOqp%s#ZD~%~G&&
z+z{Oo6Ju$7`Y#WKZu0Se??CGoZ(gG0f=v@QFB3ufOpGMc$aKWvY|SEZ#fR>zDrHMD
zG$Z%-#|BN@eUL)pa2P4o!N^T7f|m`nG-=qjM?*^oWl^5BO_~iumUPm>U;cdneLXS!
z_8;0Q9rn!|pM=LPeECTdBX$z$T~WxJNo%PzA<2#iKyP0n%hIY4VO%2Ry?G^ra4-Sa
zZhH7ESRF}>59yff^y2OxJb3Z28!x@3Lsr%<VKxL=EYrb7N{c(MOyR@-)`p#=oh%f{
zN|Y<xM2zhIX~_E%f+VwlL*A0Y=<O&z`!oyL%_RT{S$Yq=78gX}B8sb$eiC_{wiF_t
zxG2tX^Q&SlW8IU5L$U|=V)&Y@%E4n**mtOsT+hNHm&Yfem4ev*0kQ_Wlf;n6p`GNh
z;Cg!snS=|@%=H&)YnAzQwT*vgO7Nyt)VGjcv&O&ebx)RT+Qv7Z4pDZZ;KVN*DA+7a
z4b|NeY8w=&x7@JP)AS#n_$9rBL@o)H3)l+cmq}y`c{Jg!);iXGHSEUaFuHC`;a9(H
zMyPsj(Sn27RMHU{4d;gZ7$3CIbuA6sO{7??y3fWaD`7fjq3^CK+~F*;nOp|7mawiZ
zOPcCEXTBV!Y@`C)_XYDx_QRCzeD`?@wIr{%ZdIU><bVED3U|^`IPZqxBDb?B(5<NK
zOduKy<NNPzxZQr#kOmV8+vx4i3hQ<FHG@hDi;rcp#PpbB!v2}mtJ0hMU20LIq;*Y}
zJJ%!VyC26t{I6{!y3K7KSZKR^K25}kp?f?Fty72F)DRC*aQY?@rEY1rzoa>E9f^V*
z8NT}51rMd#lU4?qKn9_xm+DUn+IOm0EJmy(zD*7zNrZXyp7f}fJ$TpC1XU`Y^H{fJ
zNhM8O{p+M?C+OJj%lo|1ej5)SX5bvBtfxH<GwvcChQ1a*1+mq|@e`8bKt32l)Mp~*
zw&`^($SwzwuO)JII$F1>i&A?T8OI{>B@wsHr~bQJQl7CkOU1e+OPFdux2}fq%a5A#
zO8KnL_T9^3+DO6GmWE{5;(^f27eAK`=a`1#5PO(R{1`p5bd~AC+rccP<_shv!(8r;
zUsu_iWX)W>F8?sMCNXf?hsdObV9oNhJron`k}MpsKDZmB0MbG0=KSJYDgg?9Gq85X
zA?x<zU*vK0BKReO;JhEcQ7<YC6+Wr~rOA~=V<x7R49q=Ixb~7R^W^Kz!sR^m9&$?>
zBR{4v*y~0`l?&1;Rk{nsx+IHDSGA`*irRWNYU+(SpTiga;XM;$W(pwpvtVAxL>W~f
zpQ%JU{5bfYfyVY+-G^HVA`>>blnky@86Zshi|a^iZo)i?fCalFf$NvN*t}b%asWyi
z>yj*-q7DrtsnF-93y{YJ(RJi>)+C-dVHr+^MZu_@->Q)7!9_pX96#Rpz>V6*r(f5g
zOe$1opt4fN=`#|hYDwMQmdsB==20g1W}~B~C{`Mt=XXUi1+X61(*d$X|1+fGt0L=?
zEYp)|BomhCbjz16bMMIB!y08nKHNL0Vw$oa=}=U}E>NBg4DE+Hszw8N`2*t_qRfK3
z>~_7VAr`lB`idV`QyMP+v)08)x?tb*K)&HcgX6)T<2rnS#krss#f#thw>%Zf@+*;3
zgHmL|tWUCpGs4f*)VuROhe=f5D&wt>+}Lqn#l>$_+_^$ud3^@1ImjaQ>S(A{P~SHH
zS0>X<zG=IHOIHj`jc7!c)Kk9~P2r;&yl1O$<Rv$@?$1@PT~AzBwu~n~8^n%%6=?17
z&HH{#3SC;6;CNjsxY21-WI7d<3+ope31V#|#I<gr+KoE58**$3^0bCfh+>oiB#}T+
z&gmPGXD^~OlL-ZUvLH%L!_!1zWV05|og6_A6)Q^#>yj*qSgt$XUs0IYl^X$}pZR<i
z3%GX9Y7_!ncpfKj{NvJc>2<#3hYOvY$)ysDRF0Pk>yj)i^K;jJA=PDzEYQ@LMY@aw
zhbqK#=~yhP*=~Byq%C?^76SLeq%AvFY@7@9vEnfsV?*@3bbjHi)LIzVWz3?etXa(e
z98oMBvT^rj2Hn>)7|tf)yqF}tWiGZ5san$*xIn4)fQ80Q`M)-{2oG*&5%*DWTRk^f
z9Iu5)eGI4m3=H&Y*nLn#E!B)>^&loNfBr%%<ST`BX<57!53p*RO6NBN>?*EbNaMQ;
zF+AKk3hTo$$a~{+W<m_PBZ*0O0vArFF*!2#>vALa{hKDPU#DvIKGIn{bL%V;H%L)|
za`NaXE(}iLi%*j1?|J;1@kmyf6|b+f?&Wo9S=zS*@YV+seE$4F2FDCF4V1#(C4GfN
zIaiH2?`yJ*Z=aaL?bGxZzi_bsh%T&w=&N-&P9h<&%fyBA35+*Si#E)s6x*j>jDAIe
z9CjpN5igP#JTQ#M0Zf$0!cA3$##}3fbx9T;JLSiG;0%Ndcvau&7#-G#IobI;nfL;e
zJa4`=iOx$I^#8$!3O~#Jl5lCPt&AnpNbQcm^^16}#<T#Ov<uDy16#LhsH}Z#<iq1>
zQL+ezN@!>Z8+;<s>zA-;vyPE2H=OOsh2?oBOaoP@-<~23C64d_=_nCJaLj5Z#kL~_
zIbas{t<Kb$d?Q|LKdwDBE;2flg09O5R+TMF$$%Btj$I0F{>hEVxB?eR^q{-lns!01
zwDQLsTtQ}~mmf1&u(ZS@snfEEi6kypN#xdUdC*X)i`k-CB;ytadJ<@EcS9+$0C&R=
z#&dUEeT9bUvjIwvZRq1VJXr<trZ}7v)4AAUiC|IB>C+(pxk@x`rz?qMb!m8qJ=pP*
z3b*&MRT&#j;z3Uo?|sw)MJbb|q~P(nuw$<d^HLC19v5nl$aIk;T>3%5;90uR$EG1I
zfiQw7J>+J-3t>+i)q<K8ax)f&x=jQEGL;6@NA)Y7L>PFGKqh6QeXD=oNy*i~h9?VO
zs2wk;qMoBuDM>S2Le2G3VejN0f#K7XHorTSt4KdDSQ+lupr5S9zAauHf5)KLbqO*g
zDNAQ9#b5E*dZbepu3nrJ^`MGSX~ipy@=iJA>O=lYmmms*TO3=qD8k}kLdnVfivg2m
zOhJ{V<AtNTAc}ZDdLM3f3RFHV9*zvA$m%4q|8Qu*LH*T0nJjt0V;WOoVoA%~EelSH
zEYP$9J1WmS6gbw;+y-~UHD?efi;;-h3%s9=3#Ud=S*2s|iy@RE$~)!qARe*BK)n2F
zM%0F$1nVQ#cL9n;$ZyF^0!avP@*Cu?s4VbEui*-Fg@vexEXJT4ZQGPNTPHbI>Ae%f
z<sT;S(cia=m1L!eGFj$=!zrvSy6B{9K3F_~$bBwU(-F&<hBPQw{qVU|k=<}w%!R@9
zwJao3f_c2vVa1-TjeTE-np7}Jg-R|5sM@n{7mu3w?yF%6eknWJTOsDGOA%$V%mr?Y
zYEkjtZ#?L}p`iba7n4d77S(&eTFfOMs=XTgL5VDeEmGe=NXAI77pa~UBqEjFMG`()
zlWJARmi;=m?^A@XGZ!wO8^^t_DE|I`Zh@~tL#d*?t#Sdd)!<5V4^@(H-N;}xmVwVv
z@ZrZ^3Q}c!_Rk4y+pl2P0Ucj{lECf0B)o1Jo11kZ`0-i}4xZ;T7QMHlV#n_8gTZ;*
zD#X6I0)lPPRw<+COB2hMWdU%uQrjY<s@{dIdo{7(hua?O$nvBTkAqfDyAQphqxqqN
z`ev6{N6PM`kj)A0+x(*cX1=9|Oq7B9ChpzL!m{VTzgZ{Rb4WvoXOW6Xm^DKd{<0>9
zZ45rhio2cnt!>(=K1xTI8#1|&P_2Z@8ZFlZ_p`U<Yr>-;KGIEi#H915G@?^BD(KH|
zkULWrkWCiaj>%*iq=5UvH)){*%?F(-*sYZMR}xt^<gBxp^SPVFsn1fPImqpngd12X
zvdlu5_Mcw?2cqMx`$`s9FQ+k@Od(mH5>KqV7Z9H}U%c|X$Zg=B|2b@VmLs@WQ*MaA
zge+YY_S=e#k~wsN*JoV$K7;dDV@R}75PTp8*-szxnipyW>jrCzEbNPU;U9PI^STPD
zL?p#~H%$!3Qb@cq0eLHBLu#&{S0b@4MAlDUC(`GdAqzJvb?jCVAeo%aKJSLDX()|h
z^1j|I?Bh`=JCl!G6i+$IB-(9ySzFUf2cJa2WMN;KrUDo@6>~LoIa0HQ;19aQqtswk
zl3+)!=TR&}9*8FnYgIRzDCjK}3%FDiOct(fd`g-^I^~G%(oJm&LUk^R{w1-juau5D
zDJD2Z8XXivMez6~@$dcl5@e@?EXquylw(pU;F=r$&L9rF=|*L3>95i#6a|wdYw`>+
z<@vY6lond>`8}wvGf>m0ibZ|gyv!Y60lM=QO%kbXiK^BGg9GTHJ_~>P*90uZLS;Zk
zW0OjHiz>vnS%`iY&QiES-Q|YwW(5wv=)tyq>NC@ZYZ=cKvv95-o(dxpA^%Kl=;_hm
z@pupj_)rmai^H308dNlGQqf3XW+mwoZVv^e6pXq`eD}y)aAvypW8Ngv$HMe)SJ2z-
z#oap|y!@(L=qloQgBr{;6)^hUsF4kEM$q;bv`5>w*9)FMz!jsO7Bc+EQ29L`$Jp2y
z1)K_LA8vXWL=d{Wd~UHHrIsuYAAC^TC=2W3CuNg~BW8X}{JZ3jmn;0y{|lN>I#O_U
zB`|v3i?9Atf&JS&q~-z*u?jR*$Y?ksqj`&ps+!`*Dg0Tu?}lBWJ^$2-SZKH$U3N>(
zhGt7k*=$xkB9Vw7j;gA7*ry2s`Tbt{0^Oopy}FJU2rI(!@Np?Ds+H<8VJ361T85TU
zkPg#_tTsgxw{(#76#8dh{gH?tmvQJd9S2TmFx;+X3ud{sVGCu0Lc(7_Ut-tCTQQ4G
zmu0z3Ce`BkkxV89c}7PiJbaiVj@Rp@he0uqK^Dir>wn`R*}hcSl54MQsn&4wmIqFI
zT4*TT48^lSiD3<{D?S)r5K)#__hI64DZy8<dO^^#U!~mfwtR+8N<6~hFqudhhG9@<
z)k2wuR=Q+CuFk?se;)paAJN+>$lH^-aSoj<%zjFjJH6N_SQVOD6z`<cDGHbu(FDE1
z;5&NLb`38cbi+6sgn7#?I^{$cT+o6YG_g@oZc!)z3I(}`Ue_tG_v6R23gUe+*!y|G
zpaa`iT02yh6GbBnA79J53kPBx^G=RXtt7F2?mA9`UwX$t(`FT&SI8}$^dZKn(CGRR
z-4;U8$kNu~!|(n_hv@s@=Acjhu?N>Lhv%&fvu?wp*VS|Bd0*Q{Lf@tx%BpKMtlV;Z
z)wIcrfgT;h4=r3dpTR~!(a6HP@jG?|D93k+BX9%3g@>d#Wa;WppgW%50!h=9W(N#P
zwY_lrR$rLm7=|m}n|G-~H+pcV9J8zl9N9r;cLeIuc;4q^FME-_qb=ASR>tyU^#fcs
zK=ZA-kZo}$VIuB`qvsY2wn<#GQcJgazT~kcvZ09)8~^r?aZ#LHESQd)cc|h}%heRN
z)-u)vSt>#jj#28WyBB|v(`1=A7(Mr83P&lc5q&Z1v#Vm+uqMc&Q(=r(Q+StP5x9Aa
zhtbdcDTUL2OyR_@4DshO3de@|wzzK7+@T1PL?&&V{UU|waeL{@W;f7?-iErhm@vFb
z<Jh|frid_SK2IVReg2XIYez|5dOS#F3o1XGnZhOo*E%+w+|Pt*-LAkBaN{h+FQ-3E
z;`n=Rii_rtVZ`VtiH%beHXhzJarZ_BefQFcMQqp(FXwU4zD+?*qYSs#wdiB)N*Sw9
z7Anfwv3U$!rug4F3v1j0`pWx;h+)osmBPzpZRR2jkDbIKPVVU5s~Pm)&tP~Uj?vKw
zVzC&-LZm_uxpDhe0QC)C)YR)}r^4fAQhI~*dWO%nZdxl>mn@b9smlXve4gdT+}ElX
z|J!E5a5FW#r0>4S5$5=Nh8SXJ@LKiom@VduyRKx>b0>lDWE|7e5k#X=(daeX_?1W|
zM7!zmuz`TjkFM)JRMmR1X`3NPQ`anuV`7RmmAG11U9#|Z7qB3;<gX2J79*vWCyEqX
zwn?%-!4`%xBqq%Z$23fntLeU$#l!n)j0`3)J{Cqi5l1?eCV}wT;DkxTZ5Q!aTs+3c
zWb{9D<8GH1Rp*1Ey|k`L6OG=S)p`6bG5fsM8roNvEWEC~Ed}{-{&RIqdXCfW$8w^&
zUdC%57&!e|3jg*`F@z_Qn3^JM5uOq~#!Q6g*-T>6^JDRtAlSs@BnJ9D@OAmndD(~B
z1`j%R>uBxZ_EK5sJxb~A8k`fW9<w+umhtC#g0%d(Dc|AjCOEDB`uACMULV8w_~eqC
zvzTC}nI+dXEgoZI8v2Piw{H<?YJ*f9b)%kK)RsLenl>w<A=_2LBQ)jarzgOf%-g^5
zQ9M$Iv)^PeJrxxvxfTmN4Z)8@A_0}m37_NGbv=zM7Yrheo5~Snaklarc3JFqDYd}3
zsAS<CGmcX_+YJ_jnkEIm`nxK+P%fPNwjYxd(?xCn<jIHXs%mJOMp@JlqOmBnK@AUj
zyts8OK-rWRjV(IbwyJ2}tfICtw{o=<CLoIT5u#IMzAsPG9pfU?>mV|n#aaZrfZApv
z%zq7u?!Rw7@5AKeRM7}iSy>6c-;a@z5k#U9@wz+(!4Hm+hK4ls-1VdLiXT<g9<n$Z
zcK$*a>N96*T>4n8+3BK@rT1P8|L^~FKKgSeZLetyQ$=a@n}1tD7p4v0ekoyWG+Y$I
z#N!F!hWPRGpxLxcm<bapBF^~uxCo4U?y<%33k|1ri!R1yn>%Fj`MBj`CF7f-k%hM#
zB}?o8$fbbq-VhV!!vOi!7M%J5bOD!6m_#DJ;B)MmO@lFVQL%Uw6BCmd9B`xi7Nz3V
z0n|0{b_NX{yEHVm=LYpy!&z?Plmpy(z+XO30KP>QhRbLt|3pGvcv_^=D+cFrV9a75
zj|xBNbtBXj#FdLa)Hk}R%%D<W%!?0|nZ<`#78H#vo45J#{@=BT#WieYzWjYZ?%s+l
z;EHnFk$As-Uc?l!?qbz2qx8Q0QGjYg?UW_;lhi-4vV@rdTQz>Ldd$SpM|AY{QYzjV
zKxGvN#s;}6O&nUm*C8@xiBnJ7cNAxvL(#~>4cafiQTwQ2`=@i`f-LjGr2F-n5B9zM
zC%e0nGNjPz3lG667vA|VeyCb2zW<AY!NHMLA<Qghr#y41cpQ^q1C!%H4D|;|eI}LI
zD-o$6em1j)Q-qBUtLuhHfU<YS;o6tT`xJ{O07r`0ILnr9k>8t$VMvEjlqQ`1TEg(q
zn7CNW3Gq=SN$k|+Q5aQK;5G~x9t|G1j;b1+K9@!TZ|+>k%4!u}Dku0WB=q-~xOO2c
z7BH0*SrTzeSQ0jWT!fpRDj;<xb=C=)aJA*H4Ot`f5l4%YR@q`(wkft$an*S-zMU=1
z@n3n#dN$yPGZJMiBf>2d17gXtEDMc?_uuF`Uw91_L7mD1M1+tbh!Lt$5UNrUtX4#w
zNu#WYrzUx>>B(YcB5sS_d&!tXe;-Rm(a3VIJA(iFzpp>KYdJG2wbYs033_jvczDOe
zF{&_&?M;gyOjV5wuYc&J8>4|-l0+_PxFEvJT8Z2by0D5YR+H$4M%F?_sG0~-W6<ks
z!eUf}baL;q*!RmDwRks+*lXi@ocYX0c(*5~0!OE9alGGBQM}Z74G3{;^>!Z65Sw;z
z{?BO~c?06~_vf}SQqCp4^1g@uP>=Jc$mI7AKjV_vLhyt4@vEu~uTO)|ufrE0*HPt0
zRlP=msfuc{7Qv7LUr-TS8w?LG?pb;R74Q1vb+GYhaqij;mpb$5VMpH7@xx!zq9x(g
zUsGMC_4x@in^wR2YcItFwZM57Mk%f330uQWE~1hx1G$VUgW?GK|CI(+w-q7>rMJ8p
ze5NT%;_aWVJe#|h2%d&ebrJ%ni=#eoNS%e}hIoGH;x}p0DaRdii*iXb7uZD#-mbmX
zc)c}5gy19XGz2PCvEaw;rC7pPouVKUkXMFrr(ZF!VMRG6%+a@XeE&tx!Z2a#nhUou
z9FL6;TVhH;A?xt|@4RF|WZ^nWrCOZLIKtAUk`8PN6I@GN-n^j)XWZlpUj8Kol{`=M
z#}tP9%z}gRi4jXQd~>Y!>IZJB7R#cEX(fna5(&87ldWQJ_tS&<&de!n_itu#`m>}s
zp@a|7Du%4P;pKkTBseoV_f^iq9DB!@H|Wjnp0V)Fzb8cnn2(34tXTnuI1tr*?&|FP
zYZjNzq(%DzAAmLcxp>l`uRDut7qhu(11bT$|FK7O0v2Q1V0FntGQQNW!@8LNDN-**
zX!i0dxIDV?61gO9+P?TLWl8kKHp~(9&bl6co=$oOkHPZB&E*8YC%cp3J`49dv!bJp
zH=7@SPe)6KBG!NKXX?8{kGoU`m~znA<`Ug^{BPixrC7D1)g=ozV~?xi1dY6yqKoEU
zUb2WykW{(lPJgyA9EWhH|C3qL?BQ5HP|9u5#e40;+^Y5ED%#DulkljG&Py4w^oaM<
zbnI2pLWIe(@HuJY#)S;-+%SdZ*t%Q6rgte5tCB?7rPx?yxu4AHz8KV_vAj>o{^*6%
zZD1w9rGAcKE^u1?d2W`dnOqWwF-(+iKjU^tiHPDMon?6j>%~c~Q5*L<b4T1o!Zy`*
zax+d1ZR|@V^xVqg?oAUT{T8`V3A+!e=-8<|T1dTISpArVZvbVUsB#4wwx0yYFuZK=
z;;A%QksM*Tk(xz3S<1Pd<sb^jB0NglPXXzjYgvTHZ9$HMCk&y!a;ai;z(Us*CW$Fr
z=fM-2a7+FQ*NSw{mHS!d0FP%Jd4nv>$uz$CkEF0Byc_1NkKAJ8b}@;<mSl32;|;2<
z-N=fHJ;xeM*y=_ZnY1IU3=@dmPF*v_S8p0(W?LN4wH7<&)*EJpy9+1jj-Rq{;@3qc
z3TIVg7H(c5mqLLnzwZ7cxdqZ}-MFFd+PMtw-^z-EIeD`2=sO<NG`d#pu&Xse7B;~w
zEXm3uWNW(h7JCPB40Garw<tieD=MZ%;nio?f5>3qfrTAZuiCj^5$`uOVd3(3Y1|+Z
z@rf$j0k{1Zsu&Mh?G<Nhf-Jlq<IlfOigNq&f<-c(HQu~S6K6B4&)MYs=v0s*gFn}S
zS9Khea;*g{2wozR4EES!?1STxO*_<OZIgUntc}f2h9okA#We76;K=)G@7zd`{vgv`
zs);E;-Ltw^fC<2H5U0d9E@m)A0WF{Tc=R1zkegjmsjcl;6J+61`~IW)BF}JkNUwm9
zzi(5Jc<R$6rNd-tcJd)wxpu>qymQ&5@**IX=^xxR#VQY0fDcnZ+rC4A;VB(U@^h?-
z{Ve?5v3#(&x{E}2DX^D<$1NmUjSSeheKjj|6jnEXaa0p=0TXdKFA~>~SY7Sy%Hq~f
zS#kCvljFc|DR3sT=tk+1WEQKwpT*TpHT=o^YXoHaoop0GN8rL?>sFU=M=YQ7-WAqU
zIAz_sPZf$Sccc|-R5UmK<6vSaC&xb^IiCBY_++=82UOv9R(eouDOgpq@X2i3LLRhl
zsmS{r{vNsh!sfXcVC%%Lr*)e`q8D2llP)9$m#0!x!l%L<S)ZLRXhLgQO3c8g$VVnE
z-1?E#)~q1JKC*6Y+ZB<5uf=Upt4bD@rr8C&NLfK%%v9Hx<L=`wG9Hs)((E~`q3fp%
zX&xrJ$xU_aQn8ubL>*b1=ULXAPB@~go?Xo-5s}AC`B*&ucXIt{EuZnc>YJaK1gjnO
zGa0zu^3dxBRcpyz+$P18T+=-g%lL#<?%U;a9rG>SVRw@z9q1vsnY&cf8|byj#ZYDV
zm!!0ARfS%%9#B?rpMW&eh|O+-T@g19U8Ab*SDz$Aoo3G=p3QN=<IPzJCP^f0QDM)-
zjlX6^5X&+=_mEUIJin$>>R3^-%#K2E&#IvtWKooo{4zP7FuaoJ31K(Yf1l!-ds(pt
zm0iguO1rD5n8?S+4D_1fxZZY(MYitYUK4pmhSXOB%TAWuBpnY;DRif)j}8qF20dbm
zE*L7^g|TcsxQArRUR4CdV}mwXkTfozO^ezNkA`v<#k0k}pd`jO)-#GqmPezO{K6{v
zYQrrK1owCh_ybe~tD|yzqaqG<5{H5}%VLPC)FBR}no*JKTik*)Q7SGrv?$_~wY40y
zJ`a{mmRZXoljYFJa`4&BY&ilIhM1eFuG7SU-;M3Lbr8OQBo517s~f1<#c=$RYed>u
zSTtF9H=3^LbjRuNxY@PjPKB?kRm5I4uD`JO6{wUUYY@lXuSY+=k?>q(;ThY2-;aul
z3i$m7`D_h!jhZ--l-mz0Yh*FKZ+O?w3i2`@qhPYAWPWSvRrq{$BE4)Nx5Dm)_ucaZ
zKR4u*39`N+IR&nc=4VZfSwcJTu5l%@jK!f~vXoIq**=s}Fv?^pqhOTDQbxfjlckJ;
kQ6@_n1*1%sG783j0&xa~6R7k}YybcN07*qoM6N<$f-G3Sy#N3J

literal 0
HcmV?d00001

diff --git a/app/assets/v2/js/grants/contribution-trust-bonus.js b/app/assets/v2/js/grants/contribution-trust-bonus.js
new file mode 100644
index 00000000000..eaec2383733
--- /dev/null
+++ b/app/assets/v2/js/grants/contribution-trust-bonus.js
@@ -0,0 +1,20 @@
+
+Vue.component('contribution-trust-bonus', {
+  delimiters: [ '[[', ']]' ],
+  data: function() {
+    return {
+      modalId: 'trust-bonus'
+    };
+  },
+  methods: {
+    show() {
+      this.$bvModal.show(this.modalId);
+    },
+    close() {
+      this.$bvModal.hide(this.modalId);
+    },
+    goToTrustBonus() {
+      document.location = '/profile/trust';
+    }
+  }
+});
diff --git a/app/assets/v2/js/grants/grant-thanks-modal.js b/app/assets/v2/js/grants/grant-thanks-modal.js
index a7de0a9b05c..a8762ce2af7 100644
--- a/app/assets/v2/js/grants/grant-thanks-modal.js
+++ b/app/assets/v2/js/grants/grant-thanks-modal.js
@@ -6,21 +6,7 @@ Vue.component('contribution-thanks-modal', {
       imgURL: '',
       numberOfContributions: 0,
       donations: [],
-      tweetUrl: '',
-      current_type: 'collections',
-      hideCollectionButtons: true,
-      collection: {
-        id: 0,
-        title: '',
-        description: '',
-        grants: [],
-        hideButtons: true,
-        owner: {
-          url: document.contxt.profile_url,
-          handle: document.contxt.github_handle,
-          avatar_url: '/dynamic/avatar/' + document.contxt.github_handle
-        }
-      }
+      tweetUrl: ''
     };
   },
   mounted: function() {
@@ -43,20 +29,11 @@ Vue.component('contribution-thanks-modal', {
     }
 
     this.donations = checkoutData;
-
-    this.collection.count = checkoutData.length;
-
-    this.collection.grants = checkoutData.map((grant) => {
-
-      return {...grant, logo: grant.grant_logo };
-    });
   },
   methods: {
-    showSingleCollection() {
-      return true;
-    },
     close() {
       this.$bvModal.hide(this.modalId);
+      this.$bvModal.show('trust-bonus');
     },
     handleHide() {
       CartData.clearCheckedOut();
diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js
index e8799b31612..c3b223ef777 100644
--- a/app/assets/v2/js/grants/index.js
+++ b/app/assets/v2/js/grants/index.js
@@ -431,7 +431,7 @@ if (document.getElementById('grants-showcase')) {
         vm.grantsNumPages = getGrants.num_pages;
         vm.grantsHasNext = getGrants.has_next;
         vm.numGrants = getGrants.count;
-        vm.changeBanner()
+        vm.changeBanner();
 
         if (vm.grantsHasNext) {
           vm.page = ++vm.page;
diff --git a/app/grants/templates/grants/index.html b/app/grants/templates/grants/index.html
index c6e41b7d1e4..090c19a3d9c 100644
--- a/app/grants/templates/grants/index.html
+++ b/app/grants/templates/grants/index.html
@@ -219,6 +219,7 @@
   <script src="{% static "v2/js/grants/_detail-component.js" %}"></script>
   <script src="{% static "v2/js/grants/funding.js" %}"></script>
   <script src="{% static "v2/js/grants/create-collection-modal.js" %}"></script>
+  <script src="{% static "v2/js/grants/contribution-trust-bonus.js" %}"></script>
   <script src="{% static "v2/js/grants/grant-thanks-modal.js" %}"></script>
   <script src="{% static "v2/js/grants/index.js" %}"></script>
 </body>
diff --git a/app/retail/templates/shared/contribution_trust_bonus.html b/app/retail/templates/shared/contribution_trust_bonus.html
new file mode 100644
index 00000000000..79ea333bce6
--- /dev/null
+++ b/app/retail/templates/shared/contribution_trust_bonus.html
@@ -0,0 +1,54 @@
+{% comment %}
+    Copyright (C) 2019 Gitcoin Core
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+{% endcomment %}
+{% load i18n static %}
+<contribution-trust-bonus ref="trustBonus" inline-template>
+  <b-modal id="trust-bonus"
+    size="lg"
+    center
+    hide-header
+    hide-footer>
+      <div>
+        <div class="my-2 mx-3 row justify-content-end">
+            <b-button @click="close()" type="button" variant="white" class="close" data-dismiss="modal" aria-label="Close"></button>
+              <span aria-hidden="true">&times;</span>
+            </b-button>
+        </div>
+        <div class="mx-3 mx-md-5 pb-4">
+          <div class="d-inline-flex flex-column text-left text-md-center w-100">
+            <h3 class="mb-0 mb-md-5 d-flex-inline">Increase your QF matching by up to 25%</h3>
+            <div class="align-self-center d-flex mb-5 mb-md-0 row" width="35%" style="max-width: 728px;" style="background: url(), url({% static 'v2/images/grants/image.png' %});">
+              <img class="col-12 col-md-6 d-inline-flex" width="139px" src="{% static 'v2/images/grants/trust-bonus.png' %}" />
+              <img class="col-md-6 d-md-inline-flex d-none" width="139px" style="transform: scaleX(-1);" src="{% static 'v2/images/grants/trust-bonus.png' %}" />
+            </div>
+          </div>
+          <div class="mt-5 my-4">
+            <a>Increase your CLR Match Amount by verifying your profile with various services, and help Gitcoin be more sybil-resistant. Do this anytime before the end of the grants round to earn the match retroactively for all your contributions.</a>
+          </div>
+        </div>
+        <div class="mb-4 mt-2 px-1 d-flex justify-content-end">
+          <b-button
+            class="mt-2 col-md-4 col-sm-12 btn-primary"
+            variant="primary"
+            @click="goToTrustBonus()"
+          >
+            Verify Profile
+          </b-button>
+        </div>
+      </div>
+  </b-modal>
+</contribution-trust-bonus>
diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index d63c2d3a457..6fcfdbdac6f 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -17,62 +17,61 @@
 {% endcomment %}
 {% load i18n static %}
 <contribution-thanks-modal inline-template>
-  <b-modal id="contribution-thanks"
-    @hide="handleHide()"
-    size="lg"
-    center
-    hide-header
-    hide-footer>
-      <div>
-        <div class="my-2 mx-3 row justify-content-end">
-            <b-button @click="close()" type="button" variant="white" class="close" data-dismiss="modal" aria-label="Close"></button>
-              <span aria-hidden="true">&times;</span>
-            </b-button>
-        </div>
-        <div class="mx-3 mx-md-5 pb-4">
-          <div class="d-inline-flex flex-column-reverse flex-md-column text-left text-md-center">
-            <h3 class="mb-0 mb-md-5 d-flex-inline">Thank you for your contribution!</h3>
-            <!-- <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="35%" style="max-width: 728px;" src="{% static "v2/images/grants/space-funding-woman.png" %}" /> -->
-            <div class="align-self-center d-flex-inline mb-5 mb-md-0 col-12 col-lg-6">
-              <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="75%" style="max-width: 728px;" :src="imgURL" />
-              <!-- <grant-collection :collection="collection" v-on:collection:show="true" :small="false"></grant-collection> -->
-            </div>
+  <div>
+    <b-modal id="contribution-thanks"
+      @hide="handleHide()"
+      size="lg"
+      center
+      hide-header
+      hide-footer>
+        <div>
+          <div class="my-2 mx-3 row justify-content-end">
+              <b-button @click="close()" type="button" variant="white" class="close" data-dismiss="modal" aria-label="Close"></button>
+                <span aria-hidden="true">&times;</span>
+              </b-button>
           </div>
-          <div class="mt-5 my-4">
-
-            You've successfully contributed to [[numberOfContributions]] grants:
-          </div>
-          <hr />
-          <div>
-            <template v-for="donation in donations">
-              <div class="my-3">
-                <a :href="donation.grant_url" target="_blank">[[donation.grant_title]]</a><br />
-                [[donation.grant_donation_amount]] [[donation.grant_donation_currency]]
-                <span v-if="donation.grant_donation_clr_match > 0" class="text-success"> + [[donation.grant_donation_clr_match]] DAI matching</span>
+          <div class="mx-3 mx-md-5 pb-4">
+            <div class="d-inline-flex flex-column-reverse flex-md-column text-left text-md-center">
+              <h3 class="mb-0 mb-md-5 d-flex-inline">Thank you for your contribution!</h3>
+              <div class="align-self-center d-flex-inline mb-5 mb-md-0 col-12 col-lg-6">
+                <img class="align-self-center d-flex-inline mb-5 mb-md-0" width="75%" style="max-width: 728px;" :src="imgURL" />
               </div>
-            </template>
-          </div>
-          <hr />
-          <div class="mt-2 mb-4 px-1 row justify-content-end">
-            <b-button
-              class="mt-2 mx-2 col-md-4 col-sm-12"
-              variant="outline-primary"
-              @click="$refs.createCollection.fetchCollections()"
-            >
-              Save as Collection
-            </b-button>
-            <b-button
-              class="mt-2 mx-2 col-md-4 col-sm-12"
-              variant="primary"
-              :href="tweetUrl"
-            >
-              <i class="fab fa-twitter" aria-hidden="true"></i>
-              Share on Twitter
-            </b-button>
+            </div>
+            <div class="mt-5 my-4">
+              You've successfully contributed to [[numberOfContributions]] grants:
+            </div>
+            <hr />
+            <div>
+              <template v-for="donation in donations">
+                <div class="my-3">
+                  <a :href="donation.grant_url" target="_blank">[[donation.grant_title]]</a><br />
+                  [[donation.grant_donation_amount]] [[donation.grant_donation_currency]]
+                  <span v-if="donation.grant_donation_clr_match > 0" class="text-success"> + [[donation.grant_donation_clr_match]] DAI matching</span>
+                </div>
+              </template>
+            </div>
+            <hr />
+            <div class="mt-2 mb-4 px-1 row justify-content-end">
+              <b-button
+                class="mt-2 mx-2 col-md-4 col-sm-12"
+                variant="outline-primary"
+                @click="$refs.createCollection.fetchCollections()"
+              >
+                Save as Collection
+              </b-button>
+              <b-button
+                class="mt-2 mx-2 col-md-4 col-sm-12"
+                variant="primary"
+                :href="tweetUrl"
+              >
+                <i class="fab fa-twitter" aria-hidden="true"></i>
+                Share on Twitter
+              </b-button>
+            </div>
           </div>
+          {% include 'shared/create_collection_modal.html' %}
         </div>
-        {% include 'shared/create_collection_modal.html' %}
-      </div>
-  </b-modal>
+      </b-modal>
+      {% include 'shared/contribution_trust_bonus.html' %}
+  </div>
 </contribution-thanks-modal>
-

From fe131e392fd1ad9f83ea04694a213e5dfd56a078 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 10 Mar 2021 13:56:56 -0300
Subject: [PATCH 15/30] show clr as selected when on url

---
 app/grants/templates/grants/shared/sidebar_search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/grants/templates/grants/shared/sidebar_search.html b/app/grants/templates/grants/shared/sidebar_search.html
index a0936a2ea4d..5f200df3a58 100644
--- a/app/grants/templates/grants/shared/sidebar_search.html
+++ b/app/grants/templates/grants/shared/sidebar_search.html
@@ -52,7 +52,7 @@
           {% for active_round in active_rounds %}
             <li>
               <a href="/grants/clr{% if active_round.customer_name %}/{{ active_round.customer_name }}{% endif %}{% if active_round.round_num %}/{{ active_round.round_num }}{% endif %}{% if active_round.sub_round_slug %}/{{ active_round.sub_round_slug }}{% endif %}"
-                 :class="`btn btn-link font-smaller-1 text-decoration-none text-left ml-0 pl-0  ${ idle_grants ? 'gc-text-blue' : 'text-black'}`">
+                 :class="`btn btn-link font-smaller-1 text-decoration-none text-left ml-0 pl-0  ${ sub_round_slug == '{{ active_round.sub_round_slug }}' ? 'selected' : ''}`">
                 {% if active_round.display_text %}
                   {{ active_round.display_text|upper }}
                 {% elif active_round.customer_name %}

From e8c640464e6d3fae43852db4dbf4901b6a2f2d4c Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 10:04:52 -0700
Subject: [PATCH 16/30] fix for site search not working

---
 app/search/views.py   | 14 ++++++++------
 requirements/base.txt |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/search/views.py b/app/search/views.py
index d6c2b833ff1..fbbb8e10dc1 100644
--- a/app/search/views.py
+++ b/app/search/views.py
@@ -10,18 +10,21 @@
 from ratelimit.decorators import ratelimit
 from retail.helpers import get_ip
 
-from .models import SearchResult, search
+from search.models import SearchResult, search
 
 logger = logging.getLogger(__name__)
 
 
-@ratelimit(key='ip', rate='30/m', method=ratelimit.UNSAFE, block=True)
 @ratelimit(key='ip', rate='30/m', method=ratelimit.UNSAFE, block=True)
 def get_search(request):
+    mimetype = 'application/json'
     keyword = request.GET.get('term', '')
+    return_results = search_helper(term)
+    return HttpResponse(json.dumps(return_results), mimetype)
+
+def search_helper(keyword):
 
     # attempt elasticsearch first
-    mimetype = 'application/json'
     return_results = []
     try:
         all_result_sets = search(keyword)
@@ -40,7 +43,7 @@ def get_search(request):
         logger.exception(e)
     finally:
         if not settings.DEBUG or len(return_results):
-            return HttpResponse(json.dumps(return_results), mimetype)
+            return return_results
 
     all_result_sets = [SearchResult.objects.filter(title__icontains=keyword), SearchResult.objects.filter(description__icontains=keyword)]
     return_results = []
@@ -71,5 +74,4 @@ def get_search(request):
             ip_address=get_ip(request)
         )
 
-    mimetype = 'application/json'
-    return HttpResponse(json.dumps(return_results), mimetype)
+    return return_results
diff --git a/requirements/base.txt b/requirements/base.txt
index 6b2e7e7a78d..de4ac65d0ea 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -30,7 +30,7 @@ python-twitter==3.2
 sendgrid==5.6.0
 slackclient==2.0.0
 eth-tester
-elasticsearch
+elasticsearch==7.10.0
 websockets
 web3==4.5.0
 eth-abi==1.1.1

From 80eac94e5ed8ee2012f1298e341ca34e1249dcdb Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 10 Mar 2021 14:16:38 -0300
Subject: [PATCH 17/30] fix values on grants details

---
 .../grants/detail/template-grant-details.html          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index 01e40794604..a7bfd3059ba 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -188,9 +188,15 @@ <h3 class="col-12" v-else>
             </h3>
           </div>
           <div class="row mt-2">
-            <div class="col col-4">
+            <div class="col col-4" v-if="grant.clr_round_num && grant.is_clr_eligible">
+              <h2>$[[ grant.amount_received_in_round || 0 | round | formatNumber ]]</h2>
+              <span>
+                raised from [[ grant.positive_round_contributor_count ]] contributors
+              </span>
+            </div>
+            <div class="col col-4" v-else>
               <h2>$[[grant.amount_received || 0 | round | formatNumber ]]</h2>
-              <span>raised from all contributors</span>
+              <span>total raised</span>
             </div>
             <div v-if="[[ grant?.clr_prediction_curve?.[0]?.[1] ]] > 0" class="col col-4">
               <h2 class="text-secondary">+$[[ grant?.clr_prediction_curve?.[0]?.[1] || 0 | round | formatNumber ]]</h2>

From ec0171f99900b16a81827ffccc8e259fb7c7ecc5 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 10:43:44 -0700
Subject: [PATCH 18/30] one small fix

---
 app/dashboard/templates/shared/menu.html | 2 +-
 app/search/views.py                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/dashboard/templates/shared/menu.html b/app/dashboard/templates/shared/menu.html
index fdfa8545ba0..c44126b3f1e 100644
--- a/app/dashboard/templates/shared/menu.html
+++ b/app/dashboard/templates/shared/menu.html
@@ -78,7 +78,7 @@
                   <img class="mw-100 logo-static p-2" src="{% static "v2/images/top-bar/grants-symbol-pos.svg" %}" alt="Grants" height="48">
                   <b class="gc-megamenu-title">{% trans "Grants" %}</b>
                 </a>
-                <p class="px-2 m-0 mb-2 text-wrap font-smaller-2">{% trans "Recurring funding for Open Source" %}</p>
+                <p class="px-2 m-0 mb-2 text-wrap font-smaller-2">{% trans "Crowdfunding for Open Source" %}</p>
               </li>
               <li>
                 <a class="dropdown-item dropdown-item-small" href="{% url 'grants:grants' %}">{% trans "Explore Grants" %}</a>
diff --git a/app/search/views.py b/app/search/views.py
index fbbb8e10dc1..195aab4bf0e 100644
--- a/app/search/views.py
+++ b/app/search/views.py
@@ -19,7 +19,7 @@
 def get_search(request):
     mimetype = 'application/json'
     keyword = request.GET.get('term', '')
-    return_results = search_helper(term)
+    return_results = search_helper(keyword)
     return HttpResponse(json.dumps(return_results), mimetype)
 
 def search_helper(keyword):

From 27b8e4c74fe0c385b26c16d73044bf91bb9f327d Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 10 Mar 2021 15:07:07 -0300
Subject: [PATCH 19/30] fix conditions showing estimates

---
 app/grants/templates/grants/detail/template-grant-details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index a7bfd3059ba..82155be0c10 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -198,7 +198,7 @@ <h2>$[[ grant.amount_received_in_round || 0 | round | formatNumber ]]</h2>
               <h2>$[[grant.amount_received || 0 | round | formatNumber ]]</h2>
               <span>total raised</span>
             </div>
-            <div v-if="[[ grant?.clr_prediction_curve?.[0]?.[1] ]] > 0" class="col col-4">
+            <div v-if="grant?.clr_prediction_curve?.[0]?.[1] > 0 && grant.is_clr_eligible" class="col col-4">
               <h2 class="text-secondary">+$[[ grant?.clr_prediction_curve?.[0]?.[1] || 0 | round | formatNumber ]]</h2>
               <span v-if="grant.clr_round_num && grant.is_clr_eligible">estimated QF matching</span>
               <span v-if="!grant.clr_round_num || !grant.is_clr_eligible">Total QF matched</span>

From 658243e5319c6c0b265073b94348b1585a8814b8 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 10 Mar 2021 15:07:51 -0300
Subject: [PATCH 20/30] fix collections

---
 app/assets/v2/js/grants/components.js            | 2 +-
 app/assets/v2/js/grants/index.js                 | 2 --
 app/grants/templates/grants/components/card.html | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/v2/js/grants/components.js b/app/assets/v2/js/grants/components.js
index 562495f37e8..46f72687834 100644
--- a/app/assets/v2/js/grants/components.js
+++ b/app/assets/v2/js/grants/components.js
@@ -93,7 +93,7 @@ Vue.component('grant-card', {
       CartData.removeIdFromCart(vm.grant.id);
       showSideCart();
     },
-    addToCollection: async function({collection, grant}) {
+    addToCollection: async function(collection, grant) {
       const collectionAddGrantURL = `/grants/v1/api/collections/${collection.id}/grants/add`;
       const response = await fetchData(collectionAddGrantURL, 'POST', {
         'grant': grant.id
diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js
index c3b223ef777..f209118bade 100644
--- a/app/assets/v2/js/grants/index.js
+++ b/app/assets/v2/js/grants/index.js
@@ -67,7 +67,6 @@ Vue.component('grant-sidebar', {
       this.filter_grants(me);
 
       this.search = me.keyword;
-      console.log('searchkey', this.search);
     },
     filterLink: function(params) {
 
@@ -79,7 +78,6 @@ Vue.component('grant-sidebar', {
       }
 
       this.timeout = setTimeout(() => {
-        console.log('searchkey', this.search);
         this.filter_grants({keyword: this.search});
       }, 1000);
     },
diff --git a/app/grants/templates/grants/components/card.html b/app/grants/templates/grants/components/card.html
index 8e640137ee2..305370c0ae7 100644
--- a/app/grants/templates/grants/components/card.html
+++ b/app/grants/templates/grants/components/card.html
@@ -135,7 +135,7 @@ <h2 class="font-subheader">
               <template v-slot:button-content>
                 <span class="text-muted"><i class="fas fa-th-large mr-1"></i> Add to Collection</span>
               </template>
-              <b-dropdown-item @click.prevent="addToCollection({grant, userCollection})" v-for="userCollection in collections" :key="userCollection.id" v-if="collection?.id != userCollection.id">[[userCollection.title]]</b-dropdown-item>
+              <b-dropdown-item @click.prevent="addToCollection(userCollection, grant)" v-for="userCollection in collections" :key="userCollection.id" v-if="!collection || collection?.id != userCollection.id">[[userCollection.title]]</b-dropdown-item>
             </b-dropdown>
           </div>
         </div>
@@ -272,7 +272,7 @@ <h2 class="font-subheader">
               <template v-slot:button-content>
                 <span class="text-muted"><i class="fas fa-th-large mr-1"></i> Add to Collection</span>
               </template>
-              <b-dropdown-item @click.prevent="addToCollection({grant, userCollection})" v-for="userCollection in collections" :key="userCollection.id" v-if="collection?.id != userCollection.id">[[userCollection.title]]</b-dropdown-item>
+              <b-dropdown-item @click.prevent="addToCollection(userCollection, grant)" v-for="userCollection in collections" :key="userCollection.id" v-if="!collection || collection?.id != userCollection.id">[[userCollection.title]]</b-dropdown-item>
             </b-dropdown>
           </div>
 

From b9d9d3894fed9aa34275781a41e96bce69e8a3de Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 11:12:38 -0700
Subject: [PATCH 21/30] celery flusher

---
 app/grants/tasks.py     |  6 +++++-
 app/townsquare/tasks.py | 27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/grants/tasks.py b/app/grants/tasks.py
index b97aebeb80f..284f631faaf 100644
--- a/app/grants/tasks.py
+++ b/app/grants/tasks.py
@@ -32,6 +32,10 @@ def lineno():
 @app.shared_task(bind=True, max_retries=1)
 def update_grant_metadata(self, grant_id, retry: bool = True) -> None:
 
+    if settings.FLUSH_QUEUE:
+        return
+
+
     # KO hack 12/14/2020
     # this will prevent tasks on grants that have been issued from an app server from being immediately 
     # rewritten by the celery server.  not elegant, but it works.  perhaps in the future,
@@ -50,7 +54,7 @@ def update_grant_metadata(self, grant_id, retry: bool = True) -> None:
     grant_calc_buffer = max(1, math.pow(instance.contribution_count, 1/10)) # cc
     
     # contributor counts
-    do_calc = (time.time() - (900)) > instance.metadata.get('last_calc_time_contributor_counts', 0)
+    do_calc = (time.time() - (200 * grant_calc_buffer)) > instance.metadata.get('last_calc_time_contributor_counts', 0)
     if do_calc:
         print("last_calc_time_contributor_counts")
         instance.contribution_count = instance.get_contribution_count
diff --git a/app/townsquare/tasks.py b/app/townsquare/tasks.py
index 80e19b3b1d4..7e3e31623d9 100644
--- a/app/townsquare/tasks.py
+++ b/app/townsquare/tasks.py
@@ -20,21 +20,22 @@ def increment_view_counts(self, pks, retry=False):
     :param pks:
     :return:
     """
-    with redis.lock("tasks:increment_view_counts", timeout=LOCK_TIMEOUT):
+    if settings.FLUSH_QUEUE:
+        return
 
-        if len(pks) == 0:
-            return
-        # update DB directly
-        with connection.cursor() as cursor:
-            id_as_str = ",".join(str(id) for id in pks)
-            query = f"UPDATE dashboard_activity SET view_count = view_count + 1 WHERE id in ({id_as_str});"
-            cursor.execute(query)
-            cursor.close()
+    if len(pks) == 0:
+        return
+    # update DB directly
+    with connection.cursor() as cursor:
+        id_as_str = ",".join(str(id) for id in pks)
+        query = f"UPDATE dashboard_activity SET view_count = view_count + 1 WHERE id in ({id_as_str});"
+        cursor.execute(query)
+        cursor.close()
 
-        # invalidate cache
-        activities = Activity.objects.filter(pk__in=pks)
-        for obj in activities:
-            invalidate_obj(obj)
+    # invalidate cache
+    activities = Activity.objects.filter(pk__in=pks)
+    for obj in activities:
+        invalidate_obj(obj)
 
 @app.shared_task(bind=True, max_retries=3)
 def increment_offer_view_counts(self, pks, retry=False):

From 01ba134aa4e23da5cd04ed7d090c6c6bc7b0c583 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 11:51:33 -0700
Subject: [PATCH 22/30] a few more clenaup items

---
 app/retail/views.py               | 1 +
 app/townsquare/tasks.py           | 1 +
 scripts/debug/fix_grants_stats.py | 8 +++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/retail/views.py b/app/retail/views.py
index 88f29e639e6..bb7519bc4f7 100644
--- a/app/retail/views.py
+++ b/app/retail/views.py
@@ -1443,6 +1443,7 @@ def web3(request):
     return redirect('https://www.youtube.com/watch?v=cZZMDOrIo2k')
 
 
+@cached_view(timeout=60)
 def tokens(request):
     context = {}
     networks = ['mainnet', 'ropsten', 'rinkeby', 'unknown', 'custom']
diff --git a/app/townsquare/tasks.py b/app/townsquare/tasks.py
index 7e3e31623d9..ea442814d38 100644
--- a/app/townsquare/tasks.py
+++ b/app/townsquare/tasks.py
@@ -5,6 +5,7 @@
 from celery import app
 from celery.utils.log import get_task_logger
 from dashboard.models import Activity
+from django.conf import settings
 
 logger = get_task_logger(__name__)
 
diff --git a/scripts/debug/fix_grants_stats.py b/scripts/debug/fix_grants_stats.py
index ab1bc749838..c52885c7282 100644
--- a/scripts/debug/fix_grants_stats.py
+++ b/scripts/debug/fix_grants_stats.py
@@ -3,12 +3,10 @@
 
 
 from django.utils import timezone
-
+import pytz
 from grants.models import Grant
 from marketing.models import Stat
 
-lt_pk = 47067421 * 999
-
 key_titles = [
     ('_match', 'Estimated Matching Amount ($)', '-positive_round_contributor_count', 'grants' ),
     ('_pctrbs', 'Positive Contributors', '-positive_round_contributor_count', 'grants' ),
@@ -27,8 +25,8 @@
         key_list.append(item)
 
 
-_from = timezone.now() - timezone.timedelta(days=30)
-stats = Stat.objects.filter(key__in=key_list, pk__lt=lt_pk, created_on__gt=_from).order_by('-pk')
+_from = timezone.datetime(2021, 3, 10).replace(tzinfo=pytz.utc)
+stats = Stat.objects.filter(key__in=key_list, created_on__gt=_from).order_by('-pk')
 for stat in stats:
     stat.created_on -= timezone.timedelta(microseconds=stat.created_on.microsecond)
     stat.created_on -= timezone.timedelta(seconds=int(stat.created_on.strftime('%S')))

From 1b6bb734eb2ace4eec2c771e3172c6cdd0ab4c70 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 12:00:09 -0700
Subject: [PATCH 23/30] make long poller less aggressive for site loadtime
 reasons

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

diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js
index 544bc063dfe..0934e4e6096 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -196,7 +196,7 @@ $(document).ready(function() {
 
   // refresh activity page
   document.buffered_rows = [];
-  var refresh_interval = 7000;
+  var refresh_interval = 55000;
   var max_pk = null;
   var run_longpoller = function(recursively) {
     if (document.hidden || !document.long_poller_live) {

From 1bd36beabb50ad36d2f9ffed484f2fb49cae6ed2 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Thu, 11 Mar 2021 00:48:27 +0530
Subject: [PATCH 24/30] show total amount (#8529)

* show total amount

* address changes
---
 .../grants/detail/template-grant-details.html | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/grants/templates/grants/detail/template-grant-details.html b/app/grants/templates/grants/detail/template-grant-details.html
index 82155be0c10..0142851436c 100644
--- a/app/grants/templates/grants/detail/template-grant-details.html
+++ b/app/grants/templates/grants/detail/template-grant-details.html
@@ -179,6 +179,15 @@ <h2 class="mb-0">
 
         <!-- CLR details [[grant.positive_round_contributor_count]] -->
         <div class="border-bottom mt-3 pb-3">
+
+          <div class="row mt-2">
+            <div class="col mb-5">
+              <h3>Lifetime funding received</h3>
+              <h2>$[[grant.amount_received || 0 | round | formatNumber ]]</h2>
+              <span>raised from all contributors</span>
+            </div>
+          </div>
+
           <div class="row">
             <h3 class="col-12" v-if="grant.clr_round_num && grant.is_clr_eligible">
               Grants Round [[grant.clr_round_num]]
@@ -187,21 +196,17 @@ <h3 class="col-12" v-else>
               Not in an active matching round
             </h3>
           </div>
-          <div class="row mt-2">
-            <div class="col col-4" v-if="grant.clr_round_num && grant.is_clr_eligible">
+
+          <div class="row mt-2" v-if="grant.clr_round_num && grant.is_clr_eligible">
+            <div class="col col-4">
               <h2>$[[ grant.amount_received_in_round || 0 | round | formatNumber ]]</h2>
               <span>
                 raised from [[ grant.positive_round_contributor_count ]] contributors
               </span>
             </div>
-            <div class="col col-4" v-else>
-              <h2>$[[grant.amount_received || 0 | round | formatNumber ]]</h2>
-              <span>total raised</span>
-            </div>
-            <div v-if="grant?.clr_prediction_curve?.[0]?.[1] > 0 && grant.is_clr_eligible" class="col col-4">
+            <div v-if="grant?.clr_prediction_curve?.[0]?.[1] > 0" class="col col-4">
               <h2 class="text-secondary">+$[[ grant?.clr_prediction_curve?.[0]?.[1] || 0 | round | formatNumber ]]</h2>
-              <span v-if="grant.clr_round_num && grant.is_clr_eligible">estimated QF matching</span>
-              <span v-if="!grant.clr_round_num || !grant.is_clr_eligible">Total QF matched</span>
+              <span>estimated QF matching</span>
             </div>
           </div>
         </div>

From b33a8315a0756025279b8082133ae5d3ef5c1309 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 13:15:06 -0700
Subject: [PATCH 25/30] show rounds with most clout

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

diff --git a/app/grants/views.py b/app/grants/views.py
index e6298d47b14..8a17ab1e3b0 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -3162,7 +3162,7 @@ def cart_thumbnail(request, profile, grants):
     height = int(request.GET.get('h', 175 * 5))
     grant_ids = grants.split(",")
     grant_ids = [ele for ele in grant_ids if ele]
-    grants = Grant.objects.filter(pk__in=grant_ids)[:4]
+    grants = Grant.objects.filter(pk__in=grant_ids).order_by('-amount_received_in_round')[:4]
     profile = Profile.objects.get(handle=profile.lower())
     thumbnail = generate_img_thumbnail_helper(grants, profile, width, height)
 

From 74d13ef802fdcb2967ee1d14393b32182f5294aa Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 13:29:24 -0700
Subject: [PATCH 26/30] caches tokens-dyanmic

---
 app/retail/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/retail/views.py b/app/retail/views.py
index bb7519bc4f7..fdceb088b9b 100644
--- a/app/retail/views.py
+++ b/app/retail/views.py
@@ -1453,6 +1453,7 @@ def tokens(request):
     return TemplateResponse(request, 'tokens_js.txt', context, content_type='text/javascript')
 
 
+@cached_view(timeout=60)
 def json_tokens(request):
     context = {}
     networks = ['mainnet', 'ropsten', 'rinkeby', 'unknown', 'custom']

From 0d0ae143811c209e39b93fbc18ee0a2f5cce8f96 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 14:05:59 -0700
Subject: [PATCH 27/30] scaling of contribution counts vs compute

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

diff --git a/app/grants/tasks.py b/app/grants/tasks.py
index 284f631faaf..f0e524ef16e 100644
--- a/app/grants/tasks.py
+++ b/app/grants/tasks.py
@@ -54,7 +54,7 @@ def update_grant_metadata(self, grant_id, retry: bool = True) -> None:
     grant_calc_buffer = max(1, math.pow(instance.contribution_count, 1/10)) # cc
     
     # contributor counts
-    do_calc = (time.time() - (200 * grant_calc_buffer)) > instance.metadata.get('last_calc_time_contributor_counts', 0)
+    do_calc = (time.time() - (2 * grant_calc_buffer)) > instance.metadata.get('last_calc_time_contributor_counts', 0)
     if do_calc:
         print("last_calc_time_contributor_counts")
         instance.contribution_count = instance.get_contribution_count

From 3659b983bc142ec1868d7bd5e21836f3812647f9 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 14:27:41 -0700
Subject: [PATCH 28/30]     # removes grants who are not in an active matching
 round from having a match prediction curve     # waits 14 days from removing
 them tho

---
 .../management/commands/create_page_cache.py    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/perftools/management/commands/create_page_cache.py b/app/perftools/management/commands/create_page_cache.py
index 11ceae13a50..424b19da1ad 100644
--- a/app/perftools/management/commands/create_page_cache.py
+++ b/app/perftools/management/commands/create_page_cache.py
@@ -91,9 +91,20 @@ def create_grant_type_cache():
 
 def create_grant_active_clr_mapping():
     print('create_grant_active_clr_mapping')
-    # Upate grants mppping to active CLR rounds
-    # NOTE: deprecated; this has been replaced by create_grant_clr_cache
-    # by Owocki 12/16/2020
+
+    # removes grants who are not in an active matching round from having a match prediction curve
+    # waits 14 days from removing them tho
+    from grants.models import *
+    from_date = timezone.now() - timezone.timedelta(days=14)
+    gclrs = GrantCLRCalculation.objects.filter(latest=True, grantclr__is_active=False, grantclr__end_date__lt=from_date)
+    for gclr in gclrs:
+        gclr.latest = False
+        gclr.save()
+        grant = gclr.grant
+        grant.calc_clr_round()
+        grant.save()
+
+
     return
 
 def create_hack_event_cache():

From 3bb90122c0094866b4fffa2772bc620ebe7fcfa0 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 15:15:20 -0700
Subject: [PATCH 29/30] prevent contributions from not saving if the email
 can't be sent due to compress issues

---
 app/grants/tasks.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/grants/tasks.py b/app/grants/tasks.py
index f0e524ef16e..36831d7da69 100644
--- a/app/grants/tasks.py
+++ b/app/grants/tasks.py
@@ -254,7 +254,10 @@ def process_grant_contribution(self, grant_id, grant_slug, profile_id, package,
                     comment=comment)
 
         # emails to grant owner
-        new_supporter(grant, subscription)
+        try:
+            new_supporter(grant, subscription)
+        except Exception as e:
+            logger.exception(e)
 
         # emails to contributor
         if send_supporter_mail:
@@ -262,7 +265,10 @@ def process_grant_contribution(self, grant_id, grant_slug, profile_id, package,
                 'grant': grant,
                 'subscription': subscription
             }]
-            thank_you_for_supporting(grants_with_subscription)
+            try:
+                thank_you_for_supporting(grants_with_subscription)
+            except Exception as e:
+                logger.exception(e)
 
         update_grant_metadata.delay(grant_id)
         return grant, subscription
@@ -288,7 +294,10 @@ def batch_process_grant_contributions(self, grants_with_payload, profile_id, ret
             "grant": grant,
             "subscription": subscription
         })
-    thank_you_for_supporting(grants_with_subscription)
+    try:
+        thank_you_for_supporting(grants_with_subscription)
+    except Exception as e:
+        logger.exception(e)
 
 
 @app.shared_task(bind=True, max_retries=1)

From 1dc8fd08125c9a1084e06e1abad8ee2aad961784 Mon Sep 17 00:00:00 2001
From: Kevin Owocki <owocki@Kevins-MacBook-Pro.local>
Date: Wed, 10 Mar 2021 15:33:00 -0700
Subject: [PATCH 30/30] fixes helper script

---
 app/search/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/search/views.py b/app/search/views.py
index 195aab4bf0e..17a593f2519 100644
--- a/app/search/views.py
+++ b/app/search/views.py
@@ -19,10 +19,10 @@
 def get_search(request):
     mimetype = 'application/json'
     keyword = request.GET.get('term', '')
-    return_results = search_helper(keyword)
+    return_results = search_helper(keyword, request)
     return HttpResponse(json.dumps(return_results), mimetype)
 
-def search_helper(keyword):
+def search_helper(keyword, request):
 
     # attempt elasticsearch first
     return_results = []
@@ -30,7 +30,7 @@ def search_helper(keyword):
         all_result_sets = search(keyword)
         return_results = [ele['_source'] for ele in all_result_sets['hits']['hits']]
 
-        if request.user.is_authenticated:
+        if request and request.user.is_authenticated:
             data = {'keyword': keyword}
             SearchHistory.objects.update_or_create(
                 search_type='sitesearch',