resolve conflicts

app/app/templates/shared/messages.html

@@ -15,9 +15,13 @@
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 {% endcomment %}
 <script>
+  document.messages = []
   {% for message in messages %}
+  if (document.messages.indexOf('{{ message }}') == -1) {
     setTimeout(function(){
       _alert({message: gettext('{{ message }}')}, '{{ message.tags }}');
     }, 1000);
+    document.messages.push('{{ message }}');
+  }
   {% endfor %}
 </script>

app/assets/v2/css/base.css

@@ -706,6 +706,11 @@ input[type=text].loading {
   color: #000;
 }
 
+.bottom_notification-pink {
+  background-color: #9f80ff;
+  color: #000;
+}
+
 .metamask_recc {
   width: 45%;
   display: inline-block;

app/assets/v2/js/base.js

@@ -114,7 +114,7 @@ $(document).ready(function() {
     });
   }
 
-  var top_nav_salt = 3;
+  var top_nav_salt = 4;
   var remove_top_row = function() {
     $('#top_nav_notification').parents('.row').remove();
     localStorage['top_nav_notification_remove_' + top_nav_salt] = true;

app/assets/v2/js/grants/fund.js

@@ -8,6 +8,7 @@ let selected_token;
 let splitterAddress;
 let gitcoinDonationAddress;
 
+document.suppress_faucet_solicitation = 1;
 
 $(document).ready(function() {
 

app/assets/v2/js/grants/shared.js

@@ -93,7 +93,7 @@ const addGrantLogo = () => {
 
 const show_error_banner = (result, web3_not_found) => {
   if ($('#grants_form').length) {
-    var is_zero_balance_not_okay = document.location.href.indexOf('/faucet') == -1;
+    var is_zero_balance_not_okay = document.location.href.indexOf('/faucet') == -1 && !document.suppress_faucet_solicitation;
 
     if (typeof web3 == 'undefined' || web3_not_found) {
       $('#no_metamask_error').css('display', 'block');

app/assets/v2/js/shared.js

@@ -774,7 +774,7 @@ var currentNetwork = function(network) {
  */
 var trigger_primary_form_web3_hooks = function() {
   if ($('#primary_form').length) {
-    var is_zero_balance_not_okay = document.location.href.indexOf('/faucet') == -1;
+    var is_zero_balance_not_okay = document.location.href.indexOf('/faucet') == -1 && !document.suppress_faucet_solicitation;
 
     if (typeof web3 == 'undefined') {
       $('#no_metamask_error').css('display', 'block');

app/bounty_requests/templates/bounty_request_form.html

@@ -91,7 +91,7 @@ <h3>{% trans 'Bounty Request Received' %}</h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
   <script src="{% static "v2/js/pages/bounty_request_form.js" %}"></script>
 </html>

app/dashboard/templates/bounty/change.html

@@ -127,7 +127,7 @@ <h1 class="text-center title">{% trans "Change Bounty Details" %}</h1>
   {% include 'shared/analytics.html' %}
   {% include 'shared/footer_scripts_lite.html' %}
   {% include 'shared/footer.html' %}
-  {% include 'shared/messages.html' %}
+
   {% include 'shared/current_profile.html' %}
 </body>
 <script>

app/dashboard/templates/bounty/fulfill.html

@@ -99,7 +99,7 @@ <h1 class="text-center title">{% trans "Submit Work" %}</h1>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
   <script>
     $('[data-toggle="popover"]').popover()

app/dashboard/templates/bounty/fund.html

@@ -435,7 +435,7 @@ <h3 class="mt-3 mb-4 font-title-lg font-weight-semibold">
   {% include 'shared/analytics.html' %}
   {% include 'shared/footer_scripts_lite.html' %}
   {% include 'shared/footer.html' %}
-  {% include 'shared/messages.html' %}
+
 </body>
 
 {% include 'shared/current_profile.html' %}

app/dashboard/templates/bounty/increase.html

@@ -163,7 +163,7 @@ <h5 class="font-title-lg mb-0">{% trans "Total"%} </h5>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
 
   </body>
 

app/dashboard/templates/bounty/kill.html

@@ -149,7 +149,7 @@ <h6>{% trans "Reason" %}</h6>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 
   <script src="{% static "v2/js/pages/wallet_estimate.js" %}"></script>

app/dashboard/templates/bounty/refund_request.html

@@ -149,7 +149,7 @@ <h5 class="mt-5 mb-2">{% trans "Request Received" %}</h5>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
   <script src="{% static "v2/js/abi.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>

app/dashboard/templates/bulk_payout_bounty.html

@@ -205,7 +205,7 @@ <h5>{% trans 'Payout Preview' %}</h5>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
   <script>
     $('[data-toggle="popover"]').popover()

app/dashboard/templates/contribute_bounty.html

@@ -78,6 +78,6 @@ <h5>{% trans "Promote this Bounty" %}</h5>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 </html>

app/dashboard/templates/dashboard/hackathon_onboard.html

@@ -113,5 +113,5 @@ <h2>Ready?</h2>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>

app/dashboard/templates/dashboard/hackathons.html

@@ -81,5 +81,5 @@ <h5 class="card-title"><a href="{% url 'hackathon' hackathon.slug %}">{{ hackath
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>

app/dashboard/templates/dashboard/index.html

@@ -121,7 +121,7 @@ <h3>{% trans "No results found." %}</h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
 
     <script>
       $('[data-toggle="popover"]').popover()

app/dashboard/templates/dashboard/users.html

@@ -289,7 +289,7 @@ <h6 class="font-weight-bold mb-3">Invite [[numUsers]] Users to the Bounty</h6>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
 
     <script>
       $('body').bootstrapTooltip({

app/dashboard/templates/ftux/onboard.html

@@ -58,7 +58,7 @@
     </div>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
   {% csrf_token %}
   <script>

app/dashboard/templates/labs.html

@@ -169,7 +169,6 @@ <h3 class="sub-title dark-text mb-4">{% trans "Community" %}</h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
     <script>
       $(document).ready(function(){
         $('#labs_overlay').click(function(){

app/dashboard/templates/legal/terms.html

@@ -299,6 +299,6 @@ <h2 class="font-title">28. KUDOS AND OTHER USER GENERATED CONTENT</h2>
     {% include 'shared/footer.html' %}
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 </html>

app/dashboard/templates/payout_bounty.html

@@ -115,7 +115,7 @@ <h5 class="mt-2">{% trans "ADVANCED" %}</h5>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 
   <!-- jQuery -->

app/dashboard/templates/process_bounty.html

@@ -136,7 +136,7 @@ <h3 class="font-bigger-1 mb-0">Suggested Kudos</h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 
   <script>

app/dashboard/templates/profiles/profile.html

@@ -306,7 +306,7 @@ <h1 class="profile-header__handle">
     {% include 'shared/footer.html' %}
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html'%}
-    {% include 'shared/messages.html' %}
+
 
     <!-- jQuery -->
     <script src="{% static "v2/js/abi.js" %}"></script>

app/dashboard/templates/social_contribution.html

@@ -81,7 +81,7 @@ <h4>{% trans "One Click Social Share Links" %}</h4>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 
 </html>

app/dashboard/templates/toolbox.html

@@ -109,7 +109,7 @@ <h3 id="{{ actor.slug }}" class="sub-title">{{ actor.title }}</h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
 
     <script src="/dynamic/js/tokens_dynamic.js"></script>
     <script src="{% static "v2/js/abi.js" %}"></script>

app/faucet/templates/faucet_form.html

@@ -117,7 +117,7 @@ <h5 class="mt-5 mb-4">{% trans "Request Received" %}</h5>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    {% include 'shared/messages.html' %}
+
 
   {% csrf_token %}
   <script>

app/kudos/templates/kudos_about.html

@@ -439,5 +439,5 @@ <h5 class="accordion">I have another question and it's not listed here.</h5>
         setInterval(load_kudos_card_images, 300);
       });
     </script>
-    {% include 'shared/messages.html' %}
+
   </body>

app/kudos/templates/kudos_details.html

@@ -141,6 +141,6 @@ <h3 id="kudosName" class="kudos-details__title">{{ kudos.ui_name }} {% if kudos.
       $('[data-toggle="tooltip"]').bootstrapTooltip();
     </script>
     <script src="{% static "v2/js/pages/kudos-search.js" %}"></script>
-    {% include 'shared/messages.html' %}
+
   </body>
 </html>

app/kudos/templates/kudos_marketplace.html

@@ -113,6 +113,6 @@ <h1>UH-OH!</h1>
       });
     </script>
     <script src="{% static "v2/js/pages/kudos-search.js" %}"></script>
-    {% include 'shared/messages.html' %}
+
   </body>
 </html>

app/marketing/utils.py

@@ -324,6 +324,8 @@ def handle_marketing_callback(key, request):
                 group_name = callback_reference.split(':')[1]
                 group = Group.objects.get(name=group_name)
                 group.user_set.add(request.user)
+            else:
+                messages.info(request, "You have been selected to receive a $5.00 Gitcoin Grants voucher. Login to use it.")
 
 
 def func_name():

app/retail/emails.py

@@ -886,8 +886,8 @@ def render_start_work_applicant_expired(interest, bounty):
 def render_new_bounty_roundup(to_email):
     from dashboard.models import Bounty
     from django.conf import settings
-    subject = "CLR Round Three, Road to Devcon"
-    new_kudos_pks = [4548, 4550, 4549]
+    subject = "The Long and Winding Road"
+    new_kudos_pks = [4546, 4550, 4542]
     new_kudos_size_px = 150
     if settings.DEBUG and False:
         # for debugging email styles
@@ -908,22 +908,22 @@ def render_new_bounty_roundup(to_email):
 Hey Gitcoiners,
 </p>
 <p>
-    It's finally time. Gitcoin Grants CLR Round 3 is happening, and it's happening now. After months of planning, we're proud to announce $100k in matching is secured for this fourteen day period from September 14th to the 30th. We're aiming for over 1,000 unique crowdfunded contributions this go around: it's time to invite your friends, because every contribution counts. <a href="https://gitcoin.co/blog/gitcoins-q3-match-100k-to-oss-projects/">Take a gander at the announcement post and get excited. It's days away.</a>
+    The <i>Long and Winding Road</i> that leads to Devcon draws near; it's time to get excited. We're proud to announce a bricolage of top tier sponsors: the Ethereum Foundation, Algorand, ConsenSys Grants, ConsenSys Labs, and more. Winners of the hackathon will be revealed at <a href="https://www.eventbrite.com/e/grow-open-source-day-by-gitcoin-infura-bounties-network-c-dili-tickets-71705347624">Gitcoin's Grow Open Source Day in Tokyo.</a> Expect more of the goodness we've captured with our hackathons so far — compelling challenges, glorious prize pools, and impeccible support. Get signed up for the <a href="https://hackathons.gitcoin.co/the-road-to-devcon/">Road to Devcon here.</a>
 </p>
 <p>
-    Speaking of CLR matching, it's time to geek out. We've been working with a few CLR junkies on anti collusion measures. Interested in CLR and theory? Jump in the discussion on <a href="https://ethresear.ch/t/pairwise-coordination-subsidies-a-new-quadratic-funding-design/5553/3">ethresearch.</a>
+    Want $5? Help us decide where the $100k for Gitcoin Grants Round 3 is allocated. The steps are as follows: Step 1) Use this link: https://gitcoin.co/grants?cb=grants_signal_fund_enable Step 2) Click ‘Fund Grant’ any grant you’d like to support. Step 3) Click ‘Use Voucher For This Grant’. Until the 30th of September, we'll be matching contributions to Gitcoin Grants with quadratic voting. Check out the projects on Gitcoin Grants <a href="https://gitcoin.co/grants/">here.</a>
 </p>
 <p>
-    What do you call a group of hackathons? We don't know, but soon, we'll have to come up with a term for them. Another hackathon, the Road to Devcon, was just announced. Learn more about this one, and ask us any questions! The hackathon homepage lives <a href="https://hackathons.gitcoin.co/the-road-to-devcon/">here.</a> 
+    Speaking of Devcon, <i>Here Comes the Devcon Events</i>. We're excited to host a suite of events during our Grow Open Source Day alongside Infura, Bounties Network, and C-Dili. If you'll be in Japan for Devcon, stop by. Reserve a spot <a href="https://www.eventbrite.com/e/grow-open-source-day-by-gitcoin-infura-bounties-network-c-dili-tickets-71705347625">here.</a>
 </p>
 {kudos_friday}
 <h3>What else is new?</h3>
     <ul>
         <li>
-        The Gitcoin Livestream is back this week! Join us <a href="https://gitcoin.co/livestream"> at 2PM ET this Friday. </a>
+        The Gitcoin Livestream is back this week! Join us <a href="https://gitcoin.co/livestream"> at 2PM ET this Friday with Algorand, one of our sponsors for The Road to Devcon. </a>
         </li>
         <li>
-        Thanks to all who participated in the Ethereal Blocks hackathon. We'll have the announcement post for the winners published in the next few days. Hurrah!
+        Thanks to all who participated in the Ethereal Blocks hackathon. We have the announcement post for the winners ready to drop tomorrow. Keep an eye on the ol' <a href="https://twitter.com/gitcoin">Twitter feed.</a>
         </li>
     </ul>
 </p>
@@ -932,22 +932,22 @@ def render_new_bounty_roundup(to_email):
 </p>
 '''
     highlights = [{
-        'who': 'mul1sh',  
+        'who': 'mirshko',  
         'who_link': True,
-        'what': 'Deploying Full Stack DApp to AWS',
-        'link': 'https://gitcoin.co/issue/kauri-io/Content/51/3186',
+        'what': 'Fix Metadata For Subpages',
+        'link': 'https://gitcoin.co/issue/centrifuge/website/144/3449',
         'link_copy': 'View more',
     }, {
-        'who': 'igetgames',
+        'who': 'AshleyOyt',
         'who_link': True,
-        'what': 'Eth_gasPrice Format Example Has Leading Zeros',
-        'link': 'https://gitcoin.co/issue/ethresearch/eth-wiki/16/3439',
+        'what': '768px width to 639px, columns get messed up',
+        'link': 'https://gitcoin.co/issue/nateberkopec/speedshop/1/3470',
         'link_copy': 'View more',
     }, {
-        'who': 'RobertMCForster',
+        'who': 'chuckwagoncomputing',
         'who_link': True,
-        'what': 'Linkdrop x Gnosis Safe Smart Contract Bug-bounty',
-        'link': 'https://gitcoin.co/issue/LinkdropHQ/linkdrop-safe-module/5/3309',
+        'what': 'Create upload pipeline',
+        'link': 'https://gitcoin.co/issue/knocte/DotNetLightning/1/3412',
         'link_copy': 'View more',
     }, ]
 
@@ -964,14 +964,14 @@ def render_new_bounty_roundup(to_email):
     }
 
     bounties_spec = [{
-        'url': 'https://github.com/Synthetixio/synthetix/issues/196',
-        'primer': 'Gas Optimisation R&D',
+        'url': 'https://github.com/ArweaveTeam/Bounties/issues/13',
+        'primer': 'Decentralized Discussion Board',
     }, {
-        'url': 'https://github.com/knocte/NLightning/issues/1',
-        'primer': 'Create upload pipeline',
+        'url': 'https://github.com/kauri-io/Content/issues/52',
+        'primer': 'Deploying Full stack Dapp to Google Cloud',
     }, {
-        'url': 'https://github.com/cennznet/bounties/issues/1',
-        'primer': 'Publish a Tutorial-based Blog Post on Creating a Blockchain Using OnFinality & Connecting to CENNZNet Public Blockchain',
+        'url': 'https://github.com/hoprnet/hopr-website/issues/8',
+        'primer': 'Create d3.js chart from Ethereum events via web3.js / Metamask',
 }, ]
 
 

app/retail/templates/about.html

@@ -339,6 +339,6 @@ <h6 class="text-center">{% trans "Everything we do is to support our mission to
     {% include 'shared/footer.html' %}
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
-    {% include 'shared/messages.html' %}
+
   </body>
 </html>

app/retail/templates/activity.html

@@ -39,7 +39,7 @@
     {% include 'shared/footer.html' %}
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
-    {% include 'shared/messages.html' %}
+
     {% include 'shared/activity_scripts.html' %}
   </body>
 </html>