Merge remote-tracking branch 'origin/stable'

gitcoinco · Apr 1, 2020 · 454485a · 454485a
2 parents f750372 + 947da9b
commit 454485a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
@@ -10,6 +10,15 @@ let gitcoinDonationAddress;
 
 document.suppress_faucet_solicitation = 1;
 
+var set_form_disabled = function(is_disabled) {
+  if (is_disabled) {
+    $('body').append('<div id=intercept_overlay>&nbsp;</div>');
+  } else {
+    $('#intercept_overlay').remove();
+  }
+};
+
+
 $(document).ready(function() {
 
 
@@ -122,14 +131,6 @@ $(document).ready(function() {
     $(event.currentTarget).addClass('badge-active');
   });
 
-  var set_form_disabled = function(is_disabled) {
-    if (is_disabled) {
-      $('body').append('<div id=intercept_overlay>&nbsp;</div>');
-    } else {
-      $('#intercept_overlay').remove();
-    }
-  };
-
   $('input[name=match_direction]').change(function(e) {
     let direction = $(this).val();
 
@@ -322,7 +323,7 @@ $(document).ready(function() {
 
             $('#transaction_url').attr('href', linkURL);
             enableWaitState('#grants_form');
-            // TODO: Fix tweet modal
+            set_form_disabled(false);
             $('#tweetModal').css('display', 'block');
 
           };
@@ -547,6 +548,7 @@ const signSubscriptionHash = (subscriptionHash) => {
     indicateMetamaskPopup();
     web3.eth.personal.sign('' + subscriptionHash, accounts[0], function(err, signature) {
       indicateMetamaskPopup(true);
+      set_form_disabled(false);
       $('#tweetModal').css('display', 'block');
 
       if (signature) {
@@ -650,6 +652,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
     _alert({ message: gettext('Your payment transaction failed. Please try again.')}, 'error');
   }).on('transactionHash', function(transactionHash) {
     indicateMetamaskPopup(1);
+    set_form_disabled(false);
     $('#tweetModal').css('display', 'block');
     data = {
       'subscription_hash': 'onetime',
@@ -670,7 +673,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
 
     $('#transaction_url').attr('href', linkURL);
     enableWaitState('#grants_form');
-    // TODO: Fix tweet modal
+    set_form_disabled(false);
     $('#tweetModal').css('display', 'block');
   }).on('confirmation', function(confirmationNumber, receipt) {
     data = {

diff --git a/app/dashboard/templates/shared/menu.html b/app/dashboard/templates/shared/menu.html
@@ -313,7 +313,7 @@ <h5>Weekly leaderboard</h5>
                   <img src="{{post.jetpack_featured_media_url}}" width="100" alt="" class="mw-100">
                 </div>
                 <a class="media-body text-reset" href="{{post.link}}">
-                  <b>{{post.title.rendered}}</b>
+                  <b>{{post.title.rendered | safe}}</b>
                   {{post.excerpt.rendered |truncatechars_html:150|safe}}
                 </a>
               </li>

diff --git a/app/grants/views.py b/app/grants/views.py
@@ -76,7 +76,7 @@
 clr_active = True
 show_clr_card = True
 next_round_start = timezone.datetime(2020, 3, 23, 12, 0)
-round_end = timezone.datetime(2020, 4, 7, 20, 0)
+round_end = timezone.datetime(2020, 4, 7, 17, 0)
 round_types = ['media', 'tech', 'health']
 
 kudos_reward_pks = [12580, 12584, 12572, 125868, 12552, 12556, 12557, 125677, 12550, 12427, 12392, 12307, 12343, 12156, 12164]

diff --git a/app/retail/templates/admin/change_form.html b/app/retail/templates/admin/change_form.html
@@ -9,7 +9,8 @@
         {% elif 'dashboard/activity' in request.build_absolute_uri %}
             <input type="submit" value="Make Into Nano Bounty" name="_make_nano_bounty" value="1">
         {% elif 'townsquare/offer/' in request.build_absolute_uri %}
-            <input type="submit" value="Schedule" name="_schedule_offer" value="1">
+            <input type="submit" value="Schedule Offer" name="_schedule_offer" value="1">
+            <input type="submit" value="Copy Offer" name="_copy_offer" value="1">
         {% elif 'dashboard/tip/' in request.build_absolute_uri %}
             <input type="submit" value="Reset Tip Redemption Status" name="_reset_tip_redemption" value="1">
         {% elif 'economy/token/' in request.build_absolute_uri %}