Merge branch 'stable'

gitcoinco · Jul 12, 2021 · fafe39d · fafe39d
2 parents 0e785a6 + 1c8bd0f
commit fafe39d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/app/dashboard/templates/profiles/trust-vue.html b/app/dashboard/templates/profiles/trust-vue.html
@@ -145,9 +145,11 @@ <h5 class="modal-title" id="exampleModalLabel">Generate your Proof of Personhood
               <h2>Increase Your Impact Up to 150%</h2>
               <span class="font-smaller-1 line-height-2">On Gitcoin verified users have 100% (or more) of their donation amount count towards the match fund algorithm. Unverified users begin with 50%. To ensure sybil resistance and protect Quadratic Funding, please verify your account below.</span>
               <div class="row spacer-mt-2 font-smaller-1 line-height-2">
-                <div class="col-12 col-lg-6 spacer-mt-2">
-                  <a><i class="far fa-calendar-alt spacer-pr-2"></i> Verify during [[round_start_date]] - [[round_end_date]]</a>
-                </div>
+                {% if round_active %}
+                  <div class="col-12 col-lg-6 spacer-mt-2">
+                    <a><i class="far fa-calendar-alt spacer-pr-2"></i> Verify during [[round_start_date]] - [[round_end_date]]</a>
+                  </div>
+                {% endif %}
                 <div class="col-12 col-lg-6 spacer-mt-2">
                   <span @click="showModal('why-this-matters-modal')" class="cursor-pointer hover-underline"><i class="fas fa-play-circle spacer-pr-2"></i> Why this matters</span>
                 </div>

diff --git a/app/dashboard/views.py b/app/dashboard/views.py
@@ -2937,6 +2937,7 @@ def get_profile_tab(request, profile, tab, prev_context):
         # place clr dates (as unix ts)
         context['round_start_date'] = calendar.timegm(round_start_date.utctimetuple())
         context['round_end_date'] = calendar.timegm(round_end_date.utctimetuple())
+        context['round_active'] = round_active
 
         # detail available services
         services = [

diff --git a/app/grants/templates/grants/shared/landing_qf_active.html b/app/grants/templates/grants/shared/landing_qf_active.html
@@ -2,7 +2,6 @@
 <div class="container bg-white">
 
   <!-- Trust banner -->
-
   <div v-if="{{trust_bonus}} && {{trust_bonus}} < 150" v-cloak class="alert alert-primary spacer-mt-4 border-1 border-primary">
     <i :class="'far font-weight-bold mr-4 mt-1 position-absolute cursor-pointer' + (!bannerCollapsed ? ' fa-minus' : ' fa-plus')" @click="toggleBannerCollapse" style="right: 0px; z-index: 2"></i>
     <div class="row">
@@ -13,11 +12,13 @@
         <h6 class="gc-font-base mt-1">Maximize Your Impact! Your current match is {{ trust_bonus }}%</h6>
         <span v-if="!bannerCollapsed" class="font-smaller-1 line-height-2">Verified users have up to 150% of their donation amount count towards the match fund algorithm. Unverified users — only 50%. Maximize your match by verifying with identity partners.</span>
         <div v-if="!bannerCollapsed" class="row spacer-mt-2 font-smaller-1 line-height-2">
-          <div class="col-12 col-lg-6 spacer-mt-2">
-            {% timezone "US/Mountain" %}
-              <a><i class="far fa-calendar-alt spacer-pr-2 text-primary"></i> Verify during {{ round_start_date|localtime|date:"F j" }} - {{ round_end_date|localtime|date:"F j" }}</a>
-            {% endtimezone %}
-          </div>
+          {% if round_active %}
+            <div class="col-12 col-lg-6 spacer-mt-2">
+              {% timezone "US/Mountain" %}
+                <a><i class="far fa-calendar-alt spacer-pr-2 text-primary"></i> Verify during {{ round_start_date|localtime|date:"F j" }} - {{ round_end_date|localtime|date:"F j" }}</a>
+              {% endtimezone %}
+            </div>
+          {% endif %}
           <div class="col-12 col-lg-6 spacer-mt-2">
             <span @click="showModal('why-this-matters-modal')" class="cursor-pointer hover-underline"><i class="fas fa-play-circle spacer-pr-2 text-primary"></i> Why this matters</span>
           </div>