From e6c081512b910561cdc5118adcec5b23f94dd67b Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 12:01:52 -0600
Subject: [PATCH 01/75] Fix for - grant contributions being pending -
 leaderboard undefined var - ability to change kudos info all at once

---
 app/dashboard/tip_views.py                  |  4 ++++
 app/dataviz/templates/dataviz/mesh.html     |  4 ++--
 app/grants/models.py                        | 19 ++++++++++---------
 app/kudos/admin.py                          | 10 +++++-----
 app/marketing/views.py                      |  2 +-
 app/retail/templates/admin/change_form.html |  1 +
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/dashboard/tip_views.py b/app/dashboard/tip_views.py
index a8afab3ae99..5fa24cb1842 100644
--- a/app/dashboard/tip_views.py
+++ b/app/dashboard/tip_views.py
@@ -87,6 +87,10 @@ def request_money(request):
                 'requester': request.user.profile,
             }
             fund_request = FundRequest.objects.create(**kwargs)
+            if network == 'ETH':
+                if not profile.preferred_payout_address:
+                    profile.preferred_payout_address = address
+                    profile.save() #save preferred payout addr
             messages.success(request, f'Stay tuned, {profile.handle} has been notified by email.')
         else:
             messages.error(request, f'The user {username} doesn\'t exists.')
diff --git a/app/dataviz/templates/dataviz/mesh.html b/app/dataviz/templates/dataviz/mesh.html
index 6bef263ea9f..13df6ad06a6 100644
--- a/app/dataviz/templates/dataviz/mesh.html
+++ b/app/dataviz/templates/dataviz/mesh.html
@@ -406,7 +406,7 @@
         {% for option in days %}
           <option {% if day == option %}selected=selected{%endif%}  >{{option}}</option>
         {% endfor %}
-      </select>
+      </select> (Beg OD)
        to
       <select name="to_year">
         {% for option in years %}
@@ -424,7 +424,7 @@
         {% for option in days %}
           <option {% if to_day == option %}selected=selected{%endif%}  >{{option}}</option>
         {% endfor %}
-      </select>
+      </select>  (End OD)
         <input type="submit" name="submit" value="Go">
        </form>
       Rotate: Left Mouse Button and Move<br />
diff --git a/app/grants/models.py b/app/grants/models.py
index e12ec9e31bd..5026a5f18d7 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -1164,15 +1164,16 @@ def update_tx_status(self):
             return
 
         # handle replace of tx_id
-        tx_status, _ = get_tx_status(self.tx_id, self.subscription.network, self.created_on)
-        if tx_status in ['pending', 'dropped', 'unknown', '']:
-            new_tx = getReplacedTX(self.tx_id)
-            if new_tx:
-                self.tx_id = new_tx
-            else:
-                # TODO: do stuff related to long running pending txns
-                pass
-            return
+        if self.tx_id:
+            tx_status, _ = get_tx_status(self.tx_id, self.subscription.network, self.created_on)
+            if tx_status in ['pending', 'dropped', 'unknown', '']:
+                new_tx = getReplacedTX(self.tx_id)
+                if new_tx:
+                    self.tx_id = new_tx
+                else:
+                    # TODO: do stuff related to long running pending txns
+                    pass
+                return
         # handle replace of split_tx_id
         if self.split_tx_id:
             split_tx_status, _ = get_tx_status(self.split_tx_id, self.subscription.network, self.created_on)
diff --git a/app/kudos/admin.py b/app/kudos/admin.py
index 20023e45283..7d4e8ff29c1 100644
--- a/app/kudos/admin.py
+++ b/app/kudos/admin.py
@@ -47,6 +47,10 @@ def response_change(self, request, obj):
             notify_kudos_rejected(obj)
             self.message_user(request, f"Notified user of rejection")
             return redirect('/_administrationkudos/tokenrequest/?approved=f&rejection_reason=')
+        if "_change_owner" in request.POST:
+            obj.to_address = '0x6239FF1040E412491557a7a02b2CBcC5aE85dc8F'
+            obj.save()
+            self.message_user(request, f"Changed owner to gitcoin")
         if "_mint_kudos" in request.POST:
             from kudos.tasks import mint_token_request
             try:
@@ -55,11 +59,6 @@ def response_change(self, request, obj):
             except Exception as e:
                 self.message_user(request, str(e))
             return redirect('/_administrationkudos/tokenrequest/?approved=f&rejection_reason=')
-
-        if "_change_owner" in request.POST:
-            obj.to_address = '0x6239FF1040E412491557a7a02b2CBcC5aE85dc8F'
-            obj.save()
-            self.message_user(request, f"Changed owner to gitcoin")
         return redirect(obj.admin_url)
 
     def preview(self, instance):
@@ -125,6 +124,7 @@ def response_change(self, request, obj):
                 )
             self.message_user(request, f"Created Bulk Transfer Coupon with default settings")
             return redirect(btc.admin_url)
+        return redirect(obj.admin_url)
 
 
 class TransferAdmin(admin.ModelAdmin):
diff --git a/app/marketing/views.py b/app/marketing/views.py
index 7a83655564d..78b764045b5 100644
--- a/app/marketing/views.py
+++ b/app/marketing/views.py
@@ -863,7 +863,7 @@ def leaderboard(request, key=''):
     which_leaderboard = f"{cadence}_{key}"
     all_ranks = LeaderboardRank.objects.filter(leaderboard=which_leaderboard, product=product)
     if keyword_search:
-        all_ranks = ranks.filter(tech_keywords__icontains=keyword_search)
+        all_ranks = all_ranks.filter(tech_keywords__icontains=keyword_search)
 
     amount = all_ranks.values_list('amount').annotate(Max('amount')).order_by('-amount')
     ranks = all_ranks.filter(active=True)
diff --git a/app/retail/templates/admin/change_form.html b/app/retail/templates/admin/change_form.html
index 417bd6ab595..c7813c381c3 100644
--- a/app/retail/templates/admin/change_form.html
+++ b/app/retail/templates/admin/change_form.html
@@ -23,6 +23,7 @@
         {% elif 'grants/contribution' in request.build_absolute_uri %}
             <input type="submit" value="Pull Contrib Status" name="_update_tx_status" value="1">
         {% elif 'kudos/tokenrequest' in request.build_absolute_uri %}
+            <input type="submit" value="Change Owner + Mint + Sync Kudos" name="_change_owner_mint_kudos" value="1">
             <input type="submit" value="Mint + Sync Kudos" name="_mint_kudos" value="1">
             <input type="submit" value="Reject Kudos" name="_reject_kudos" value="1">
             <input type="submit" value="Change Owner to Gitcoin" name="_change_owner" value="1">

From 6b52fc4c37e963bbf24fe8a3a3c11b053190cef4 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 12:58:15 -0600
Subject: [PATCH 02/75] fix for broken ether transfers, before it was not
 correctly clearing bulk ether transfers

---
 app/economy/tx.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 6cba4cf9108..367a4ed3f55 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -142,16 +142,15 @@ def grants_transaction_validator(contribution):
                 transaction_hash = transaction_receipt.transactionHash.hex()
                 transaction = check_transaction(transaction_hash)
                 if transaction.value > 0.001:
-                    token_transfer = {
-                        'to': transaction.to,
-                        'token_name': 'ETH',
-                        'token_address': '0x0',
-                        'token_amount_int': Decimal(transaction.value),
-                        'token_amount_decimal': Decimal(transaction.value / 10 **18),
-                        'decimals': 18,
-                        }
+                    recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
+                    transfers = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers')
+                    for transfer in transfers:
+                        delta = abs(abs(contribution.subscription.amount_per_period_minus_gas_price) - abs(transfer['token_amount_decimal']))
+                        if delta < 0.001:
+                            token_transfer = transfer
                 maybeprint(148, round(time.time(),2))
                 if not token_originators:
+
                     token_originators = get_token_originators(from_address, '0x0', from_address=None, return_what='originators')
 
             maybeprint(150, round(time.time(),2))
@@ -282,10 +281,10 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
 
     endpoint = 'token-transfers' if token != '0x0' else 'ether-transfers'
     url = f'https://api.aleth.io/v1/{endpoint}?filter[to]=' + address + '&filter[token]=' + token + '&page%5Blimit%5D=100'
-    if from_address:
-        url += '&filter[from]=' + from_address
     if token == '0x0':
         url = f'https://api.aleth.io/v1/{endpoint}?filter[account]=' + address + '&page%5Blimit%5D=100'
+    if from_address:
+        url += '&filter[from]=' + from_address
 
     transfers = requests.get(
         url,

From 9ca2bd5afa3bcd2376b223ea78ce681a8bab0ecb Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 13:06:13 -0600
Subject: [PATCH 03/75] one more fix for validating eth transfesr

---
 app/economy/tx.py | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 367a4ed3f55..7564ce6920c 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -143,7 +143,7 @@ def grants_transaction_validator(contribution):
                 transaction = check_transaction(transaction_hash)
                 if transaction.value > 0.001:
                     recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
-                    transfers = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers')
+                    transfers = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx)
                     for transfer in transfers:
                         delta = abs(abs(contribution.subscription.amount_per_period_minus_gas_price) - abs(transfer['token_amount_decimal']))
                         if delta < 0.001:
@@ -166,7 +166,7 @@ def grants_transaction_validator(contribution):
                 maybeprint(160, round(time.time(),2))
                 # get token transfers
                 if not token_transfer:
-                    transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers')
+                    transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx)
                     if transfers:
                         token_transfer = transfers
                 maybeprint(169, round(time.time(),2))
@@ -253,7 +253,7 @@ def get_token_recipient_senders(recipient_address, token_address):
 auth = settings.ALETHIO_KEY
 headers = {'Authorization': f'Bearer {auth}'}
 
-def get_token_originators(to_address, token, from_address='', return_what='transfers'):
+def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id=''):
     address = to_address
 
     #is_address = requests.get('https://api.aleth.io/v1/accounts/' + address, headers=headers).status_code
@@ -296,16 +296,25 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
 
     if return_what == 'transfers':
         for transfer in transfers.get('data', {}):
-            if transfer.get('type') == 'TokenTransfer':
-                # todo: check txid to make sure it matches (to prevent multiple transfers from this address to this address from falsy validating positively)
-                return {
-                        'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** transfer['attributes']['decimals']),
-                        'token_name': transfer['attributes']['symbol'],
-                        'to': address,
-                        'token_address': token,
-                        'token_amount_int': int(transfer['attributes']['value']),
-                        'decimals': transfer['attributes']['decimals'],
-                }
+            if tx_id and tx_id.lower() == trasnfer.get('id').lower():
+                if transfer.get('type') == 'TokenTransfer':
+                    return {
+                            'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** transfer['attributes']['decimals']),
+                            'token_name': transfer['attributes']['symbol'],
+                            'to': address,
+                            'token_address': token,
+                            'token_amount_int': int(transfer['attributes']['value']),
+                            'decimals': transfer['attributes']['decimals'],
+                    }
+                if transfer.get('type') == 'EtherTransfer':
+                    return {
+                            'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** 18),
+                            'token_name': 'ETH',
+                            'to': address,
+                            'token_address': '0x0',
+                            'token_amount_int': int(transfer['attributes']['value']),
+                            'decimals': 18,
+                    }
         return None
 
     # TokenTransfer events, value field

From f02e9f4442acf3e7c4fe6d4711558e86396c0818 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 13:07:01 -0600
Subject: [PATCH 04/75] straggler" gs gp

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 7564ce6920c..e6c1916af97 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -296,7 +296,7 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
 
     if return_what == 'transfers':
         for transfer in transfers.get('data', {}):
-            if tx_id and tx_id.lower() == trasnfer.get('id').lower():
+            if tx_id and tx_id.lower() == transfer.get('id').lower():
                 if transfer.get('type') == 'TokenTransfer':
                     return {
                             'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** transfer['attributes']['decimals']),

From 61ea23e44d7bee5cfe16272269ca17168962c932 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 13:09:22 -0600
Subject: [PATCH 05/75] token transfer validator

---
 app/economy/tx.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index e6c1916af97..0099b288ecd 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -143,11 +143,9 @@ def grants_transaction_validator(contribution):
                 transaction = check_transaction(transaction_hash)
                 if transaction.value > 0.001:
                     recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
-                    transfers = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx)
-                    for transfer in transfers:
-                        delta = abs(abs(contribution.subscription.amount_per_period_minus_gas_price) - abs(transfer['token_amount_decimal']))
-                        if delta < 0.001:
-                            token_transfer = transfer
+                    transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx)
+                    if transfer:
+                        token_transfer = transfer
                 maybeprint(148, round(time.time(),2))
                 if not token_originators:
 

From 60e2a58ba1bdad18709b8df28c07a7a4083d319d Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 13:13:36 -0600
Subject: [PATCH 06/75] txid comparisons

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 0099b288ecd..529c950e49e 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -294,7 +294,7 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
 
     if return_what == 'transfers':
         for transfer in transfers.get('data', {}):
-            if tx_id and tx_id.lower() == transfer.get('id').lower():
+            if tx_id and tx_id.lower() in str(transfer).lower():
                 if transfer.get('type') == 'TokenTransfer':
                     return {
                             'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** transfer['attributes']['decimals']),

From a9a81c6d0aa0eb075bd0b9a57498227974f6fa9e Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 13:22:49 -0600
Subject: [PATCH 07/75] more validation fix

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 529c950e49e..16de3503c50 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -190,7 +190,7 @@ def grants_transaction_validator(contribution):
             from_address = Web3.toChecksumAddress(contribution.subscription.contributor_address)
             recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
             token_address = Web3.toChecksumAddress(contribution.subscription.token_address)
-            _transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers')
+            _transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx)
             failsafe = _transfers['token_name'] == contribution.subscription.token_symbol
             if failsafe:
                 validation['comment'] = f"Token Transfer Passed on the second try"

From 44123adbb3e87d2586d5283cc006545793e3e93f Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 13:48:10 -0600
Subject: [PATCH 08/75] do a much better job validating transfers by selecting
 the right ones

---
 app/economy/tx.py                     | 35 +++++++++++++--------------
 app/grants/admin.py                   |  2 +-
 app/retail/templates/admin/index.html |  3 +++
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 16de3503c50..f94c259df60 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -143,7 +143,7 @@ def grants_transaction_validator(contribution):
                 transaction = check_transaction(transaction_hash)
                 if transaction.value > 0.001:
                     recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
-                    transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx)
+                    transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx, amount=contribution.subscription.amount_per_period_minus_gas_price)
                     if transfer:
                         token_transfer = transfer
                 maybeprint(148, round(time.time(),2))
@@ -164,7 +164,7 @@ def grants_transaction_validator(contribution):
                 maybeprint(160, round(time.time(),2))
                 # get token transfers
                 if not token_transfer:
-                    transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx)
+                    transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx, amount=contribution.subscription.amount_per_period_minus_gas_price)
                     if transfers:
                         token_transfer = transfers
                 maybeprint(169, round(time.time(),2))
@@ -190,7 +190,7 @@ def grants_transaction_validator(contribution):
             from_address = Web3.toChecksumAddress(contribution.subscription.contributor_address)
             recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
             token_address = Web3.toChecksumAddress(contribution.subscription.token_address)
-            _transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx)
+            _transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx, amount=contribution.subscription.amount_per_period_minus_gas_price)
             failsafe = _transfers['token_name'] == contribution.subscription.token_symbol
             if failsafe:
                 validation['comment'] = f"Token Transfer Passed on the second try"
@@ -251,7 +251,7 @@ def get_token_recipient_senders(recipient_address, token_address):
 auth = settings.ALETHIO_KEY
 headers = {'Authorization': f'Bearer {auth}'}
 
-def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id=''):
+def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id='', amount=None):
     address = to_address
 
     #is_address = requests.get('https://api.aleth.io/v1/accounts/' + address, headers=headers).status_code
@@ -294,24 +294,23 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
 
     if return_what == 'transfers':
         for transfer in transfers.get('data', {}):
-            if tx_id and tx_id.lower() in str(transfer).lower():
-                if transfer.get('type') == 'TokenTransfer':
+            this_is_the_one = tx_id and tx_id.lower() in str(transfer).lower()
+            _decimals = transfer.get('attributes', {}).get('decimals', 18)
+            _symbol = transfer.get('attributes', {}).get('symbol', 'ETH')
+            _value = transfer.get('attributes', {}).get('value', 0)
+            _value_decimal = Decimal(int(_value) / 10 ** _decimals)
+            if amount:
+                delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
+                this_is_the_one = delta < 0.001
+            if this_is_the_one:
+                if transfer.get('type') in ['TokenTransfer', 'EtherTransfer']:
                     return {
-                            'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** transfer['attributes']['decimals']),
-                            'token_name': transfer['attributes']['symbol'],
+                            'token_amount_decimal': _value_decimal,
+                            'token_name': _symbol,
                             'to': address,
                             'token_address': token,
                             'token_amount_int': int(transfer['attributes']['value']),
-                            'decimals': transfer['attributes']['decimals'],
-                    }
-                if transfer.get('type') == 'EtherTransfer':
-                    return {
-                            'token_amount_decimal': Decimal(int(transfer['attributes']['value']) / 10 ** 18),
-                            'token_name': 'ETH',
-                            'to': address,
-                            'token_address': '0x0',
-                            'token_amount_int': int(transfer['attributes']['value']),
-                            'decimals': 18,
+                            'decimals': _decimals,
                     }
         return None
 
diff --git a/app/grants/admin.py b/app/grants/admin.py
index d4ccd0cda88..5ab4c107a42 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -233,7 +233,7 @@ def error_email_copy_not_active(self, instance):
 class ContributionAdmin(GeneralAdmin):
     """Define the Contribution administration layout."""
     raw_id_fields = ['subscription']
-    list_display = ['id', 'profile', 'created_on', 'grant', 'github_created_on', 'from_ip_address', 'txn_url', 'amount', 'token', 'tx_cleared', 'success']
+    list_display = ['id', 'profile', 'created_on', 'grant', 'github_created_on', 'from_ip_address', 'etherscan_links', 'amount', 'token', 'tx_cleared', 'success']
     readonly_fields = ['etherscan_links', 'amount_per_period_to_gitcoin', 'amount_per_period_minus_gas_price', 'amount_per_period']
 
     def txn_url(self, obj):
diff --git a/app/retail/templates/admin/index.html b/app/retail/templates/admin/index.html
index d52ad243e91..8121093765e 100644
--- a/app/retail/templates/admin/index.html
+++ b/app/retail/templates/admin/index.html
@@ -92,6 +92,9 @@ <h2>{% trans 'Debugging Tasks' %}</h2>
         <ul>
             <a href="{% url 'impersonate-list' %}">{% trans 'Impersonate Users' %}<a/>
         </ul>
+        <ul>
+            Grants: <a href="/_administrationgrants/contribution/?tx_cleared=f">Uncleared TXNS<a/> | <a href="/_administrationgrants/contribution/?success=f">Failed TXNS<a/>
+        </ul>
 
         <h2>{% trans 'Administrative Tasks' %}</h2>
 

From 910d437fd3bf30d761f5d883eb2873280c10d338 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 14:02:19 -0600
Subject: [PATCH 09/75] 
 https://gitcoincore.slack.com/archives/CAXQ7PT60/p1592847090125400

---
 app/assets/v2/js/status.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/v2/js/status.js b/app/assets/v2/js/status.js
index d28c645ed2e..1d0ff5cbed7 100644
--- a/app/assets/v2/js/status.js
+++ b/app/assets/v2/js/status.js
@@ -166,9 +166,8 @@ $(document).ready(function() {
     } else if (site && site.length > 1 && no_lb) {
       const url = site[0];
 
-      const getMetadata = fetchData('service/metadata/?url=' + url);
-
-      $.when(getMetadata).then(function(response) {
+      let metadata_callback = function(response) {
+        document[url] = response;
         if (response) {
           const desc = response.description && response.description.length > 200 ?
 
@@ -196,7 +195,14 @@ $(document).ready(function() {
           $('#thumbnail-desc').text('');
           embedded_resource = '';
         }
-      });
+      };
+      // cache calls for the same URL on the document
+      if(typeof document[url] == 'undefined'){
+        const getMetadata = fetchData('service/metadata/?url=' + url);
+        $.when(getMetadata).then(metadata_callback);
+      } else {
+        metadata_callback(document[url]);
+      }
     } else {
       $('#thumbnail-desc').text('');
       if (no_lb) {

From 0ab873343893658985e62a5b1b73c4f5dc7c2339 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 14:25:12 -0600
Subject: [PATCH 10/75] make fix + add staff link on contributions

---
 app/assets/v2/js/status.js                   | 4 +++-
 app/grants/templates/grants/transaction.html | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/v2/js/status.js b/app/assets/v2/js/status.js
index 1d0ff5cbed7..f3b152a5b71 100644
--- a/app/assets/v2/js/status.js
+++ b/app/assets/v2/js/status.js
@@ -197,8 +197,10 @@ $(document).ready(function() {
         }
       };
       // cache calls for the same URL on the document
-      if(typeof document[url] == 'undefined'){
+
+      if (typeof document[url] == 'undefined') {
         const getMetadata = fetchData('service/metadata/?url=' + url);
+
         $.when(getMetadata).then(metadata_callback);
       } else {
         metadata_callback(document[url]);
diff --git a/app/grants/templates/grants/transaction.html b/app/grants/templates/grants/transaction.html
index 29c48e68863..4e0e4ec3f2d 100644
--- a/app/grants/templates/grants/transaction.html
+++ b/app/grants/templates/grants/transaction.html
@@ -42,6 +42,11 @@
         </a>
       </div>
     {% endif %}
+      {% if is_staff %}
+        <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
+          <a href="{{transaction.admin_url}}">[Staff]</a>
+        </div>
+     {% endif %}      
     <div class="offset-lg-1 col-4 col-md-2 my-auto tags font-caption">
       <div class="tag tag-lg token">
         <p>

From 2b789c7e93dcd9e0082945d70c74fc457d5a0c2f Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 14:38:17 -0600
Subject: [PATCH 11/75] fixes grant profile

---
 .../profiles/tab_grant_contribs.html          | 21 +++++++++++--------
 app/dashboard/views.py                        |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/dashboard/templates/profiles/tab_grant_contribs.html b/app/dashboard/templates/profiles/tab_grant_contribs.html
index 09ca5529a47..7acb246c16e 100644
--- a/app/dashboard/templates/profiles/tab_grant_contribs.html
+++ b/app/dashboard/templates/profiles/tab_grant_contribs.html
@@ -25,18 +25,20 @@ <h3 class="font-body mt-1 mb-2 font-weight-semibold">Monthly Summary</h3>
 
     {% include "profiles/earningsgraph.html" with graph_type="grants" %}
 
+    {% if subs.count %}
     <a class="btn btn-gc-blue cart-btn font-smaller-3 font-weight-semibold float-right mt-1 mr-1" href="/grants/cart/bulk-add/{% for subs in profile.grant_contributor.all %}{{subs.grant.pk}},{% endfor %}">+
       Add all to Cart</a>
+    {% endif %}
 
-    <h2 class="font-body m-3 pb-3 title">Subscriptions ({{profile.grant_contributor.count}})</h3>
+    <h2 class="font-body ml-0 mt-3 mb-3 pb-3 title">Subscriptions ({{subs.count}})</h3>
 
-    {% if not profile.grant_contributor.count %}
-      <h2 class="font-title m-3 pb-3 title">
+    {% if not subs.count %}
+      <p>
         No Grants Subscribed. <a href=grants/>Explore Grants &gt;</a>
-      </h2>
+      </p>
     {% endif %}
 
-    {% for subscription in profile.grant_contributor.all %}
+    {% for subscription in subs.all %}
       {# FIXME: last_contribution_date is wrong. #}
       <div class="py-3 mx-sm-0 px-lg-0 row subscription-history bounty_row">
         <div class="col-auto px-0 justify-content-center special_tag">
@@ -69,12 +71,12 @@ <h2 class="font-title m-3 pb-3 title">
       </div>
     {% endfor %}
 
-    <h2 class="font-body m-3 pb-3 title">Grants Created ({{profile.grant_admin.count}})</h3>
+    <h2 class="font-body mt-3 mb-3 ml-0 pb-3 title">Grants Created ({{profile.grant_admin.count}})</h3>
 
     {% if not profile.grant_admin.count %}
-      <h2 class="font-title m-3 pb-3 title">
+      <p>
         No Grants Created. <a href=grants/new>Create a Grant &gt;</a>
-      </h2>
+      </p>
     {% endif %}
 
     {% for transaction in profile.grant_admin.all %}
@@ -83,6 +85,7 @@ <h2 class="font-title m-3 pb-3 title">
           {{ transaction.created_on|date:"Y-m-d" }}
         </div>
         <div class="col-2 col-md-2 px-0 justify-content-center special_tag">
+
           <img class="avatar" style="max-width: 70px;" src="{% if transaction.logo and transaction.logo.url %}{{ transaction.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=transaction.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
         </div>
         <div class="col-5 col-md-4 my-auto">
@@ -104,7 +107,7 @@ <h2 class="font-title m-3 pb-3 title">
       </div>
     {% endfor %}
 
-    <h2 class="font-body mx-3 pb-2 mt-5 title">Grant Contribution History ({{history|length}})</h2>
+    <h2 class="font-body mt-3 mb-3 ml-0 pb-2 mt-5 title">Grant Contribution History ({{history|length}})</h2>
     <a class="btn btn-gc-blue cart-btn font-smaller-3 font-weight-semibold float-right mt-1 mr-1" href="/grants/cart/bulk-add/{% for subs in history %}{{subs.id}},{% endfor %}">+
       Add all to Cart</a>
 
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index 63d0707b727..bc59c5113ed 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -2653,6 +2653,7 @@ def get_profile_tab(request, profile, tab, prev_context):
         for ele in contributions:
             history.append(ele.normalized_data)
         context['history'] = history
+        context['subs'] = profile.grant_contributor.filter(num_tx_approved__gt=1)
     elif tab == 'active':
         context['active_bounties'] = active_bounties
     elif tab == 'resume':

From 690144e95d78adf33da6954fe7ea2860ee94cc4c Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 14:49:33 -0600
Subject: [PATCH 12/75] removed addr on invoice so that users dont mistakenly
 send $$$ to it

---
 app/dashboard/templates/bounty/invoice.html | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/dashboard/templates/bounty/invoice.html b/app/dashboard/templates/bounty/invoice.html
index 729c13d8607..a4c7d28d829 100644
--- a/app/dashboard/templates/bounty/invoice.html
+++ b/app/dashboard/templates/bounty/invoice.html
@@ -161,19 +161,13 @@
             {% trans "Payment Method" %}
           </td>
 
-          <td>
-            {% trans "Account" %} #
-          </td>
         </tr>
 
         <tr class="details">
           <td>
-            {% trans "Directly to counterparties via Ethereum Blockchain" %}
+            {% trans "Directly to counterparties via Blockchain" %}
           </td>
 
-          <td>
-            0x2af47a65da8cd66729b4209c22017d6a5c2d2400
-          </td>
         </tr>
       {% endif %}
 

From 03c6bdb4779bc0f7c279ef1acce06f947e35356d Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 15:04:19 -0600
Subject: [PATCH 13/75] add twitter handle to grant details

---
 app/grants/templates/grants/detail/info.html | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/grants/templates/grants/detail/info.html b/app/grants/templates/grants/detail/info.html
index cc173935848..c5db0a7deac 100644
--- a/app/grants/templates/grants/detail/info.html
+++ b/app/grants/templates/grants/detail/info.html
@@ -87,17 +87,25 @@ <h1 class="font-title-xl my-4 font-weight-bold">
           {% if is_team_member %}
             <textarea id="form--input__reference-url" class="p-0 m-0 inline-edit" disabled>{{ grant.reference_url }}</textarea>
           {% else %}
-            <i style="width: 14px;" class="fab fa-github mr-2 text-center"></i>
+            <i style="width: 14px;" class="fa fa-link mr-2 text-center"></i>
             <a href="{{ grant.reference_url }}" target="_blank" data-toggle="tooltip" data-html="true" data-placement="top" title="Project URL">
               {{ grant.reference_url }}
             </a>
           {% endif %}
         </div>
+        {% if grant.twitter_handle_1 %}
+        <div class="font-body mb-2">
+          <i style="width: 14px;" class="fab fa-twitter-square mr-2 text-center"></i>
+          <p class="d-inline-block mb-0">
+            <a href="https://twitter.com/{{grant.twitter_handle_1}}" target="new" rel="nofollow"  data-toggle="tooltip" data-html="true" data-placement="top" title="Project Twitter Account">@{{grant.twitter_handle_1}}</a>
+          </p>
+        </div>
+      {% endif %}
   
         <div class="mb-2">
           <i style="width: 14px;" class="fab fa-ethereum mr-2 text-center"></i>
           <a id="wallet-address" class="wallet-address"
-            target="_blank" data-toggle="tooltip" data-placement="top" title="Recipient Funding Address">
+            target="_blank" data-toggle="tooltip" data-placement="top" title="Project Funding Address">
             {{ grant.admin_address }}
           </a>
         </div>
@@ -121,7 +129,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-coins mr-2 text-center"></i>
             <p class="d-inline-block mb-0" data-toggle="tooltip" data-placement="top" title="ERC20 Token">
-              Grant accepts {{ grant.token_symbol }}
+              Grant Accepts {{ grant.token_symbol }}
             </p>
           </div>
         {% endif %}

From ac07d372085fa25d83b5bbd767b27f502bc6d150 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 15:43:11 -0600
Subject: [PATCH 14/75] keep the user on the checkout page until the posts have
 had time to complete https://github.com/gitcoinco/web/issues/6947

---
 app/assets/v2/js/cart.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 2844a1a215d..d2ded55100d 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -642,14 +642,19 @@ Vue.component('grants-cart', {
           localStorage.setItem('contributions_were_successful', 'true');
           localStorage.setItem('contributions_count', String(this.grantData.length));
           var network = document.web3network;
+          let timeout_amount = 1500 + (CartData.loadCart().length * 500)
+          _alert('Saving contributions. Please do not leave this page.', 'success', 2000);
 
           setTimeout(function() {
-            if (network === 'rinkeby') {
-              window.location.href = `${window.location.origin}/grants/?network=rinkeby&category=`;
-            } else {
-              window.location.href = `${window.location.origin}/grants`;
-            }
-          }, 1500);
+            _alert('Contributions saved', 'success', 1000);
+            setTimeout(function(){
+              if (network === 'rinkeby') {
+                window.location.href = `${window.location.origin}/grants/?network=rinkeby&category=`;
+              } else {
+                window.location.href = `${window.location.origin}/grants`;
+              }
+            }, 500);
+          }, timeout_amount);
         })
         .on('error', (error, receipt) => {
           // If the transaction was rejected by the network with a receipt, the second parameter will be the receipt.

From 74fc5e71cd8d78ab9a409daff35e03a9cecbddac Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 22 Jun 2020 16:11:24 -0600
Subject: [PATCH 15/75] fixes grants css

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

diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index efc1412e605..c0df4ce18ed 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -17,7 +17,7 @@
 {% endcomment %}
 {% load i18n static %}
     <div class="modal" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" style="background-color: #eee;">
-      <div class="modal-dialog" role="document">
+      <div class="modal-dialog" role="document" style="max-height: 100vh; overflow-y: scroll;">
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="javascript:$('#tweetModal').remove();">

From 66e2450e461462fe1d42b8ccf47422830fa2eb9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Angel=20Gordi=C3=A1n?= <miguel@gordian.dev>
Date: Tue, 23 Jun 2020 01:24:44 -0500
Subject: [PATCH 16/75] Share amount and tokens (#6927)

* Add support for share amount and tokens

* Persist comments on grants
---
 app/assets/v2/js/cart-data.js                 | 36 ++++++++++++--
 app/assets/v2/js/cart.js                      |  5 +-
 app/economy/models.py                         |  2 +-
 .../templates/grants/bulk_add_to_cart.html    |  2 +-
 app/grants/templates/grants/cart-vue.html     | 48 +++++++++++++------
 .../grants/shared/hidden_inputs.html          |  7 +++
 app/grants/views.py                           | 39 +++++++++++----
 7 files changed, 109 insertions(+), 30 deletions(-)

diff --git a/app/assets/v2/js/cart-data.js b/app/assets/v2/js/cart-data.js
index 6aabcccd10b..450007cacfa 100644
--- a/app/assets/v2/js/cart-data.js
+++ b/app/assets/v2/js/cart-data.js
@@ -17,10 +17,22 @@ class CartData {
     const donations = this.loadCart();
     let bulk_add_cart = 'https://gitcoin.co/grants/cart/bulk-add/';
 
+    let network = document.web3network;
+
+    if (!network) {
+      network = 'mainnet';
+    }
+
     for (let i = 0; i < donations.length; i += 1) {
       const donation = donations[i];
+      // eslint-disable-next-line no-loop-func
+      const token = tokens(network).filter(t => t.name === donation.grant_donation_currency);
+      let token_id = '';
 
-      bulk_add_cart += String(donation['grant_id']) + ',';
+      if (token.length) {
+        token_id = token[0].id;
+      }
+      bulk_add_cart += `${donation['grant_id']};${donation['grant_donation_amount']};${token_id},`;
     }
 
     if (document.contxt['github_handle']) {
@@ -50,19 +62,33 @@ class CartData {
     let accptedTokenName;
 
     try {
-      accptedTokenName = tokenAddressToDetailsByNetwork(grantData.grant_token_address, network).name;
+      const token = tokenAddressToDetailsByNetwork(grantData.grant_token_address, network);
+
+      grantData.token_local_id = token.id;
+      accptedTokenName = token.name;
     } catch (e) {
       // When numbers are too small toWei fails because there's too many decimal places
+      const dai = tokens(network).filter(t => t.name === 'DAI');
+
+      if (dai.length) {
+        grantData.token_local_id = dai[0].id;
+      }
       accptedTokenName = 'DAI';
     }
 
     grantData.uuid = get_UUID();
 
     if (acceptsAllTokens || 'DAI' == accptedTokenName) {
-      grantData.grant_donation_amount = 5;
-      grantData.grant_donation_currency = 'DAI';
+      if (!grantData.grant_donation_amount) {
+        grantData.grant_donation_amount = 5;
+      }
+      if (!grantData.grant_donation_currency) {
+        grantData.grant_donation_currency = 'DAI';
+      }
     } else {
-      grantData.grant_donation_amount = 0.01;
+      if (!grantData.grant_donation_amount) {
+        grantData.grant_donation_amount = 0.01;
+      }
       grantData.grant_donation_currency = 'ETH';
     }
 
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 2844a1a215d..57b8c1c4bd5 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -362,7 +362,10 @@ Vue.component('grants-cart', {
 
     addComment(id, text) {
       // Set comment at this index to an empty string to show textarea
-      this.comments.splice(id, 1, text ? text : ''); // we use splice to ensure it's reactive
+      this.grantData[id].grant_comments = text ? text : '';
+      CartData.setCart(this.grantData);
+      this.$forceUpdate();
+
       $('input[type=textarea]').focus();
     },
 
diff --git a/app/economy/models.py b/app/economy/models.py
index 28109420b7f..810c27dc71b 100644
--- a/app/economy/models.py
+++ b/app/economy/models.py
@@ -219,7 +219,7 @@ def __str__(self):
 
     @property
     def to_dict(self):
-        return {'addr': self.address, 'name': self.symbol, 'decimals': self.decimals, 'priority': self.priority}
+        return {'id': self.id, 'addr': self.address, 'name': self.symbol, 'decimals': self.decimals, 'priority': self.priority}
 
     @property
     def to_json(self):
diff --git a/app/grants/templates/grants/bulk_add_to_cart.html b/app/grants/templates/grants/bulk_add_to_cart.html
index ce1566a7497..f6266650a11 100644
--- a/app/grants/templates/grants/bulk_add_to_cart.html
+++ b/app/grants/templates/grants/bulk_add_to_cart.html
@@ -5,7 +5,7 @@
 
 {% for grant in grants %}
   <form class="js-addDetailToCart-form">
-        {% include 'grants/shared/hidden_inputs.html' %}
+     {% include 'grants/shared/hidden_inputs.html' with amount=grant.amount token=grant.token grant=grant.obj %}
   </form>
 {% endfor %}
 
diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index 02f8f19c6b8..ee3b29e9409 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -147,30 +147,40 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                       <div class="col-12 font-smaller-3" style="margin-top:1rem">
                         <div class="row">
                           <div class="comment-option col-auto" @click="addComment(index)">
-                            <input :id="`comment-${index}-blank`" type="radio" class="radio-input" :name="`comment-${index}`">
+                            <input :id="`comment-${index}-blank`" type="radio" class="radio-input" :name="`comment-${index}`"
+                                   :checked="grant.grant_comments === ''"
+                            >
                             <label :for="`comment-${index}-blank`" class="radio-label">+ Add comment to owner</label>
                           </div>
                           <div class="comment-option col-auto" @click="addComment(index, '🙌 Great Job')">
-                            <input :id="`comment-${index}-job`" type="radio" class="radio-input" :name="`comment-${index}`">
+                            <input :id="`comment-${index}-job`" type="radio" class="radio-input" :name="`comment-${index}`"
+                                   :checked="grant.grant_comments === '🙌 Great Job'"
+                            >
                             <label :for="`comment-${index}-job`" class="radio-label">🙌 Great Job</label>
                           </div>
                           <div class="comment-option col-auto" @click="addComment(index, '👍 i appreciate you')">
-                            <input :id="`comment-${index}-appreciate`" type="radio" class="radio-input" :name="`comment-${index}`">
+                            <input :id="`comment-${index}-appreciate`" type="radio" class="radio-input" :name="`comment-${index}`"
+                                   :checked="grant.grant_comments === '👍 i appreciate you'"
+                            >
                             <label :for="`comment-${index}-appreciate`" class="radio-label">👍 i appreciate you</label>
                           </div>
                           <div class="comment-option col-auto" @click="addComment(index, '💪 keep up the great work')">
-                            <input :id="`comment-${index}-work`" type="radio" class="radio-input" :name="`comment-${index}`">
+                            <input :id="`comment-${index}-work`" type="radio" class="radio-input" :name="`comment-${index}`"
+                                   :checked="grant.grant_comments === '💪 keep up the great work'"
+                            >
                             <label :for="`comment-${index}-work`" class="radio-label">💪 keep up the great work</label>
                           </div>
                           <div class="comment-option col-auto" @click="addComment(index, '😍 love the mission of your project')">
-                            <input :id="`comment-${index}-love`" type="radio" class="radio-input" :name="`comment-${index}`">
+                            <input :id="`comment-${index}-love`" type="radio" class="radio-input" :name="`comment-${index}`"
+                                   :checked="grant.grant_comments === '😍 love the mission of your project'"
+                            >
                             <label :for="`comment-${index}-love`" class="radio-label">😍 love the mission of your project</label>
                           </div>
                         </div>
                       </div>
-                      <div v-if="comments[index] !== undefined" class="col-12" style="margin-top:1rem;">
+                      <div v-if="grant.grant_comments !== undefined" class="col-12" style="margin-top:1rem;">
                         <div class="row flex-nowrap justify-content-between">
-                          <input class="form-control" style="margin-left:0.5rem" v-model="comments[index]"
+                          <input class="form-control" style="margin-left:0.5rem" v-model="grant.grant_comments"
                             type="textarea" placeholder="Enter message">
                         </div>
                       </div>
@@ -227,28 +237,38 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                   </div>
                   <div class="row font-smaller-3 mt-3"  style="margin-left:0.5rem">
                     <div class="comment-option col-auto" @click="addComment(index)">
-                      <input :id="`comment-${index}-blank`" type="radio" class="radio-input" :name="`comment-${index}`">
+                      <input :id="`comment-${index}-blank`" type="radio" class="radio-input" :name="`comment-${index}`"
+                             :checked="grant.grant_comments === ''"
+                      >
                       <label :for="`comment-${index}-blank`" class="radio-label">+ Add comment to owner</label>
                     </div>
                     <div class="comment-option col-auto" @click="addComment(index, '🙌 Great Job')">
-                      <input :id="`comment-${index}-job`" type="radio" class="radio-input" :name="`comment-${index}`">
+                      <input :id="`comment-${index}-job`" type="radio" class="radio-input" :name="`comment-${index}`"
+                             :checked="grant.grant_comments === '🙌 Great Job'"
+                      >
                       <label :for="`comment-${index}-job`" class="radio-label">🙌 Great Job</label>
                     </div>
                     <div class="comment-option col-auto" @click="addComment(index, '👍 i appreciate you')">
-                      <input :id="`comment-${index}-appreciate`" type="radio" class="radio-input" :name="`comment-${index}`">
+                      <input :id="`comment-${index}-appreciate`" type="radio" class="radio-input" :name="`comment-${index}`"
+                             :checked="grant.grant_comments === '👍 i appreciate you'"
+                      >
                       <label :for="`comment-${index}-appreciate`" class="radio-label">👍 i appreciate you</label>
                     </div>
                     <div class="comment-option col-auto" @click="addComment(index, '💪 keep up the great work')">
-                      <input :id="`comment-${index}-work`" type="radio" class="radio-input" :name="`comment-${index}`">
+                      <input :id="`comment-${index}-work`" type="radio" class="radio-input" :name="`comment-${index}`"
+                             :checked="grant.grant_comments === '💪 keep up the great work'"
+                      >
                       <label :for="`comment-${index}-work`" class="radio-label">💪 keep up the great work</label>
                     </div>
                     <div class="comment-option col-auto" @click="addComment(index, '😍 love the mission of your project')">
-                      <input :id="`comment-${index}-love`" type="radio" class="radio-input" :name="`comment-${index}`">
+                      <input :id="`comment-${index}-love`" type="radio" class="radio-input" :name="`comment-${index}`"
+                             :checked="grant.grant_comments === '😍 love the mission of your project'"
+                      >
                       <label :for="`comment-${index}-love`" class="radio-label">😍 love the mission of your project</label>
                     </div>
                   </div>
-                  <input v-if="comments[index] !== undefined" style="margin-top:0.5rem; margin-left:0.5rem"
-                    class="form-control" v-model.number="comments[index]" type="textarea" placeholder="Enter message">
+                  <input v-if="grant.grant_comments !== undefined" style="margin-top:0.5rem; margin-left:0.5rem"
+                    class="form-control" v-model="grant.grant_comments" type="textarea" placeholder="Enter message">
                 </div>
               </div>
 
diff --git a/app/grants/templates/grants/shared/hidden_inputs.html b/app/grants/templates/grants/shared/hidden_inputs.html
index ba1226a5539..736c87d96f1 100644
--- a/app/grants/templates/grants/shared/hidden_inputs.html
+++ b/app/grants/templates/grants/shared/hidden_inputs.html
@@ -14,3 +14,10 @@
 <input type="hidden" id="grant_clr_prediction_curve" name="grant_clr_prediction_curve" value="{{ grant.clr_prediction_curve }}">
 <input type="hidden" id="grant_image_css" name="grant_image_css" value="{{ grant.image_css }}">
 <input type="hidden" id="is_clr_eligible" name="is_clr_eligible" {% if grant.is_clr_eligible %} value="{{ grant.is_clr_eligible }}" {% endif %}>
+{% if amount %}
+<input type="hidden" id="grant_donation_amount" name="grant_donation_amount" value="{{ amount }}">
+{% endif %}
+{% if token %}
+<input type="hidden" id="grant_donation_currency" name="grant_donation_currency" value="{{ token.symbol }}">
+<input type="hidden" id="token_local_id" name="token_local_id" value="{{ token.id }}">
+{% endif %}
diff --git a/app/grants/views.py b/app/grants/views.py
index 07c50c0c8bc..fd6c55dce86 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -50,6 +50,7 @@
 from dashboard.tasks import increment_view_count
 from dashboard.utils import get_web3, has_tx_mined
 from economy.utils import convert_amount
+from economy.models import Token as FTokens
 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, GrantCategory, MatchPledge, PhantomFunding, Subscription,
@@ -244,7 +245,7 @@ def grants_stats_view(request):
 
 def grants(request):
     """Handle grants explorer."""
-    
+
     _type = request.GET.get('type', 'all')
     return grants_by_grant_type(request, _type)
 
@@ -922,13 +923,26 @@ def grants_cart_view(request):
 
 
 def grants_bulk_add(request, grant_str):
-    
+    grants = {}
     redis = RedisService().redis
     key = hashlib.md5(grant_str.encode('utf')).hexdigest()
     views = redis.incr(key)
 
-    grant_ids = grant_str.split(':')[0].split(',')
-    grant_ids = [int(ele) for ele in grant_ids if ele and ele.isnumeric() ]
+    grants_data = grant_str.split(':')[0].split(',')
+
+    for ele in grants_data:
+        # new format will support amount and token in the URL separated by ;
+        grant_data = ele.split(';')
+        if len(grant_data) > 0 and grant_data[0].isnumeric():
+            grant_id = grant_data[0]
+            grants[grant_id] = {
+                'id': int(grant_id)
+            }
+
+            if len(grant_data) == 3:  # backward compatibility
+                grants[grant_id]['amount'] = grant_data[1]
+                grants[grant_id]['token'] = FTokens.objects.filter(id=int(grant_data[2])).first()
+
     by_whom = ""
     prefix = ""
     try:
@@ -936,12 +950,20 @@ def grants_bulk_add(request, grant_str):
         prefix = f"{grant_str.split(':')[2]} : "
     except:
         pass
-    grants = Grant.objects.filter(pk__in=grant_ids)
-    grant_titles = ", ".join([grant.title for grant in grants])
-    title = f"{prefix}{grants.count()} Grants in Shared Cart {by_whom} : Viewed {views} times"
+
+    # search valid grants and associate with its amount and token
+    grants_info = grants.values()
+    grant_ids = [grant['id'] for grant in grants_info]
+    for grant in Grant.objects.filter(pk__in=grant_ids):
+        grants[str(grant.id)]['obj'] = grant
+
+    grants = [grant for grant in grants_info if grant.get('obj')]
+
+    grant_titles = ", ".join([grant['obj'].title for grant in grants])
+    title = f"{prefix}{len(grants)} Grants in Shared Cart {by_whom} : Viewed {views} times"
 
     context = {
-        'grants': Grant.objects.filter(pk__in=grant_ids),
+        'grants': grants,
         'avatar_url': request.build_absolute_uri(static('v2/images/twitter_cards/tw_cards-03.png')),
         'title': title,
         'card_desc': "Click to Add All to Cart: " + grant_titles
@@ -959,6 +981,7 @@ def profile(request):
     handle = request.user.profile.handle
     return redirect(f'/profile/{handle}/grants')
 
+
 def quickstart(request):
     """Display quickstart guide."""
     params = {

From 14fcbf5803384d901cf7e0dd5ce9a8130899c39f Mon Sep 17 00:00:00 2001
From: Sebastian T F <sebastian.tharakan97@gmail.com>
Date: Tue, 23 Jun 2020 11:55:29 +0530
Subject: [PATCH 17/75] add grants_queryset.distinct() (#6830)

---
 app/grants/router.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/grants/router.py b/app/grants/router.py
index fb54ba05234..c714f498274 100644
--- a/app/grants/router.py
+++ b/app/grants/router.py
@@ -110,6 +110,7 @@ def report(self, request):
         else:
             to_timestamp = datetime.now()
         grants_queryset = grants_queryset.filter(subscriptions__subscription_contribution__created_on__lte=to_timestamp)
+        grants_queryset = grants_queryset.distinct()
 
         grantee_data = grantee_serializer(grants_queryset, many=True).data
         donor_data = donor_serializer(contributions_queryset, many=True).data

From 4e5c00556e341a5fcc943e1f22671de19ddc548b Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Tue, 23 Jun 2020 19:42:19 +0900
Subject: [PATCH 18/75] fix token test (#6955)

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

diff --git a/app/dashboard/tests/test_tokens.py b/app/dashboard/tests/test_tokens.py
index 53fdc1c13f1..ec6dd875fc4 100644
--- a/app/dashboard/tests/test_tokens.py
+++ b/app/dashboard/tests/test_tokens.py
@@ -32,7 +32,7 @@ def test_tokens(self):
         tokens = get_tokens()
         assert isinstance(tokens, list)
         assert isinstance(tokens[0], dict)
-        assert len(tokens[0]) == 4
+        assert len(tokens[0]) == 5
 
     def test_addr_to_token_valid(self):
         """Test the dashboard token lookup utility with a valid token."""

From 3a2dfbb19c1a8c5fba62f25fd985f72e489ae50a Mon Sep 17 00:00:00 2001
From: Andrew Redden <opensource@andrewredden.com>
Date: Tue, 23 Jun 2020 07:49:54 -0300
Subject: [PATCH 19/75] Change pagination from 100 -> 10 for hackathon project
 response (#6857)

* Change pagination from 100 -> 10 for hackathon project response
fix for infinite scrolling on project directory

* let sponsors set winners

* fix eslint

Co-authored-by: Dan Lipert <danlipert@gmail.com>
---
 app/assets/v2/js/cart.js           |  5 +++--
 app/assets/v2/js/vue-components.js | 15 +++++++++++++++
 app/dashboard/router.py            |  2 +-
 app/dashboard/views.py             | 12 +++++++-----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 49b165e20b0..0cba60749bd 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -645,12 +645,13 @@ Vue.component('grants-cart', {
           localStorage.setItem('contributions_were_successful', 'true');
           localStorage.setItem('contributions_count', String(this.grantData.length));
           var network = document.web3network;
-          let timeout_amount = 1500 + (CartData.loadCart().length * 500)
+          let timeout_amount = 1500 + (CartData.loadCart().length * 500);
+
           _alert('Saving contributions. Please do not leave this page.', 'success', 2000);
 
           setTimeout(function() {
             _alert('Contributions saved', 'success', 1000);
-            setTimeout(function(){
+            setTimeout(function() {
               if (network === 'rinkeby') {
                 window.location.href = `${window.location.origin}/grants/?network=rinkeby&category=`;
               } else {
diff --git a/app/assets/v2/js/vue-components.js b/app/assets/v2/js/vue-components.js
index 0c047c8cf57..b9e21ebe94a 100644
--- a/app/assets/v2/js/vue-components.js
+++ b/app/assets/v2/js/vue-components.js
@@ -321,6 +321,21 @@ Vue.component('project-directory', {
     window.removeEventListener('scroll', () => {
       this.bottom = this.bottomVisible();
     });
+  },
+  bottomVisible: function() { // TODO: abstract this to the mixin, and have it take a callback which modifies the component state.
+    let vm = this;
+
+    const scrollY = window.scrollY;
+    const visible = document.documentElement.clientHeight;
+    const pageHeight = document.documentElement.scrollHeight - 500;
+    const bottomOfPage = visible + scrollY >= pageHeight;
+
+    if (bottomOfPage || pageHeight < visible) {
+      if (vm.projectsHasNext) {
+        vm.projectsHasNext = false;
+        vm.fetchProjects();
+      }
+    }
   }
 });
 
diff --git a/app/dashboard/router.py b/app/dashboard/router.py
index 40f986d65f9..8f01bbf9339 100644
--- a/app/dashboard/router.py
+++ b/app/dashboard/router.py
@@ -208,7 +208,7 @@ class Meta:
 
 
 class HackathonProjectsPagination(PageNumberPagination):
-    page_size = 100
+    page_size = 10
 
 
 class HackathonProjectsViewSet(viewsets.ModelViewSet):
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index ed1671b682b..edffdcfd313 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -917,10 +917,6 @@ def users_fetch_filters(profile_list, skills, bounties_completed, leaderboard_ra
 
 @require_POST
 def set_project_winner(request):
-    if not request.user.is_authenticated and request.user.is_staff:
-        return JsonResponse({
-            'message': 'UNAUTHORIZED'
-        })
 
     winner = request.POST.get('winner', False)
     project_id = request.POST.get('project_id', None)
@@ -928,7 +924,13 @@ def set_project_winner(request):
         return JsonResponse({
             'message': 'Invalid Project'
         })
-    project = HackathonProject.objects.get(pk=project_id)
+    project = HackathonProject.objects.get(pk=project_id).prefetch_related('bounty')
+
+    if not request.user.is_authenticated and (request.user.is_staff or request.user.profile.handle == project.bounty.bounty_owner_github_username):
+        return JsonResponse({
+            'message': 'UNAUTHORIZED'
+        })
+
     project.winner = winner
     project.save()
 

From f1834b64c28e58677349f03950459bca216f42c3 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Tue, 23 Jun 2020 20:25:40 +0900
Subject: [PATCH 20/75] fix bignum/bigint conversion for kudos send (#6956)

---
 app/assets/v2/js/pages/kudos_send.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/v2/js/pages/kudos_send.js b/app/assets/v2/js/pages/kudos_send.js
index 884d689c7e2..05d9bbe4647 100644
--- a/app/assets/v2/js/pages/kudos_send.js
+++ b/app/assets/v2/js/pages/kudos_send.js
@@ -272,7 +272,7 @@ $(document).ready(function() {
 
     // get kudosPrice from the HTML
     kudosPriceInEth = parseFloat($('#kudosPrice').attr('data-ethprice'));
-    kudosPriceInWei = new web3.utils.BN((kudosPriceInEth * 1.0 * Math.pow(10, 18)));
+    kudosPriceInWei = new web3.utils.BN((BigInt(kudosPriceInEth * 1.0 * Math.pow(10, 18))));
 
     var formData = {
       email: email,
@@ -548,7 +548,7 @@ function sendKudos(email, github_url, from_name, username, amountInEth, comments
           console.log('destinationAccount:' + destinationAccount);
 
           var kudosPriceInEth = parseFloat($('#kudosPrice').attr('data-ethprice')) || $('.kudos-search').select2('data')[0].price_finney;
-          var kudosPriceInWei = new web3.utils.BN((kudosPriceInEth * 1.0 * Math.pow(10, 18)));
+          var kudosPriceInWei = new web3.utils.BN((BigInt(kudosPriceInEth * 1.0 * Math.pow(10, 18))));
 
           if (is_direct_to_recipient) {
             // Step 9

From cf8949ceec2ecb0b6c24b69af70431d69a13d426 Mon Sep 17 00:00:00 2001
From: Paul <41552663+molecula451@users.noreply.github.com>
Date: Tue, 23 Jun 2020 08:57:33 -0400
Subject: [PATCH 21/75] Quotation on Profile handle (#6957)

---
 app/retail/templates/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/retail/templates/about.html b/app/retail/templates/about.html
index 7b46b094735..317849e20b3 100644
--- a/app/retail/templates/about.html
+++ b/app/retail/templates/about.html
@@ -45,7 +45,7 @@ <h4 class="font-heading">{% trans "We are Proudly" %}</h4>
             <div class="col-10 col-md-6 col-lg-3 mx-auto">
               <div class="card">
                 {%  if handle %}
-                <a href="/profile/{{handle}}" data-usercard="{{handle}}>
+                <a href="/profile/{{handle}}" data-usercard="{{handle}}">
                 {% endif %}
                   <img class="avatar {{fname}} mx-auto" src="/static/v2/images/team/{{fname}}.png">
                 {%  if handle %}

From cf8df59f55d7bd673e3c90a646ccee5abafe28dd Mon Sep 17 00:00:00 2001
From: Matt <17163988+mds1@users.noreply.github.com>
Date: Tue, 23 Jun 2020 07:10:40 -0700
Subject: [PATCH 22/75] Fix Firefox issue that showed red border for decimal
 inputs in cart (#6958)

---
 app/grants/templates/grants/cart-vue.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index ee3b29e9409..59e1bcdfc7b 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -132,7 +132,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                       {% comment %} Grant amount and curency {% endcomment %}
                       <div class="col-12" style="margin-top:1rem;">
                         <div class="row flex-nowrap justify-content-between">
-                          <input class="col-5 form-control" style="margin-left:0.5rem" min="0"
+                          <input class="col-5 form-control" style="margin-left:0.5rem" min="0" step="any"
                             v-model="grant.grant_donation_amount" type="number" placeholder="Amount">
                           <select2 v-model="grant.grant_donation_currency" class="col-6 form-control"
                             style="margin-right:0.5rem" placeholder="Select token">
@@ -204,7 +204,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                     {% comment %} Grant amount and currency {% endcomment %}
                     <div class="col-3">
                       <div class="row flex-nowrap align-items-center justify-content-start">
-                        <input class="col-6 form-control" v-model="grant.grant_donation_amount" type="number" min="0"
+                        <input class="col-6 form-control" v-model="grant.grant_donation_amount" type="number" min="0" step="any"
                           placeholder="Amount" style="margin-right: 1rem">
                         <select2 v-model="grant.grant_donation_currency" class="col-6 form-control"
                           placeholder="Select token">
@@ -340,7 +340,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                         <div v-if="adjustGitcoinFactor"
                           class="col-12 col-xl-4 mt-4 my-xl-auto px-xl-0 font-weight-semibold text-center text-xl-left fee-slider-summary">
                           <div class="text-center custom d-inline-block">
-                            <input type="number" min="0" max="99" id="gitcoin-grant-input-amount"
+                            <input type="number" min="0" max="99" step="any" id="gitcoin-grant-input-amount"
                               name="gitcoin-grant-input-amount" class="form__input text-center"
                               :class="{inactive: [5,10,15].includes(gitcoinFactorRaw)}" value="5"
                               v-model="gitcoinFactorRaw">

From 997673e02e5de85780e13d31de6fb275579ef101 Mon Sep 17 00:00:00 2001
From: Sebastian T F <sebastian.tharakan97@gmail.com>
Date: Tue, 23 Jun 2020 19:42:42 +0530
Subject: [PATCH 23/75] New Grants txn Failed Email (#6791)

* setup web preview url

* implement render_grant_txn_failed

* build template grant_txn_failed.html

* management command for grant_txn_failed_email

* fix missing returns after resolving conflicts

* add bulk_add_url

* move email specific style to grant_txn_failed.html
---
 app/app/urls.py                               |  1 +
 .../commands/grant_txn_failed_email.py        | 32 ++++++++++
 app/marketing/mails.py                        | 21 ++++++-
 app/retail/emails.py                          | 24 ++++++++
 .../templates/emails/grant_txn_failed.html    | 59 +++++++++++++++++++
 .../templates/emails/grant_txn_failed.txt     |  7 +++
 app/retail/templates/emails/template.html     | 12 ++++
 7 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 app/dashboard/management/commands/grant_txn_failed_email.py
 create mode 100644 app/retail/templates/emails/grant_txn_failed.html
 create mode 100644 app/retail/templates/emails/grant_txn_failed.txt

diff --git a/app/app/urls.py b/app/app/urls.py
index 920f91cfabe..e6377cf250e 100644
--- a/app/app/urls.py
+++ b/app/app/urls.py
@@ -541,6 +541,7 @@
     path('_administration/email/wallpost', retail.emails.wallpost, name='wallpost_email'),
     path('_administration/email/grant_update', retail.emails.grant_update, name='grant_update_email'),
     path('_administration/email/grant_recontribute', retail.emails.grant_recontribute, name='grant_recontribute_email'),
+    path('_administration/email/grant_txn_failed', retail.emails.grant_txn_failed, name='grant_txn_failed_email'),
     path(
         '_administration/email/new_bounty_acceptance',
         retail.emails.new_bounty_acceptance,
diff --git a/app/dashboard/management/commands/grant_txn_failed_email.py b/app/dashboard/management/commands/grant_txn_failed_email.py
new file mode 100644
index 00000000000..cea356c3898
--- /dev/null
+++ b/app/dashboard/management/commands/grant_txn_failed_email.py
@@ -0,0 +1,32 @@
+'''
+    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/>.
+'''
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+from grants.models import Contribution
+from marketing.mails import grant_txn_failed
+
+
+class Command(BaseCommand):
+    help = 'sends emails for grant contributors whose contribution txns have failed'
+
+    def handle(self, *args, **options):
+        if settings.DEBUG:
+            print("not active in non prod environments")
+            return
+
+        failed_contribs = Contribution.objects.exclude(validator_passed=True)
+
+        for failed_contrib in failed_contribs:
+            grant_txn_failed(failed_contrib.subscription.contributor_profile, failed_contrib.subscription.grant, failed_contrib.tx_id)
diff --git a/app/marketing/mails.py b/app/marketing/mails.py
index 0048a442891..23c591fa81d 100644
--- a/app/marketing/mails.py
+++ b/app/marketing/mails.py
@@ -36,7 +36,7 @@
     render_bounty_expire_warning, render_bounty_feedback, render_bounty_request, render_bounty_startwork_expire_warning,
     render_bounty_unintersted, render_comment, render_faucet_rejected, render_faucet_request,
     render_featured_funded_bounty, render_funder_payout_reminder, render_funder_stale, render_gdpr_reconsent,
-    render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute, render_grant_update,
+    render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute, render_grant_txn_failed, render_grant_update,
     render_kudos_email, render_match_distribution, render_match_email, render_mention, render_new_bounty,
     render_new_bounty_acceptance, render_new_bounty_rejection, render_new_bounty_roundup, render_new_grant_email,
     render_new_supporter_email, render_new_work_submission, render_no_applicant_reminder, render_nth_day_email_campaign,
@@ -288,6 +288,25 @@ def grant_cancellation(grant, subscription):
     finally:
         translation.activate(cur_language)
 
+def grant_txn_failed(profile, grant, tx_id):
+    from_email = settings.CONTACT_EMAIL
+    to_email = profile.email
+    if not to_email:
+        if profile and profile.user:
+            to_email = profile.user.email
+    if not to_email:
+        return
+
+    cur_language = translation.get_language()
+
+    subject = f"Your Grant transaction failed. Wanna try again?"
+
+    try:
+        setup_lang(to_email)
+        html, text = render_grant_txn_failed(to_email, grant, tx_id)
+        send_mail(from_email, to_email, subject, text, html, categories=['transactional', func_name()])
+    finally:
+        translation.activate(cur_language)
 
 def subscription_terminated(grant, subscription):
     if subscription and subscription.negative:
diff --git a/app/retail/emails.py b/app/retail/emails.py
index 0677cfdf685..6fb6d2eae7d 100644
--- a/app/retail/emails.py
+++ b/app/retail/emails.py
@@ -69,6 +69,7 @@
     ('comment', _('Comment Emails'), _('Only when you are sent a comment')),
     ('wall_post', _('Wall Post Emails'), _('Only when someone writes on your wall')),
     ('grant_updates', _('Grant Update Emails'), _('Updates from Grant Owners about grants you\'ve funded.')),
+    ('grant_txn_failed', _('Grant Transaction Failed Emails'), _('Notifies Grant contributors when their contribution txn has failed.')),
 ]
 
 
@@ -889,6 +890,24 @@ def render_grant_recontribute(to_email, prev_round_start=(2020, 3, 23), prev_rou
 
     return response_html, response_txt
 
+def render_grant_txn_failed(to_email, grant, tx_id):
+    email_style = 27
+
+    params = {
+        'id': grant.id,
+        'grant_title': grant.title,
+        'tx_id': tx_id,
+        'tx_url': "https://etherscan.io/tx/"+tx_id,
+        'bulk_add_url': "https://gitcoin.co/grants/cart/bulk-add/" + str(grant.id),
+        'email_style': email_style,
+        'hide_bottom_logo': True,
+    }
+
+    response_html = premailer_transform(render_to_string("emails/grant_txn_failed.html", params))
+    response_txt = render_to_string("emails/grant_txn_failed.txt", params)
+
+    return response_html, response_txt
+
 def render_wallpost(to_email, activity):
     params = {
         'activity': activity,
@@ -1377,6 +1396,11 @@ def grant_update(request):
 def grant_recontribute(request):
     response_html, _ = render_grant_recontribute(settings.CONTACT_EMAIL)
     return HttpResponse(response_html)
+    
+def grant_txn_failed(request):
+    failed_contrib = Contribution.objects.filter(subscription__contributor_profile__user__email=settings.CONTACT_EMAIL).exclude(validator_passed=True).first()
+    response_html, _ = render_grant_txn_failed(settings.CONTACT_EMAIL, failed_contrib.subscription.grant, failed_contrib.tx_id)
+    return HttpResponse(response_html)
 
 @staff_member_required
 def wallpost(request):
diff --git a/app/retail/templates/emails/grant_txn_failed.html b/app/retail/templates/emails/grant_txn_failed.html
new file mode 100644
index 00000000000..be3b3d837c5
--- /dev/null
+++ b/app/retail/templates/emails/grant_txn_failed.html
@@ -0,0 +1,59 @@
+{% extends 'emails/template.html' %}
+{% comment %}
+  Copyright (C) 2018 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 humanize %}
+
+{% block content %}
+
+<style>
+  .etherscan-link {
+    display: inline-block;
+    font-family: 'Muli', sans-serif;
+    color: #3E00FF;
+  }
+
+  .grant-txn-msg, .grant-txn-id {
+    margin: 0 auto;
+  }
+
+  .grant-txn-id a {
+    overflow-wrap: break-word;
+  }
+</style>
+
+<h1>Grants transaction failed, try again?</h1>
+
+<div class="grant-txn-msg">
+  <p>
+    Your contribution to <b>{{ grant_title }}</b> failed due to a technical issue.
+  </p>
+</div>
+
+<div class="grant-txn-id">
+  <p>
+    Transaction ID: <br>
+    <a href="{{ tx_url }}">{{ tx_id }}</a>
+  </p>
+</div>
+
+<div style="margin-bottom: 3em; margin-top: 3em;">
+  <a class="button" href="{{ bulk_add_url }}">{% trans "Resubmit Transaction" %}</a>
+  <br>
+  <a class="etherscan-link" href="{{ tx_url }}">View on Etherscan</a>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/retail/templates/emails/grant_txn_failed.txt b/app/retail/templates/emails/grant_txn_failed.txt
new file mode 100644
index 00000000000..8a0f1241089
--- /dev/null
+++ b/app/retail/templates/emails/grant_txn_failed.txt
@@ -0,0 +1,7 @@
+Grants transaction failed, try again?
+
+    Your contribution to {{ grant_title }} failed due to a technical issue.
+
+    Transaction ID: {{ tx_id }}
+
+  View on Etherscan
\ No newline at end of file
diff --git a/app/retail/templates/emails/template.html b/app/retail/templates/emails/template.html
index fb85fb71768..78288e1f1f7 100644
--- a/app/retail/templates/emails/template.html
+++ b/app/retail/templates/emails/template.html
@@ -323,6 +323,18 @@
     }
   }
   
+  @media (min-width: 768px) {
+    .grant-txn-msg {
+      width: 70%;
+    }
+  }
+
+  @media (min-width: 1200px) {
+    .grant-txn-msg {
+      width: 60%;
+    }
+  }
+  
   /* Bootstrap styles used for activities -- START */
   
     *,

From 4a034e239bcbbda45470f779b10bf8b3c7524e85 Mon Sep 17 00:00:00 2001
From: Owocki <ksowocki@gmail.com>
Date: Tue, 23 Jun 2020 09:13:51 -0600
Subject: [PATCH 24/75] new approval checker helper script

---
 scripts/debug/check_approval_amount.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/debug/check_approval_amount.js b/scripts/debug/check_approval_amount.js
index 547b6fa4170..c6fb60cb3c0 100644
--- a/scripts/debug/check_approval_amount.js
+++ b/scripts/debug/check_approval_amount.js
@@ -1,10 +1,12 @@
-// on settings/token page
+var _selectedAccount = '0x8ff5c070e1f9bc771fc65132086e6e220bcfd989';
+var _tokenAddress = '0x6b175474e89094c44da98b954eedeac495271d0f';// DAI
+const _token_contract = new web3.eth.Contract(token_abi, _tokenAddress);
+const _to = bounty_address();
 
-var from = '0x7d96b5c4279e20bab1ca0043a65f2bb156b0c6eb';
-var token_address = '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359';// DAI
-var to = '0x2af47a65da8cd66729b4209c22017d6a5c2d2400'; //stdbounties
-var token_contract = web3.eth.contract(token_abi).at(token_address);
-
-token_contract.allowance.call(from, to, function(error, result) {
-    console.log(result.toString())
+_token_contract.methods.allowance(_selectedAccount, _to).call({from: selectedAccount}, (error, result) => {
+if (error || Number(result) == 0) {
+  isTokenAuthed = false;
+}
+console.log(result)
 });
+

From e256ec944dc8b54823bb5df01099c332668fad91 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 23 Jun 2020 14:45:30 -0300
Subject: [PATCH 25/75] fix comparing strings on allowance

---
 app/assets/v2/js/pages/create_bounty/ETH.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/v2/js/pages/create_bounty/ETH.js b/app/assets/v2/js/pages/create_bounty/ETH.js
index 92ea0ae01d8..18b7826ab38 100644
--- a/app/assets/v2/js/pages/create_bounty/ETH.js
+++ b/app/assets/v2/js/pages/create_bounty/ETH.js
@@ -239,7 +239,7 @@ const ethCreateBounty = async (data) => {
   const checkTokenAllowance = async () => {
     let currentAllowance = await getAllowance(bounty_address(), tokenAddress);
 
-    if (currentAllowance < bigAmount) {
+    if (BigInt(currentAllowance) < BigInt(bigAmount)) {
       let approvedAllowance;
 
       approvedAllowance = await approveAllowance(
@@ -386,7 +386,7 @@ const ethCreateBounty = async (data) => {
         total = isFeaturedToken ? total - ethFeaturedPrice : total;
         const balance_rounded = Math.round(balance * 10) / 10;
         let msg = gettext('You do not have enough tokens to fund this bounty. You have ') +
-          balance_rounded + ' ' + token_name + ' ' + gettext(' but you need ') + total +
+          balance_rounded + ' ' + token_name + ' ' + gettext(' but you need ') + BigInt(total) +
           ' ' + token_name;
 
         if (isFeaturedToken) {

From 897e1f6f8e749264b0322b2da93a3eb5ee2156e9 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 23 Jun 2020 18:15:44 -0300
Subject: [PATCH 26/75] fix featured bounty and balance checker

---
 app/assets/v2/js/pages/create_bounty/ETH.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/v2/js/pages/create_bounty/ETH.js b/app/assets/v2/js/pages/create_bounty/ETH.js
index 18b7826ab38..605d0c27a26 100644
--- a/app/assets/v2/js/pages/create_bounty/ETH.js
+++ b/app/assets/v2/js/pages/create_bounty/ETH.js
@@ -331,8 +331,8 @@ const ethCreateBounty = async (data) => {
     indicateMetamaskPopup();
     web3.eth.sendTransaction({
       to: '0x00De4B13153673BCAE2616b67bf822500d325Fc3',
-      from: web3.account,
-      value: web3.utils.toWei(ethFeaturedPrice, 'ether'),
+      from: selectedAccount,
+      value: web3.utils.toWei(String(ethFeaturedPrice), 'ether'),
       gas: web3.utils.toHex(318730),
       gasLimit: web3.utils.toHex(318730)
     },
@@ -365,12 +365,13 @@ const ethCreateBounty = async (data) => {
   if (check_balance_and_alert_user_if_not_enough(tokenAddress, amountNoDecimal)) {
     processBounty();
   } else {
-    return unloading_button($('.js-submit'));
+     unloading_button($('.js-submit'));
+     return false;
   }
 
   function check_balance_and_alert_user_if_not_enough(tokenAddress, amount, msg) {
     const token_contract = new web3.eth.Contract(token_abi, tokenAddress);
-    const from = account;
+    const from = selectedAccount;
     const token_details = tokenAddressToDetails(tokenAddress);
     const token_decimals = token_details['decimals'];
     const token_name = token_details['name'];
@@ -386,7 +387,7 @@ const ethCreateBounty = async (data) => {
         total = isFeaturedToken ? total - ethFeaturedPrice : total;
         const balance_rounded = Math.round(balance * 10) / 10;
         let msg = gettext('You do not have enough tokens to fund this bounty. You have ') +
-          balance_rounded + ' ' + token_name + ' ' + gettext(' but you need ') + BigInt(total) +
+          balance_rounded + ' ' + token_name + ' ' + gettext(' but you need ') + total +
           ' ' + token_name;
 
         if (isFeaturedToken) {
@@ -399,14 +400,14 @@ const ethCreateBounty = async (data) => {
     };
 
     if (tokenAddress == '0x0000000000000000000000000000000000000000') {
-      const walletBalance = Number(balance);
+      const walletBalance = web3.utils.fromWei(new web3.utils.BN(BigInt(balance)),'ether');
 
       return checkBalance(walletBalance, total, token_name);
 
     } else {
       token_contract.methods.balanceOf(from).call({from: from}, function(error, result) {
         if (error) return;
-        const walletBalance = Number(balance);
+        const walletBalance = web3.utils.fromWei(new web3.utils.BN(BigInt(result)),'ether')
 
         return checkBalance(walletBalance, total, token_name);
       });

From a8558147f4351a6e5cac188be0acaac41b2f9ebb Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 23 Jun 2020 22:19:47 -0300
Subject: [PATCH 27/75] fix eslint card.js

---
 app/assets/v2/js/cart.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 0cba60749bd..8769b0e77ab 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -511,6 +511,16 @@ Vue.component('grants-cart', {
         // For each token, check if an approval is needed, and if so save off the data
         let allowanceData = [];
 
+        const calcTotalAllowance = (tokenDetails) => {
+          const initialValue = new BN('0');
+
+          return this.donationInputs.reduce((accumulator, currentValue) => {
+            return currentValue.token === tokenDetails.addr
+              ? accumulator.add(new BN(currentValue.amount)) // correct token donation
+              : accumulator.add(new BN('0')); // ETH donation
+          }, initialValue);
+        };
+
         for (let i = 0; i < selectedTokens.length; i += 1) {
           const tokenName = selectedTokens[i];
           const tokenDetails = this.getTokenByName(tokenName);
@@ -535,12 +545,8 @@ Vue.component('grants-cart', {
           // Get required allowance based on donation amounts
           // We use reduce instead of this.donationsTotal because this.donationsTotal will
           // not have floating point errors, but the actual amounts used will
-          const initialValue = new BN('0');
-          const requiredAllowance = this.donationInputs.reduce((accumulator, currentValue) => {
-            return currentValue.token === tokenDetails.addr
-              ? accumulator.add(new BN(currentValue.amount)) // correct token donation
-              : accumulator.add(new BN('0')); // ETH donation
-          }, initialValue);
+
+          const requiredAllowance = calcTotalAllowance(tokenDetails);
 
           // Check user token balance against requiredAllowance
           const userTokenBalance = await tokenContract.methods.balanceOf(userAddress).call({ from: userAddress });

From fb08ddafa5beac534f7d2be8c835dbd625e13080 Mon Sep 17 00:00:00 2001
From: Matt <17163988+mds1@users.noreply.github.com>
Date: Wed, 24 Jun 2020 05:45:55 -0700
Subject: [PATCH 28/75] Improve cart gas estimates for DAI, aDAI, cDAI, and ANT
 (#6961)

* Quotation on Profile handle (#6957)

* Improve cart gas estimates for DAI, aDAI, cDAI, and ANT

Co-authored-by: Paul <41552663+molecula451@users.noreply.github.com>
---
 app/assets/v2/js/cart.js        | 49 +++++++++++++++++++++++++++------
 app/retail/templates/about.html |  2 +-
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 8769b0e77ab..7cf8af00ca7 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -199,16 +199,47 @@ Vue.component('grants-cart', {
 
     // Estimated gas limit for the transaction
     donationInputsGasLimit() {
-      // Based on contract tests, we use the heuristic below to get gas estimate. This is done
-      // instead of `estimateGas()` so we can send the donation transaction before the approval txs
-      // are confirmed, because if the approval txs are not confirmed then estimateGas will fail.
-      // The estimates used here are based on single donations (i.e. one item in the cart). Because
-      // gas prices go down with batched transactions, whereas this assumes they're constant,
-      // this gives us a conservative estimate
+      // The below heuristics are used instead of `estimateGas()` so we can send the donation
+      // transaction before the approval txs are confirmed, because if the approval txs
+      // are not confirmed then estimateGas will fail.
+
+      // If we have a cart where all donations are in Dai, we use a linear regression to
+      // estimate gas costs based on real checkout transaction data, and add a 50% margin
+      const donationCurrencies = this.donationInputs.map(donation => donation.token);
+      const isAllDai = donationCurrencies.every((addr, index, array) => addr === array[0]);
+
+      if (isAllDai) {
+        if (donationCurrencies.length === 1) {
+          // Special case since we overestimate here otherwise
+          return 80000;
+        }
+        // Below curve found by running script at the repo below around 9AM PT on 2020-Jun-19
+        // then generating a conservative best-fit line
+        // https://github.com/mds1/Gitcoin-Checkout-Gas-Analysis
+        return 25000 * donationCurrencies.length + 125000;
+      }
+
+      // Otherwise, based on contract tests, we use the more conservative heuristic below to get
+      // a gas estimate. The estimates used here are based on testing the cost of a single
+      // donation (i.e. one item in the cart). Because gas prices go down with batched
+      // transactions, whereas this assumes they're constant, this gives us a conservative estimate
       const gasLimit = this.donationInputs.reduce((accumulator, currentValue) => {
-        return currentValue.token === ETH_ADDRESS
-          ? accumulator + 50000// ETH donation gas estimate
-          : accumulator + 100000; // token donation gas estimate
+        const tokenAddr = currentValue.token.toLowerCase();
+
+        if (currentValue.token === ETH_ADDRESS) {
+          return accumulator + 50000; // ETH donation gas estimate
+
+        } else if (tokenAddr === '0x960b236A07cf122663c4303350609A66A7B288C0'.toLowerCase()) {
+          return accumulator + 170000; // ANT donation gas estimate
+
+        } else if (tokenAddr === '0xfC1E690f61EFd961294b3e1Ce3313fBD8aa4f85d'.toLowerCase()) {
+          return accumulator + 500000; // aDAI donation gas estimate
+
+        } else if (tokenAddr === '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643'.toLowerCase()) {
+          return accumulator + 450000; // cDAI donation gas estimate
+
+        }
+        return accumulator + 100000; // generic token donation gas estimate
       }, 0);
 
       return gasLimit;
diff --git a/app/retail/templates/about.html b/app/retail/templates/about.html
index 7b46b094735..317849e20b3 100644
--- a/app/retail/templates/about.html
+++ b/app/retail/templates/about.html
@@ -45,7 +45,7 @@ <h4 class="font-heading">{% trans "We are Proudly" %}</h4>
             <div class="col-10 col-md-6 col-lg-3 mx-auto">
               <div class="card">
                 {%  if handle %}
-                <a href="/profile/{{handle}}" data-usercard="{{handle}}>
+                <a href="/profile/{{handle}}" data-usercard="{{handle}}">
                 {% endif %}
                   <img class="avatar {{fname}} mx-auto" src="/static/v2/images/team/{{fname}}.png">
                 {%  if handle %}

From c8647efe88a3a3bb3a8b26256bc6f9008f945513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Octavio=20Amuch=C3=A1stegui?=
 <octavioamuchastegui@gmail.com>
Date: Wed, 24 Jun 2020 09:46:09 -0300
Subject: [PATCH 29/75] wallet improvments (#6952)

* wallet improvments

* avoid form submission

* bounty requesting wallet

* quest js dupe
---
 app/assets/v2/js/activity.js                  |   4 -
 app/assets/v2/js/cart.js                      |   8 +-
 app/assets/v2/js/grants/fund.js               |   9 +-
 app/assets/v2/js/grants/funding.js            |   9 +-
 app/assets/v2/js/grants/new.js                | 112 +++++++-----------
 app/assets/v2/js/pages/bulk_payout.js         |  12 +-
 .../v2/js/pages/fulfill_bounty/index.js       |  26 ++--
 app/assets/v2/js/pages/kudos_send.js          |   4 +
 app/assets/v2/js/pages/new_bounty.js          |   8 +-
 app/assets/v2/js/pages/process_bounty.js      |   6 +
 app/assets/v2/js/wallet.js                    |  19 ++-
 app/dashboard/templates/onepager/base.html    |   1 +
 app/grants/templates/grants/detail/index.html |   1 -
 app/grants/templates/grants/detail/info.html  |  20 ++--
 .../grants/shared/shared_scripts.html         |   2 +-
 app/kudos/templates/transaction/base.html     |   1 +
 app/quests/templates/quests/base.html         |   2 +-
 app/quests/templates/quests/index.html        |   1 -
 .../templates/shared/footer_scripts.html      |   3 +-
 .../templates/shared/footer_scripts_lite.html |   4 +-
 .../templates/shared/grant_thanks_modal.html  |   6 +-
 .../templates/shared/shared_scripts.html      |   2 +-
 .../templates/townsquare/index.html           |   1 -
 23 files changed, 137 insertions(+), 124 deletions(-)

diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js
index 93773f0caaf..fd0c0aef778 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -396,10 +396,6 @@ $(document).ready(function() {
       _alert('Please login first.', 'error');
       return;
     }
-    if (!web3) {
-      _alert('Please enable and unlock your web3 wallet.', 'error');
-      return;
-    }
 
     if (!provider) {
       return onConnect();
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 7cf8af00ca7..8d202b33473 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -3,9 +3,13 @@
  * @dev If you need to interact with the Rinkeby Dai contract (e.g. to reset allowances for
  * testing), use this one click dapp: https://oneclickdapp.com/drink-leopard/
  */
+let BN;
 
+needWalletConnection();
+window.addEventListener('dataWalletReady', function(e) {
+  BN = web3.utils.BN;
+}, false);
 // Constants
-const BN = web3.utils.BN;
 const ETH_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
 const gitcoinAddress = '0x00De4B13153673BCAE2616b67bf822500d325Fc3'; // Gitcoin donation address for mainnet and rinkeby
 
@@ -517,7 +521,7 @@ Vue.component('grants-cart', {
         // Setup -----------------------------------------------------------------------------------
         // Prompt web3 login if not connected
         if (!provider) {
-          await onConnect();
+          return await onConnect();
         }
 
         // Throw if invalid Gitcoin contribution percentage
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 5efaf7aa75e..5fc628d2814 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -330,8 +330,7 @@ $(document).ready(function() {
             $('#transaction_url').attr('href', linkURL);
             enableWaitState('#grants_form');
             set_form_disabled(false);
-            $('#tweetModal').css('display', 'block');
-
+            $('#tweetModal').modal('show');
           };
 
           if (!gitcoin_amount) {
@@ -558,7 +557,7 @@ const signSubscriptionHash = (subscriptionHash) => {
     web3.eth.personal.sign('' + subscriptionHash, accounts[0], function(err, signature) {
       indicateMetamaskPopup(true);
       set_form_disabled(false);
-      $('#tweetModal').css('display', 'block');
+      $('#tweetModal').modal('show');
 
       if (signature) {
         $('#signature').val(signature);
@@ -669,7 +668,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
     }).on('transactionHash', function(transactionHash) {
       indicateMetamaskPopup(1);
       set_form_disabled(false);
-      $('#tweetModal').css('display', 'block');
+      $('#tweetModal').modal('show');
       data = {
         'subscription_hash': 'onetime',
         'signature': 'onetime',
@@ -690,7 +689,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
       $('#transaction_url').attr('href', linkURL);
       enableWaitState('#grants_form');
       set_form_disabled(false);
-      $('#tweetModal').css('display', 'block');
+      $('#tweetModal').modal('show');
     }).on('confirmation', function(confirmationNumber, receipt) {
       data = {
         'subscription_hash': 'onetime',
diff --git a/app/assets/v2/js/grants/funding.js b/app/assets/v2/js/grants/funding.js
index 2b9e546b0f3..457c11cc8d4 100644
--- a/app/assets/v2/js/grants/funding.js
+++ b/app/assets/v2/js/grants/funding.js
@@ -14,7 +14,7 @@ $(document).ready(function() {
     _alert(message, 'success');
     localStorage.removeItem('contributions_were_successful');
     localStorage.removeItem('contributions_count');
-    $('#tweetModal').css('display', 'block');
+    $('#tweetModal').modal('show');
     let donations = CartData.loadCart();
 
     if (donations.length) {
@@ -31,13 +31,6 @@ $(document).ready(function() {
       $('#tweetModal a.button').attr('href', 'https://twitter.com/intent/tweet?text=I%20just%20funded%20these%20' + donations.length + '%20grants%20on%20@gitcoin%20=%3E%20' + bulk_add_cart);
     }
     CartData.setCart([]);
-
-    $(document).keydown(function(e) {
-      if (e.keyCode == 27) {
-        $('#tweetModal').remove();
-      }
-    });
-
   }
 
   $('#js-addToCart-form').submit(function(event) {
diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
index 9b483ade59f..61191fbdc5f 100644
--- a/app/assets/v2/js/grants/new.js
+++ b/app/assets/v2/js/grants/new.js
@@ -12,60 +12,8 @@ function changeTokens() {
 window.addEventListener('tokensReady', function(e) {
   changeTokens();
 }, false);
+needWalletConnection();
 
-$(document).ready(function() {
-
-  $('.select2-selection__choice').removeAttr('title');
-
-  if (web3 && web3.eth) {
-    web3.eth.net.isListening((error, connectionStatus) => {
-      if (connectionStatus)
-        init();
-      document.init = true;
-    });
-  }
-  // fix for triage bug https://gitcoincore.slack.com/archives/CAXQ7PT60/p1551220641086800
-  setTimeout(function() {
-    if (!document.init) {
-      show_error_banner();
-    }
-  }, 1000);
-});
-
-function saveGrant(grantData, isFinal) {
-  let csrftoken = $("#create-grant input[name='csrfmiddlewaretoken']").val();
-
-  $.ajax({
-    type: 'post',
-    url: '/grants/new',
-    processData: false,
-    contentType: false,
-    data: grantData,
-    headers: {'X-CSRFToken': csrftoken},
-    success: json => {
-      if (isFinal) {
-        if (json.url) {
-          document.suppress_loading_leave_code = true;
-          window.location = json.url;
-        } else {
-          console.error('Grant failed to save');
-        }
-      }
-    },
-    error: () => {
-      console.error('Grant failed to save');
-      _alert({ message: gettext('Your grant failed to save. Please try again.') }, 'error');
-    }
-  });
-}
-
-
-$('#new_button').on('click', function(e) {
-  if (!provider) {
-    e.preventDefault();
-    return onConnect().then(() => init());
-  }
-});
 
 const init = () => {
   /*
@@ -79,11 +27,8 @@ const init = () => {
     window.location = document.location.origin + '/grants/quickstart';
   }
 
-  web3.eth.getAccounts(function(err, accounts) {
-    $('#input-admin_address').val(accounts[0]);
-    $('#contract_owner_address').val(accounts[0]);
-  });
-
+  $('#input-admin_address').val(selectedAccount);
+  $('#contract_owner_address').val(selectedAccount);
   userSearch('.team_members', false, undefined, false, false, true);
 
   addGrantLogo();
@@ -206,14 +151,47 @@ const init = () => {
   });
 };
 
-window.addEventListener('load', async() => {
-  if (!provider && !web3Modal.cachedProvider || provider === 'undefined') {
-    onConnect().then(() => {
-      init();
-    });
-  } else {
-    web3Modal.on('connect', async(data) => {
-      init();
-    });
+window.addEventListener('dataWalletReady', function(e) {
+  init();
+}, false);
+
+$(document).ready(function() {
+
+  $('.select2-selection__choice').removeAttr('title');
+
+});
+
+function saveGrant(grantData, isFinal) {
+  let csrftoken = $("#create-grant input[name='csrfmiddlewaretoken']").val();
+
+  $.ajax({
+    type: 'post',
+    url: '/grants/new',
+    processData: false,
+    contentType: false,
+    data: grantData,
+    headers: {'X-CSRFToken': csrftoken},
+    success: json => {
+      if (isFinal) {
+        if (json.url) {
+          document.suppress_loading_leave_code = true;
+          window.location = json.url;
+        } else {
+          console.error('Grant failed to save');
+        }
+      }
+    },
+    error: () => {
+      console.error('Grant failed to save');
+      _alert({ message: gettext('Your grant failed to save. Please try again.') }, 'error');
+    }
+  });
+}
+
+
+$('#new_button').on('click', function(e) {
+  if (!provider) {
+    e.preventDefault();
+    return onConnect().then(() => init());
   }
 });
diff --git a/app/assets/v2/js/pages/bulk_payout.js b/app/assets/v2/js/pages/bulk_payout.js
index 0f28a8f777d..6491fbbed45 100644
--- a/app/assets/v2/js/pages/bulk_payout.js
+++ b/app/assets/v2/js/pages/bulk_payout.js
@@ -11,6 +11,12 @@ const normalizeUsername = function(username) {
   return username;
 };
 
+needWalletConnection();
+
+window.addEventListener('dataWalletReady', function(e) {
+  update_registry(selectedAccount);
+}, false);
+
 $(document).ready(function($) {
 
   $(document).on('blur', '#amount', function(event) {
@@ -167,6 +173,11 @@ $(document).ready(function($) {
     getFulfillers();
     update_registry(selectedAccount);
 
+    if (!provider) {
+      onConnect();
+      return false;
+    }
+
     if (!$('#terms').is(':checked')) {
       _alert('Please accept the TOS.', 'error');
       return;
@@ -190,7 +201,6 @@ $(document).ready(function($) {
 
   $('document').ready(function() {
     add_row();
-    update_registry(selectedAccount);
 
     $('.add_another').on('click', function() {
       add_row();
diff --git a/app/assets/v2/js/pages/fulfill_bounty/index.js b/app/assets/v2/js/pages/fulfill_bounty/index.js
index 937f604d2fb..01a846823c0 100644
--- a/app/assets/v2/js/pages/fulfill_bounty/index.js
+++ b/app/assets/v2/js/pages/fulfill_bounty/index.js
@@ -1,4 +1,20 @@
 /* eslint-disable no-console */
+needWalletConnection();
+
+const fetchFromWeb3Wallet = () => {
+  if (!provider) {
+    onConnect();
+  }
+  $('#payoutAddress').val(selectedAccount);
+  $('#payoutAddress').attr('readonly', true);
+}
+
+window.addEventListener('dataWalletReady', function(e) {
+  if (is_bounties_network) {
+    fetchFromWeb3Wallet();
+  }
+}, false);
+
 window.onload = function() {
 
   $('.rating input:radio').attr('checked', false);
@@ -8,10 +24,6 @@ window.onload = function() {
     $(this).parent().addClass('checked');
   });
 
-  if (is_bounties_network) {
-    fetchFromWeb3Wallet();
-  }
-
   if (typeof localStorage['githubUsername'] != 'undefined') {
     if (!$('input[name=githubUsername]').val()) {
       $('input[name=githubUsername]').val(localStorage['githubUsername']);
@@ -39,9 +51,3 @@ window.onload = function() {
   });
 };
 
-const fetchFromWeb3Wallet = () => {
-  web3.eth.getAccounts(function(_, accounts) {
-    $('#payoutAddress').val(accounts[0]);
-    $('#payoutAddress').attr('readonly', true);
-  });
-}
diff --git a/app/assets/v2/js/pages/kudos_send.js b/app/assets/v2/js/pages/kudos_send.js
index 05d9bbe4647..4404b774e8e 100644
--- a/app/assets/v2/js/pages/kudos_send.js
+++ b/app/assets/v2/js/pages/kudos_send.js
@@ -213,6 +213,10 @@ $(document).ready(function() {
     e.preventDefault();
     set_metadata();
 
+    if (!provider) {
+      return onConnect();
+    }
+
     if (typeof web3 == 'undefined') {
       _alert({ message: gettext('You must have a web3 enabled browser to do this.  Please download Metamask.') }, 'warning');
       return;
diff --git a/app/assets/v2/js/pages/new_bounty.js b/app/assets/v2/js/pages/new_bounty.js
index 9802d25290b..803d3c0c632 100644
--- a/app/assets/v2/js/pages/new_bounty.js
+++ b/app/assets/v2/js/pages/new_bounty.js
@@ -3,6 +3,7 @@
 /* eslint-disable no-lonely-if */
 // document.web3network = 'mainnet';
 load_tokens();
+needWalletConnection();
 
 const qr_tokens = [ 'ETC', 'cGLD', 'cUSD', 'ZIL' ];
 const fiat_tokens = ['USD'];
@@ -38,7 +39,7 @@ const updateOnNetworkOrTokenChange = () => {
     }
 
   } else {
-    if (!provider && !web3Modal.cachedProvider || provider === 'undefined') {
+    if (!provider) {
       onConnect().then(()=> {
         changeUi();
       });
@@ -593,6 +594,11 @@ $('#submitBounty').validate({
     }
   },
   submitHandler: function(form) {
+    if (!provider) {
+      onConnect();
+      return false;
+    }
+
     if (typeof ga != 'undefined') {
       dataLayer.push({
         'event': 'new_bounty',
diff --git a/app/assets/v2/js/pages/process_bounty.js b/app/assets/v2/js/pages/process_bounty.js
index 976ebe2d60a..fa477d478d3 100644
--- a/app/assets/v2/js/pages/process_bounty.js
+++ b/app/assets/v2/js/pages/process_bounty.js
@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+needWalletConnection();
 window.onload = function() {
 
   const rateUser = () => {
@@ -163,6 +164,11 @@ window.onload = function() {
 
       var isError = false;
 
+      if (!provider) {
+        onConnect();
+        return false;
+      }
+
       if ($('#terms:checked').length == 0) {
         _alert({ message: gettext('Please accept the terms of service.') }, 'warning');
         isError = true;
diff --git a/app/assets/v2/js/wallet.js b/app/assets/v2/js/wallet.js
index 628cc0bbb43..8b4dba095ab 100644
--- a/app/assets/v2/js/wallet.js
+++ b/app/assets/v2/js/wallet.js
@@ -1,6 +1,9 @@
 const Web3Modal = window.Web3Modal.default;
 const WalletConnectProvider = window.WalletConnectProvider.default;
+const eventWalletReady = new Event('walletReady', {bubbles: true});
+const eventDataWalletReady = new Event('dataWalletReady', {bubbles: true});
 
+let web3;
 let web3Modal;
 let provider;
 let selectedAccount;
@@ -43,6 +46,7 @@ function initWallet() {
     cacheProvider: true,
     providerOptions
   });
+  document.dispatchEvent(eventWalletReady);
 }
 
 function walletStateChanges() {
@@ -52,15 +56,18 @@ function walletStateChanges() {
 }
 
 const needWalletConnection = async() => {
-  if (!web3Modal.cachedProvider) {
-    return await onConnect();
-  }
+  window.addEventListener('walletReady', async function(e) {
+    if (!web3Modal || !web3Modal.cachedProvider) {
+      return await onConnect().then(console.log);
+    }
+  }, false);
 };
 
 async function fetchAccountData(provider) {
 
   // Get a Web3 instance for the wallet
-  web3 = new Web3(provider);
+  // web3 = new Web3(provider);
+  web3 = Web3 ? new Web3(provider || 'ws://localhost:8546') : null;
 
   console.log('Web3 instance is', web3);
 
@@ -165,6 +172,7 @@ async function fetchAccountData(provider) {
   // document.querySelector("#connected").style.display = "block";
   walletStateChanges();
   $('.wallet-option').on('click', changeWallet);
+  document.dispatchEvent(eventDataWalletReady);
 }
 
 function changeWallet(e) {
@@ -211,7 +219,8 @@ async function onConnect() {
   // regardless if we play around with a cacheProvider settings
   // in our localhost.
   // TODO: A clean API needed here
-  web3Modal.providerController.cachedProvider = null;
+  // web3Modal.providerController.cachedProvider = null;
+  web3Modal.clearCachedProvider();
   // web3Modal.clearCachedProvider();
 
   console.log('Opening a dialog', web3Modal);
diff --git a/app/dashboard/templates/onepager/base.html b/app/dashboard/templates/onepager/base.html
index 4c3b26965aa..1699c191451 100644
--- a/app/dashboard/templates/onepager/base.html
+++ b/app/dashboard/templates/onepager/base.html
@@ -90,6 +90,7 @@
     {% block 'scripts' %}{% endblock %}
 
     <script>
+      needWalletConnection();
       if ('addEventListener' in window) {
         window.addEventListener('load', function () {
           document.body.className = document.body.className.replace(/\bis-loading\b/, '');
diff --git a/app/grants/templates/grants/detail/index.html b/app/grants/templates/grants/detail/index.html
index 790b2e94924..478b3fe72b0 100644
--- a/app/grants/templates/grants/detail/index.html
+++ b/app/grants/templates/grants/detail/index.html
@@ -82,7 +82,6 @@
   <link rel="stylesheet" href="{% static "v2/css/activity_stream.css" %}">
   <script src="{% static "v2/js/status.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>
-  <script src="{% static "v2/js/tokens.js" %}"></script>
   <script src="{% static "v2/js/pages/tabs.js" %}"></script>
   <script src="{% static "v2/js/grants/index.js" %}"></script>
   <script src="{% static "v2/js/grants/funding.js" %}"></script>
diff --git a/app/grants/templates/grants/detail/info.html b/app/grants/templates/grants/detail/info.html
index c5db0a7deac..8abcf78350f 100644
--- a/app/grants/templates/grants/detail/info.html
+++ b/app/grants/templates/grants/detail/info.html
@@ -69,10 +69,10 @@ <h1 class="font-title-xl my-4 font-weight-bold">
           {{ grant.title }}
         {% endif %}
       </h1>
-  
+
        <!-- SUMMARY INFO -->
       <div class="summary-info mb-0 pb-1">
-  
+
         {% if grant.hidden and not grant.link_to_new_grant %}
           <div class="mb-2 font-smaller-2">
             <i style="width: 14px; top:0.6rem" class="mb-2 mb-md-0 fas fa-eye-slash mr-2 text-center position-relative"></i>
@@ -81,8 +81,8 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
-  
+
+
         <div class="font-body mb-2">
           {% if is_team_member %}
             <textarea id="form--input__reference-url" class="p-0 m-0 inline-edit" disabled>{{ grant.reference_url }}</textarea>
@@ -101,7 +101,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
           </p>
         </div>
       {% endif %}
-  
+
         <div class="mb-2">
           <i style="width: 14px;" class="fab fa-ethereum mr-2 text-center"></i>
           <a id="wallet-address" class="wallet-address"
@@ -109,7 +109,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             {{ grant.admin_address }}
           </a>
         </div>
-  
+
         {% if is_unsubscribed_from_updates_from_this_grant %}
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-comment-slash mr-2 text-center"></i>
@@ -117,12 +117,12 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
+
         {% if grant.link_to_new_grant %}
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-times mr-2 text-center"></i>
             <p class="d-inline-block mb-0" data-toggle="tooltip" data-placement="top" title="The grant owner has migrated to a new grant. Click below to visit new grant and fund">
-              Not accepting contributions as a new grant was created to replace this one by the owner

+              Not accepting contributions as a new grant was created to replace this one by the owner
             </p>
           </div>
         {% elif grant.token_symbol %}
@@ -141,7 +141,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
+
         {% if user_non_errored_subscription %}
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-info-circle mr-2 text-center"></i>
@@ -152,7 +152,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
+
       </div>
     </div>
   </div>
diff --git a/app/grants/templates/grants/shared/shared_scripts.html b/app/grants/templates/grants/shared/shared_scripts.html
index 51387c191aa..9a5da6974a8 100644
--- a/app/grants/templates/grants/shared/shared_scripts.html
+++ b/app/grants/templates/grants/shared/shared_scripts.html
@@ -20,5 +20,5 @@
 
 <script src="{% static "v2/js/lib/web3.min.js" %}"></script>
 <script>
-  var web3 = Web3 ? new Web3(Web3.givenProvider || "ws://localhost:8546") : null;
+  // var web3 = Web3 ? new Web3(Web3.givenProvider || "ws://localhost:8546") : null;
 </script>
diff --git a/app/kudos/templates/transaction/base.html b/app/kudos/templates/transaction/base.html
index ba010747e0c..fad3fabd67b 100644
--- a/app/kudos/templates/transaction/base.html
+++ b/app/kudos/templates/transaction/base.html
@@ -50,6 +50,7 @@
     {% include 'shared/footer_scripts.html' with slim=1 %}
     {% block 'scripts' %}{% endblock %}
     <script>
+      needWalletConnection();
       if ('addEventListener' in window) {
         window.addEventListener('load', function () {
           document.body.className = document.body.className.replace(/\bis-loading\b/, '');
diff --git a/app/quests/templates/quests/base.html b/app/quests/templates/quests/base.html
index ec07a339914..cccf0cdf877 100644
--- a/app/quests/templates/quests/base.html
+++ b/app/quests/templates/quests/base.html
@@ -45,9 +45,9 @@
         {% endblock %}
       </div>
     </div>
+    {% include 'shared/footer.html' with prefix="data-" %}
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
-    {% include 'shared/footer.html' with prefix="data-" %}
 
   </body>
   {% csrf_token %}
diff --git a/app/quests/templates/quests/index.html b/app/quests/templates/quests/index.html
index ae5ac9e0c4c..b10952b3583 100644
--- a/app/quests/templates/quests/index.html
+++ b/app/quests/templates/quests/index.html
@@ -581,7 +581,6 @@ <h4 class="pt-0">Play Gitcoin Quests Now.</h4>
 {% block 'scripts' %}
 <script src="{% static "v2/js/lib/jquery-unveil.js" %}"></script>
 <script src="{% static "v2/js/pages/quests.index.js" %}"></script>
-<script src="{% static "v2/js/user_card.js" %}"></script>
 <script>
   $(document).ready(function() {
     setInterval(function(){
diff --git a/app/retail/templates/shared/footer_scripts.html b/app/retail/templates/shared/footer_scripts.html
index f3efb56c5dd..3985d5a7d5c 100644
--- a/app/retail/templates/shared/footer_scripts.html
+++ b/app/retail/templates/shared/footer_scripts.html
@@ -43,7 +43,8 @@
   $.fn.bootstrapModal = bootstrapModal;
 
 </script>
-<script src="{% static "v2/js/lib/web3modal.min.js" %}"></script>
+<!-- <script src="{% static "v2/js/lib/web3modal.min.js" %}"></script> -->
+<script src="https://unpkg.com/web3modal"></script>
 <script src="https://cdn.jsdelivr.net/npm/authereum@latest/authereum.js"></script>
 <script src="{% static "v2/js/lib/fortmatic.js" %}"></script>
 <script src="{% static "v2/js/lib/walletconnect-v1.0.0-beta-47.js" %}"></script>
diff --git a/app/retail/templates/shared/footer_scripts_lite.html b/app/retail/templates/shared/footer_scripts_lite.html
index e5b26e6a9fb..05cd11175a1 100644
--- a/app/retail/templates/shared/footer_scripts_lite.html
+++ b/app/retail/templates/shared/footer_scripts_lite.html
@@ -41,7 +41,9 @@
   const bootstrapTooltip = $.fn.tooltip.noConflict()
   $.fn.bootstrapTooltip = bootstrapTooltip;
 </script>
-<script src="{% static "v2/js/lib/web3modal.min.js" %}"></script>
+<!-- <script src="{% static "v2/js/lib/web3modal.min.js" %}"></script> -->
+<script src="https://unpkg.com/web3modal"></script>
+
 <script src="https://cdn.jsdelivr.net/npm/authereum@latest/authereum.js"></script>
 <script src="{% static "v2/js/lib/fortmatic.js" %}"></script>
 <script src="{% static "v2/js/lib/walletconnect-v1.0.0-beta-47.js" %}"></script>
diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index c0df4ce18ed..53b6cc05a68 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -16,11 +16,11 @@
 
 {% endcomment %}
 {% load i18n static %}
-    <div class="modal" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" style="background-color: #eee;">
-      <div class="modal-dialog" role="document" style="max-height: 100vh; overflow-y: scroll;">
+    <div class="modal" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-scrollable" role="document">
         <div class="modal-content">
           <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="javascript:$('#tweetModal').remove();">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>
           </div>
diff --git a/app/retail/templates/shared/shared_scripts.html b/app/retail/templates/shared/shared_scripts.html
index dad35d7bd83..ca58f41abff 100644
--- a/app/retail/templates/shared/shared_scripts.html
+++ b/app/retail/templates/shared/shared_scripts.html
@@ -21,5 +21,5 @@
 <script src="{% static "v2/js/lib/web3.min.js" %}"></script>
 
 <script>
-    var web3 = window.web3 ? new Web3(window.web3.currentProvider) : new Web3(new Web3.providers.HttpProvider("https://mainnet.infura.io/v3/{{INFURA_V3_PROJECT_ID}}"));
+    // var web3 = window.web3 ? new Web3(window.web3.currentProvider) : new Web3(new Web3.providers.HttpProvider("https://mainnet.infura.io/v3/{{INFURA_V3_PROJECT_ID}}"));
 </script>
diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html
index 64b50f69bdc..4e3d8024b62 100644
--- a/app/townsquare/templates/townsquare/index.html
+++ b/app/townsquare/templates/townsquare/index.html
@@ -221,7 +221,6 @@ <h1 class="font-title text-white mt-5">We’re excited you’re here! Let’s ge
     <script src="{% static "v2/js/ipfs.js" %}"></script>
     <script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
     <script src="{% static "v2/js/abi.js" %}"></script>
-    <script src="{% static "onepager/js/send.js" %}"></script>
 
     <script src="{% static "v2/js/status.js" %}"></script>
     <script src="{% static "v2/js/pages/townsquare.js" %}"></script>

From 982c990b497c7c97146f247cc55345f6f6e7c365 Mon Sep 17 00:00:00 2001
From: Paul <41552663+molecula451@users.noreply.github.com>
Date: Wed, 24 Jun 2020 08:46:35 -0400
Subject: [PATCH 30/75] Unavailable network link (#6967)

---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index 32ecc49ee5f..2e8bce4a502 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -186,7 +186,7 @@ Chain of Custody
 
 Anywhere between 2 and 4 above, Funder may withdraw their funds via 'Cancel Bounty' function for any reason.
 
-We may introduce Arbitration [via Delphi](http://delphi.network/) at some point in the future.  Until then, we are lucky that Github users are very protective of their reputation, and therefore very kind to each other, and disputes have not generally arisen.
+We may introduce arbitration at some point in the future.  Until then, we are lucky that Github users are very protective of their reputation, and therefore very kind to each other, and disputes have not generally arisen.
 
 #### Showing Support to Individuals
 

From e63c518b88dc4df33645444527e7fe8f6907882c Mon Sep 17 00:00:00 2001
From: Andrew Redden <opensource@andrewredden.com>
Date: Wed, 24 Jun 2020 12:45:39 -0300
Subject: [PATCH 31/75] Fix for bottomVisible method scope. (#6964)

* fix for projects, the bottomVisible method was defined incorrectly

* fixes for paginaiton of projects, as well as sorting by winners as default

* restoring docker-compose

* Update manifest.json

reverting manifest changes

* Update top_nav.html

revert top nav changes

* position the loading screen better inside the project directory
---
 app/assets/v2/js/pages/dashboard-hackathon.js | 18 +++---
 app/assets/v2/js/vue-components.js            | 60 ++++++++-----------
 app/dashboard/router.py                       |  4 +-
 .../templates/dashboard/index-vue.html        |  4 +-
 app/dashboard/views.py                        |  2 +-
 chatconfig/config.json                        |  2 +-
 6 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/app/assets/v2/js/pages/dashboard-hackathon.js b/app/assets/v2/js/pages/dashboard-hackathon.js
index dace643354b..8c5f06ef4d7 100644
--- a/app/assets/v2/js/pages/dashboard-hackathon.js
+++ b/app/assets/v2/js/pages/dashboard-hackathon.js
@@ -776,8 +776,8 @@
     });
 
     $(`
-    #sidebar_container input[type=radio], #sidebar_container input[type=checkbox],
-    #sidebar_container .js-select2, #orgs`).on('change', function(e) {
+      #sidebar_container input[type=radio], #sidebar_container input[type=checkbox],
+      #sidebar_container .js-select2, #orgs`).on('change', function(e) {
       reset_offset();
       refreshBounties(null, 0, false);
       e.preventDefault();
@@ -861,13 +861,15 @@
           });
         }
       },
-      data: () => ({
-        csrf: $("input[name='csrfmiddlewaretoken']").val(),
-        tribesData: {},
-        hackathonSponsors: document.hackathonSponsors
-      })
+      data: function() {
+        return {
+          csrf: $("input[name='csrfmiddlewaretoken']").val(),
+          tribesData: {},
+          hackathonSponsors: document.hackathonSponsors
+        };
+      }
     });
-    var app = new Vue({
+    window.hackathonApp = new Vue({
       delimiters: [ '[[', ']]' ],
       el: '#dashboard-vue-app',
       updated: () => {
diff --git a/app/assets/v2/js/vue-components.js b/app/assets/v2/js/vue-components.js
index b9e21ebe94a..aabe1d14529 100644
--- a/app/assets/v2/js/vue-components.js
+++ b/app/assets/v2/js/vue-components.js
@@ -163,8 +163,8 @@ Vue.component('tribes-settings', {
           modules: {
             toolbar: [
               [ 'bold', 'italic', 'underline' ],
-              [{ 'align': [] }],
-              [{ 'list': 'ordered'}, { 'list': 'bullet' }],
+              [{'align': []}],
+              [{'list': 'ordered'}, {'list': 'bullet'}],
               [ 'link', 'code-block' ],
               ['clean']
             ]
@@ -176,7 +176,7 @@ Vue.component('tribes-settings', {
           modules: {
             toolbar: [
               [ 'bold', 'italic', 'underline' ],
-              [{ 'align': [] }],
+              [{'align': []}],
               [ 'link', 'code-block' ],
               ['clean']
             ]
@@ -202,11 +202,10 @@ Vue.component('project-directory', {
       vm.noResults = false;
 
       if (newPage) {
+        vm.projectsHasNext = null;
         vm.projectsPage = newPage;
       }
 
-      vm.params.page = vm.projectsPage;
-
       if (vm.hackathonId) {
         vm.params.hackathon = hackathonId;
       }
@@ -223,12 +222,11 @@ Vue.component('project-directory', {
 
       const searchParams = new URLSearchParams(vm.params);
 
-      const apiUrlProjects = `/api/v0.1/projects_fetch/?${searchParams.toString()}`;
+      const apiUrlProjects = vm.projectsHasNext ? vm.projectsHasNext : `/api/v0.1/projects_fetch/?${searchParams.toString()}`;
 
       const getProjects = fetchData(apiUrlProjects, 'GET');
 
       $.when(getProjects).then(function(response) {
-        vm.hackathonProjects = [];
         response.results.forEach(function(item) {
           vm.hackathonProjects.push(item);
         });
@@ -236,21 +234,14 @@ Vue.component('project-directory', {
         vm.userProjects = [];
         if (vm.userId) {
           vm.userProjects = vm.hackathonProjects.filter(
-            ({ profiles }) => profiles.some(
-              ({ id }) => id === parseInt(vm.userId, 10)
+            ({profiles}) => profiles.some(
+              ({id}) => id === parseInt(vm.userId, 10)
             )
           );
         }
-        vm.projectsNumPages = response.count;
         vm.projectsHasNext = response.next;
 
         vm.numProjects = response.count;
-        if (vm.projectsHasNext) {
-          vm.projectsPage = ++vm.projectsPage;
-
-        } else {
-          vm.projectsPage = 1;
-        }
 
         if (vm.hackathonProjects.length) {
           vm.noResults = false;
@@ -267,6 +258,20 @@ Vue.component('project-directory', {
 
       vm.fetchProjects(1);
 
+    },
+    bottomVisible: function() { // TODO: abstract this to the mixin, and have it take a callback which modifies the component state.
+      let vm = this;
+
+      const scrollY = window.scrollY;
+      const visible = document.documentElement.clientHeight;
+      const pageHeight = document.documentElement.scrollHeight - 500;
+      const bottomOfPage = visible + scrollY >= pageHeight;
+
+      if (!vm.isLoading && (bottomOfPage || pageHeight < visible)) {
+        if (vm.projectsHasNext) {
+          vm.fetchProjects();
+        }
+      }
     }
   },
   data: function() {
@@ -279,8 +284,7 @@ Vue.component('project-directory', {
       userProjects: document.userProjects || [],
       projectsPage: 1,
       hackathonId: document.hackathon_id || null,
-      projectsNumPages: 0,
-      projectsHasNext: false,
+      projectsHasNext: null,
       numProjects: 0,
       media_url,
       searchTerm: null,
@@ -321,21 +325,6 @@ Vue.component('project-directory', {
     window.removeEventListener('scroll', () => {
       this.bottom = this.bottomVisible();
     });
-  },
-  bottomVisible: function() { // TODO: abstract this to the mixin, and have it take a callback which modifies the component state.
-    let vm = this;
-
-    const scrollY = window.scrollY;
-    const visible = document.documentElement.clientHeight;
-    const pageHeight = document.documentElement.scrollHeight - 500;
-    const bottomOfPage = visible + scrollY >= pageHeight;
-
-    if (bottomOfPage || pageHeight < visible) {
-      if (vm.projectsHasNext) {
-        vm.projectsHasNext = false;
-        vm.fetchProjects();
-      }
-    }
   }
 });
 
@@ -352,7 +341,10 @@ Vue.component('project-card', {
       let vm = this;
 
       const url = '/api/v0.1/hackathon_project/set_winner/';
-      const markWinner = fetchData(url, 'POST', {project_id: project.pk, winner: $event ? 1 : 0}, {'X-CSRFToken': vm.csrf});
+      const markWinner = fetchData(url, 'POST', {
+        project_id: project.pk,
+        winner: $event ? 1 : 0
+      }, {'X-CSRFToken': vm.csrf});
 
       $.when(markWinner).then(response => {
         if (response.message) {
diff --git a/app/dashboard/router.py b/app/dashboard/router.py
index 8f01bbf9339..e15eb6ce63e 100644
--- a/app/dashboard/router.py
+++ b/app/dashboard/router.py
@@ -233,7 +233,7 @@ def get_queryset(self):
                 hackathon_event = HackathonEvent.objects.last()
 
             queryset = HackathonProject.objects.filter(hackathon=hackathon_event).exclude(
-                status='invalid').prefetch_related('profiles', 'bounty').order_by(order_by, 'id')
+                status='invalid').prefetch_related('profiles', 'bounty').order_by('-winner', order_by, 'id')
 
             if sponsor:
                 queryset = queryset.filter(
@@ -242,7 +242,7 @@ def get_queryset(self):
         elif sponsor:
             queryset = HackathonProject.objects.filter(Q(hackathon__sponsor_profiles__handle__iexact=sponsor) | Q(
                 bounty__bounty_owner_github_username=sponsor)).exclude(
-                status='invalid').prefetch_related('profiles', 'bounty').order_by(order_by, 'id')
+                status='invalid').prefetch_related('profiles', 'bounty').order_by('-winner', order_by, 'id')
 
         if q:
             queryset = queryset.filter(
diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 60f9b878e47..2e50084b044 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -215,8 +215,7 @@ <h1 class="font-title font-weight-semibold">Hackathon Coming Soon!</h1>
                   </template>
                   <project-directory inline-template user-id={{ user.profile.id | safe }}>
                     <div class="ml-4">
-                      <loading-screen v-if="isLoading"></loading-screen>
-                      <div v-if="!isLoading" class="sidebar-container flex-column flex-lg-row">
+                      <div class="sidebar-container flex-column flex-lg-row">
                         <transition name="fade">
                           <nav v-show="showFilters" class="sidebar flex-fill pr-4" role="navigation">
                             <div class="pb-4 border-bottom form-group">
@@ -293,6 +292,7 @@ <h1 class="font-title title ml-2 mt-4">
                         <div class="project-grid ml-2">
                           <project-card {% if is_staff %} v-bind:is_staff="true" {% endif %} v-for="project in hackathonProjects" v-bind:project="project" :key="project.id"/>
                         </div>
+                          <loading-screen v-if="isLoading"></loading-screen>
                       </div>
                     </div>
                       </div>
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index edffdcfd313..f1c4bd07404 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -924,7 +924,7 @@ def set_project_winner(request):
         return JsonResponse({
             'message': 'Invalid Project'
         })
-    project = HackathonProject.objects.get(pk=project_id).prefetch_related('bounty')
+    project = HackathonProject.objects.get(pk=project_id)
 
     if not request.user.is_authenticated and (request.user.is_staff or request.user.profile.handle == project.bounty.bounty_owner_github_username):
         return JsonResponse({
diff --git a/chatconfig/config.json b/chatconfig/config.json
index b55cdc7bada..c99cd294d4d 100644
--- a/chatconfig/config.json
+++ b/chatconfig/config.json
@@ -560,4 +560,4 @@
         "RemoteImageProxyURL": "",
         "RemoteImageProxyOptions": ""
     }
-}
+}
\ No newline at end of file

From db41f2479dea0ec861b6c2631261bed1eb206402 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 13:17:12 -0600
Subject: [PATCH 32/75] formalizes the types of conversion rates in the DB

---
 app/dashboard/management/commands/cleanup_db_space.py | 2 ++
 app/economy/models.py                                 | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/dashboard/management/commands/cleanup_db_space.py b/app/dashboard/management/commands/cleanup_db_space.py
index 2331e7168f3..53066741c9c 100644
--- a/app/dashboard/management/commands/cleanup_db_space.py
+++ b/app/dashboard/management/commands/cleanup_db_space.py
@@ -48,6 +48,8 @@ def handle(self, *args, **options):
             ).exclude(
                 from_currency='USDT',
                 to_currency='ETH'
+            ).exclude(
+                source='manual',
             ).delete()
         print(f'ConversionRate: {result}')
 
diff --git a/app/economy/models.py b/app/economy/models.py
index 810c27dc71b..51ae8c92f23 100644
--- a/app/economy/models.py
+++ b/app/economy/models.py
@@ -167,7 +167,12 @@ def get_view_count(self):
 
 class ConversionRate(SuperModel):
     """Define the conversion rate model."""
-
+    SOURCE_TYPES = [
+        ('cryptocompare', 'cryptocompare'),
+        ('poloniex', 'poloniex'),
+        ('uniswap', 'uniswap'),
+        ('manual', 'manual'),
+    ]
     from_amount = models.FloatField()
     to_amount = models.FloatField()
     timestamp = models.DateTimeField(null=False, default=get_time, db_index=True)

From d02c057722a3527b61848e75302aab854ed65822 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 13:23:55 -0600
Subject: [PATCH 33/75] 1 thing

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

diff --git a/app/economy/models.py b/app/economy/models.py
index 51ae8c92f23..54dfecfa9e1 100644
--- a/app/economy/models.py
+++ b/app/economy/models.py
@@ -176,7 +176,7 @@ class ConversionRate(SuperModel):
     from_amount = models.FloatField()
     to_amount = models.FloatField()
     timestamp = models.DateTimeField(null=False, default=get_time, db_index=True)
-    source = models.CharField(max_length=30, db_index=True)
+    source = models.CharField(max_length=30, db_index=True, choices=SOURCE_TYPES)
     from_currency = models.CharField(max_length=30, db_index=True)
     to_currency = models.CharField(max_length=30, db_index=True)
 

From e1c3d54732fe1e66cec23e578d5a18d268b2e0ca Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 15:04:37 -0600
Subject: [PATCH 34/75] fixes A few annoying things about kudso

1. now proudly shows the kudos artist
2. allows u to mind them in one fell swoop + change onwnership
3. stores the IPFS metadata in our DB for future keeping
---
 app/dashboard/models.py                       |  6 ++++++
 .../templates/profiles/scorecard_hunter.html  |  4 ++++
 .../templates/shared/profile_kudos.html       | 20 +++++++++++++++++++
 app/kudos/admin.py                            |  6 ++++--
 app/kudos/migrations/0017_token_metadata.py   | 19 ++++++++++++++++++
 app/kudos/models.py                           | 12 +++++++++++
 app/kudos/templates/kudos_details.html        |  3 +++
 app/kudos/templates/kudos_marketplace.html    |  2 +-
 app/kudos/templates/shared/kudos_card.html    |  8 +++++++-
 app/kudos/utils.py                            |  1 +
 10 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 app/kudos/migrations/0017_token_metadata.py

diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index c38a9e2ad24..127bab1120c 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2896,6 +2896,12 @@ def get_org_kudos(self):
             return Token.objects.none()
         return Token.objects.filter(Q(name__icontains=self.name)|Q(name__icontains=self.handle)).filter(cloned_from_id=F('token_id')).visible()
 
+    @property
+    def kudos_authored(self):
+        from kudos.models import Token
+        return Token.objects.filter(artist=self.handle)
+
+
     @property
     def get_my_kudos(self):
         from kudos.models import KudosTransfer
diff --git a/app/dashboard/templates/profiles/scorecard_hunter.html b/app/dashboard/templates/profiles/scorecard_hunter.html
index 3a0c5cf3bcf..7921c2c8824 100644
--- a/app/dashboard/templates/profiles/scorecard_hunter.html
+++ b/app/dashboard/templates/profiles/scorecard_hunter.html
@@ -46,6 +46,10 @@
                 - <b>{{ total_kudos_received_count }}</b>
                 Kudo{{total_kudos_received_count|pluralize}} received
               </li>
+              <li>
+                - <b>{{profile.kudos_authored.count}}</b>
+                Kudos authored
+              </li>
               <li>
                 - <b>{{ total_grant_created }}</b>
                 Grant{{total_grant_created|pluralize}} created
diff --git a/app/dashboard/templates/shared/profile_kudos.html b/app/dashboard/templates/shared/profile_kudos.html
index e162afba85f..4c65e254ce4 100644
--- a/app/dashboard/templates/shared/profile_kudos.html
+++ b/app/dashboard/templates/shared/profile_kudos.html
@@ -16,6 +16,26 @@
 {% endcomment %}
 {% load i18n static kudos_extras %}
 
+{% if profile.kudos_authored.count %}
+<div>
+
+  <h3>
+    Author of {{profile.kudos_authored.count}} Kudos
+  </h3>
+  <p>
+    <a href="/kudos/marketplace?q={{profile.handle}}">
+      <hr>
+      {% for token in profile.kudos_authored %}
+        <img src="{{token.preview_img_url}}" style="width: 100px; height: 100px;">
+      {% endfor %}
+      <br>
+      Click here to see the Kudos that @{{profile.handle}} has authored.
+    </a>
+  </p>
+
+</div>
+{% endif %}
+
 <ul class="nav nav-tabs my-5" id="myTab" role="tablist">
   <li class="nav-item">
     <a class="nav-link nav-line active" id="mykudos-tab" data-toggle="tab" href="#mykudos" role="tab" aria-controls="mykudos" aria-selected="true">{% if request.path == '/profile/' %}{% trans "Your Kudos" %}{% else %}{% trans "Kudos" %}{% endif %} ({{ kudos_count }})</a>
diff --git a/app/kudos/admin.py b/app/kudos/admin.py
index 7d4e8ff29c1..b5bc0918864 100644
--- a/app/kudos/admin.py
+++ b/app/kudos/admin.py
@@ -47,13 +47,15 @@ def response_change(self, request, obj):
             notify_kudos_rejected(obj)
             self.message_user(request, f"Notified user of rejection")
             return redirect('/_administrationkudos/tokenrequest/?approved=f&rejection_reason=')
-        if "_change_owner" in request.POST:
+        if "_change_owner" in request.POST or request.POST.get('_change_owner_mint_kudos', False):
             obj.to_address = '0x6239FF1040E412491557a7a02b2CBcC5aE85dc8F'
             obj.save()
             self.message_user(request, f"Changed owner to gitcoin")
-        if "_mint_kudos" in request.POST:
+        if "_mint_kudos" in request.POST or request.POST.get('_change_owner_mint_kudos', False):
             from kudos.tasks import mint_token_request
             try:
+                obj.rejection_reason = 'n/a'
+                obj.save()
                 mint_token_request.delay(obj.id)
                 self.message_user(request, f"Mint/sync submitted to chain")
             except Exception as e:
diff --git a/app/kudos/migrations/0017_token_metadata.py b/app/kudos/migrations/0017_token_metadata.py
new file mode 100644
index 00000000000..bf7aaf82454
--- /dev/null
+++ b/app/kudos/migrations/0017_token_metadata.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2020-06-24 20:37
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kudos', '0016_auto_20200605_1302'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='token',
+            name='metadata',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
+        ),
+    ]
diff --git a/app/kudos/models.py b/app/kudos/models.py
index 8722fad0e38..5e0b717e42b 100644
--- a/app/kudos/models.py
+++ b/app/kudos/models.py
@@ -64,6 +64,7 @@ def keyword(self, keyword):
         return self.filter(
             Q(name__icontains=keyword) |
             Q(description__icontains=keyword) |
+            Q(artist__icontains=keyword) |
             Q(tags__icontains=keyword)
         )
 
@@ -125,6 +126,7 @@ class Meta:
     platform = models.CharField(max_length=255, null=True, blank=True)
     external_url = models.CharField(max_length=255, null=True)
     background_color = models.CharField(max_length=255, null=True)
+    metadata = JSONField(default=dict, blank=True)
 
     # Extra fields added to database (not on blockchain)
     owner_address = models.CharField(max_length=255)
@@ -148,6 +150,16 @@ def save(self, *args, **kwargs):
 
         super().save(*args, **kwargs)
 
+    @property
+    def artist_count(self):
+        return self.artist_others.count()
+
+    @property
+    def artist_others(self):
+        if not self.artist:
+            return Token.objects.none()
+        return Token.objects.filter(artist=self.artist)
+
     @property
     def static_image(self):
         if 'v2' in self.image:
diff --git a/app/kudos/templates/kudos_details.html b/app/kudos/templates/kudos_details.html
index 8107299b13a..466276dc91d 100644
--- a/app/kudos/templates/kudos_details.html
+++ b/app/kudos/templates/kudos_details.html
@@ -46,6 +46,9 @@
           {% endif %}
           <h3 id="kudosName" class="kudos-details__title">{{ kudos.ui_name }} {% if kudos.generation %}<small class="lead">Gen {{ kudos.generation }}</small>{% endif %}</h3>
           <div>Owner Address: <a target="_blank" href="https://etherscan.io/address/{{ kudos.owner_address }}" class="kudos-details__address" title="{{ kudos.owner_address }}">{{ kudos.owner_address|humanize_address }}</a></div>
+          {% if kudos.artist %}
+            <div>Artist: <img style="width: 30px; height: 30px;" src="/dynamic/avatar/{{kudos.artist}}" > <a href="/profile/{{kudos.artist}}/kudos" class="kudos-details__address" title="@{{ kudos.artist }} has this kudos on {{kudos.created_on}}">{{kudos.artist}}</a> | <a href="/kudos/marketplace?q={{kudos.artist}}">View all {{kudos.artist_count}} Kudos by @{{kudos.artist}}</a></div>
+          {% endif %}
           {% if kudos.quests_reward.count %}
             Reward for beating
             {% for quest in reward_for %}
diff --git a/app/kudos/templates/kudos_marketplace.html b/app/kudos/templates/kudos_marketplace.html
index 878aaef87cf..fdd94d9fe0f 100644
--- a/app/kudos/templates/kudos_marketplace.html
+++ b/app/kudos/templates/kudos_marketplace.html
@@ -89,7 +89,7 @@ <h1>UH-OH!</h1>
 
       {% if listings %}
       <div class="col-xs-12 col-sm-6 col-lg-3 mb-3">
-        <a href="https://github.com/gitcoinco/kudosbadges/issues/new" target="_blank" class="cta-square kd-shadow">
+        <a href="/kudos/new" target="_blank" class="cta-square kd-shadow">
           <div>
             <span>{% trans "Don’t See One You Like?" %}</span>
             <small>{% trans "Mint Your Own!" %}</small>
diff --git a/app/kudos/templates/shared/kudos_card.html b/app/kudos/templates/shared/kudos_card.html
index c0bf150ab34..c84112c2e1b 100644
--- a/app/kudos/templates/shared/kudos_card.html
+++ b/app/kudos/templates/shared/kudos_card.html
@@ -21,5 +21,11 @@
     <img id="kudosImage" src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 3 2'%3E%3C/svg%3E" data-src="{{listing.preview_img_url}}" alt="{{ listing.name }}" class="img-thumbnail kd-shadow border-transparent" loading="lazy" width="250" style="min-height: 200px;">
   </a>
   <span class="kd-price">{{ listing.price_in_eth }} ETH</span>
-  <div class="kd-name text-truncate" title="{{ listing.ui_name }}">{{ listing.ui_name }}</div>
+  <div class="kd-name text-truncate" title="{{ listing.ui_name }}">{{ listing.ui_name }}
+  {% if listing.artist %}
+  by <img loading="lazy" style="width: 30px; height: 30px;" data-src="/dynamic/avatar/{{listing.artist}}" > <a href="/profile/{{listing.artist}}/kudos" class="kudos-details__address" title="@{{ listing.artist }} has this kudos on {{listing.created_on}}">@{{listing.artist}}</a>
+  
+  {% endif %}
+  </div>
+
 </div>
diff --git a/app/kudos/utils.py b/app/kudos/utils.py
index 4f02b64dff0..9b240c4d0ff 100644
--- a/app/kudos/utils.py
+++ b/app/kudos/utils.py
@@ -201,6 +201,7 @@ def get_kudos_map(kudos, metadata):
                 mapping['platform'] = attrib['value']
 
         mapping['tags'] = ', '.join(tags)
+        mapping['metadata'] = metadata
 
         # Add the rest of the fields
         kudos_map = {**mapping, **metadata}

From 24f50e251609719f0a8caad2b4962f3d012ade83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Octavio=20Amuch=C3=A1stegui?=
 <octavioamuchastegui@gmail.com>
Date: Wed, 24 Jun 2020 18:08:47 -0300
Subject: [PATCH 35/75] Stable (#6976)

* Fix Firefox issue that showed red border for decimal inputs in cart (#6958)

* New Grants txn Failed Email (#6791)

* setup web preview url

* implement render_grant_txn_failed

* build template grant_txn_failed.html

* management command for grant_txn_failed_email

* fix missing returns after resolving conflicts

* add bulk_add_url

* move email specific style to grant_txn_failed.html

* new approval checker helper script

* fix comparing strings on allowance

* fix featured bounty and balance checker

* fix eslint card.js

* Improve cart gas estimates for DAI, aDAI, cDAI, and ANT (#6961)

* Quotation on Profile handle (#6957)

* Improve cart gas estimates for DAI, aDAI, cDAI, and ANT

Co-authored-by: Paul <41552663+molecula451@users.noreply.github.com>

* wallet improvments (#6952)

* wallet improvments

* avoid form submission

* bounty requesting wallet

* quest js dupe

* Fix for bottomVisible method scope. (#6964)

* fix for projects, the bottomVisible method was defined incorrectly

* fixes for paginaiton of projects, as well as sorting by winners as default

* restoring docker-compose

* Update manifest.json

reverting manifest changes

* Update top_nav.html

revert top nav changes

* position the loading screen better inside the project directory

* formalizes the types of conversion rates in the DB

* 1 thing

* fixes A few annoying
things about kudso

1. now proudly shows the kudos artist
2. allows u to mind them in one fell swoop + change onwnership
3. stores the IPFS metadata in our DB for future keeping

Co-authored-by: Matt <17163988+mds1@users.noreply.github.com>
Co-authored-by: Sebastian T F <sebastian.tharakan97@gmail.com>
Co-authored-by: Owocki <ksowocki@gmail.com>
Co-authored-by: Paul <41552663+molecula451@users.noreply.github.com>
Co-authored-by: Andrew Redden <opensource@andrewredden.com>
---
 app/app/urls.py                               |   1 +
 app/assets/v2/js/activity.js                  |   4 -
 app/assets/v2/js/cart.js                      |  75 +++++++++---
 app/assets/v2/js/grants/fund.js               |   9 +-
 app/assets/v2/js/grants/funding.js            |   9 +-
 app/assets/v2/js/grants/new.js                | 112 +++++++-----------
 app/assets/v2/js/pages/bulk_payout.js         |  12 +-
 app/assets/v2/js/pages/create_bounty/ETH.js   |  15 +--
 app/assets/v2/js/pages/dashboard-hackathon.js |  18 +--
 .../v2/js/pages/fulfill_bounty/index.js       |  26 ++--
 app/assets/v2/js/pages/kudos_send.js          |   4 +
 app/assets/v2/js/pages/new_bounty.js          |   8 +-
 app/assets/v2/js/pages/process_bounty.js      |   6 +
 app/assets/v2/js/vue-components.js            |  60 ++++------
 app/assets/v2/js/wallet.js                    |  19 ++-
 .../management/commands/cleanup_db_space.py   |   2 +
 .../commands/grant_txn_failed_email.py        |  32 +++++
 app/dashboard/models.py                       |   6 +
 app/dashboard/router.py                       |   4 +-
 .../templates/dashboard/index-vue.html        |   4 +-
 app/dashboard/templates/onepager/base.html    |   1 +
 .../templates/profiles/scorecard_hunter.html  |   4 +
 .../templates/shared/profile_kudos.html       |  20 ++++
 app/dashboard/views.py                        |   2 +-
 app/economy/models.py                         |   9 +-
 app/grants/templates/grants/cart-vue.html     |   6 +-
 app/grants/templates/grants/detail/index.html |   1 -
 app/grants/templates/grants/detail/info.html  |  20 ++--
 .../grants/shared/shared_scripts.html         |   2 +-
 app/kudos/admin.py                            |   6 +-
 app/kudos/migrations/0017_token_metadata.py   |  19 +++
 app/kudos/models.py                           |  12 ++
 app/kudos/templates/kudos_details.html        |   3 +
 app/kudos/templates/kudos_marketplace.html    |   2 +-
 app/kudos/templates/shared/kudos_card.html    |   8 +-
 app/kudos/templates/transaction/base.html     |   1 +
 app/kudos/utils.py                            |   1 +
 app/marketing/mails.py                        |  21 +++-
 app/quests/templates/quests/base.html         |   2 +-
 app/quests/templates/quests/index.html        |   1 -
 app/retail/emails.py                          |  24 ++++
 .../templates/emails/grant_txn_failed.html    |  59 +++++++++
 .../templates/emails/grant_txn_failed.txt     |   7 ++
 app/retail/templates/emails/template.html     |  12 ++
 .../templates/shared/footer_scripts.html      |   3 +-
 .../templates/shared/footer_scripts_lite.html |   4 +-
 .../templates/shared/grant_thanks_modal.html  |   6 +-
 .../templates/shared/shared_scripts.html      |   2 +-
 .../templates/townsquare/index.html           |   1 -
 chatconfig/config.json                        |   2 +-
 scripts/debug/check_approval_amount.js        |  18 +--
 51 files changed, 493 insertions(+), 212 deletions(-)
 create mode 100644 app/dashboard/management/commands/grant_txn_failed_email.py
 create mode 100644 app/kudos/migrations/0017_token_metadata.py
 create mode 100644 app/retail/templates/emails/grant_txn_failed.html
 create mode 100644 app/retail/templates/emails/grant_txn_failed.txt

diff --git a/app/app/urls.py b/app/app/urls.py
index 920f91cfabe..e6377cf250e 100644
--- a/app/app/urls.py
+++ b/app/app/urls.py
@@ -541,6 +541,7 @@
     path('_administration/email/wallpost', retail.emails.wallpost, name='wallpost_email'),
     path('_administration/email/grant_update', retail.emails.grant_update, name='grant_update_email'),
     path('_administration/email/grant_recontribute', retail.emails.grant_recontribute, name='grant_recontribute_email'),
+    path('_administration/email/grant_txn_failed', retail.emails.grant_txn_failed, name='grant_txn_failed_email'),
     path(
         '_administration/email/new_bounty_acceptance',
         retail.emails.new_bounty_acceptance,
diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js
index 93773f0caaf..fd0c0aef778 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -396,10 +396,6 @@ $(document).ready(function() {
       _alert('Please login first.', 'error');
       return;
     }
-    if (!web3) {
-      _alert('Please enable and unlock your web3 wallet.', 'error');
-      return;
-    }
 
     if (!provider) {
       return onConnect();
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 0cba60749bd..8d202b33473 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -3,9 +3,13 @@
  * @dev If you need to interact with the Rinkeby Dai contract (e.g. to reset allowances for
  * testing), use this one click dapp: https://oneclickdapp.com/drink-leopard/
  */
+let BN;
 
+needWalletConnection();
+window.addEventListener('dataWalletReady', function(e) {
+  BN = web3.utils.BN;
+}, false);
 // Constants
-const BN = web3.utils.BN;
 const ETH_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
 const gitcoinAddress = '0x00De4B13153673BCAE2616b67bf822500d325Fc3'; // Gitcoin donation address for mainnet and rinkeby
 
@@ -199,16 +203,47 @@ Vue.component('grants-cart', {
 
     // Estimated gas limit for the transaction
     donationInputsGasLimit() {
-      // Based on contract tests, we use the heuristic below to get gas estimate. This is done
-      // instead of `estimateGas()` so we can send the donation transaction before the approval txs
-      // are confirmed, because if the approval txs are not confirmed then estimateGas will fail.
-      // The estimates used here are based on single donations (i.e. one item in the cart). Because
-      // gas prices go down with batched transactions, whereas this assumes they're constant,
-      // this gives us a conservative estimate
+      // The below heuristics are used instead of `estimateGas()` so we can send the donation
+      // transaction before the approval txs are confirmed, because if the approval txs
+      // are not confirmed then estimateGas will fail.
+
+      // If we have a cart where all donations are in Dai, we use a linear regression to
+      // estimate gas costs based on real checkout transaction data, and add a 50% margin
+      const donationCurrencies = this.donationInputs.map(donation => donation.token);
+      const isAllDai = donationCurrencies.every((addr, index, array) => addr === array[0]);
+
+      if (isAllDai) {
+        if (donationCurrencies.length === 1) {
+          // Special case since we overestimate here otherwise
+          return 80000;
+        }
+        // Below curve found by running script at the repo below around 9AM PT on 2020-Jun-19
+        // then generating a conservative best-fit line
+        // https://github.com/mds1/Gitcoin-Checkout-Gas-Analysis
+        return 25000 * donationCurrencies.length + 125000;
+      }
+
+      // Otherwise, based on contract tests, we use the more conservative heuristic below to get
+      // a gas estimate. The estimates used here are based on testing the cost of a single
+      // donation (i.e. one item in the cart). Because gas prices go down with batched
+      // transactions, whereas this assumes they're constant, this gives us a conservative estimate
       const gasLimit = this.donationInputs.reduce((accumulator, currentValue) => {
-        return currentValue.token === ETH_ADDRESS
-          ? accumulator + 50000// ETH donation gas estimate
-          : accumulator + 100000; // token donation gas estimate
+        const tokenAddr = currentValue.token.toLowerCase();
+
+        if (currentValue.token === ETH_ADDRESS) {
+          return accumulator + 50000; // ETH donation gas estimate
+
+        } else if (tokenAddr === '0x960b236A07cf122663c4303350609A66A7B288C0'.toLowerCase()) {
+          return accumulator + 170000; // ANT donation gas estimate
+
+        } else if (tokenAddr === '0xfC1E690f61EFd961294b3e1Ce3313fBD8aa4f85d'.toLowerCase()) {
+          return accumulator + 500000; // aDAI donation gas estimate
+
+        } else if (tokenAddr === '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643'.toLowerCase()) {
+          return accumulator + 450000; // cDAI donation gas estimate
+
+        }
+        return accumulator + 100000; // generic token donation gas estimate
       }, 0);
 
       return gasLimit;
@@ -486,7 +521,7 @@ Vue.component('grants-cart', {
         // Setup -----------------------------------------------------------------------------------
         // Prompt web3 login if not connected
         if (!provider) {
-          await onConnect();
+          return await onConnect();
         }
 
         // Throw if invalid Gitcoin contribution percentage
@@ -511,6 +546,16 @@ Vue.component('grants-cart', {
         // For each token, check if an approval is needed, and if so save off the data
         let allowanceData = [];
 
+        const calcTotalAllowance = (tokenDetails) => {
+          const initialValue = new BN('0');
+
+          return this.donationInputs.reduce((accumulator, currentValue) => {
+            return currentValue.token === tokenDetails.addr
+              ? accumulator.add(new BN(currentValue.amount)) // correct token donation
+              : accumulator.add(new BN('0')); // ETH donation
+          }, initialValue);
+        };
+
         for (let i = 0; i < selectedTokens.length; i += 1) {
           const tokenName = selectedTokens[i];
           const tokenDetails = this.getTokenByName(tokenName);
@@ -535,12 +580,8 @@ Vue.component('grants-cart', {
           // Get required allowance based on donation amounts
           // We use reduce instead of this.donationsTotal because this.donationsTotal will
           // not have floating point errors, but the actual amounts used will
-          const initialValue = new BN('0');
-          const requiredAllowance = this.donationInputs.reduce((accumulator, currentValue) => {
-            return currentValue.token === tokenDetails.addr
-              ? accumulator.add(new BN(currentValue.amount)) // correct token donation
-              : accumulator.add(new BN('0')); // ETH donation
-          }, initialValue);
+
+          const requiredAllowance = calcTotalAllowance(tokenDetails);
 
           // Check user token balance against requiredAllowance
           const userTokenBalance = await tokenContract.methods.balanceOf(userAddress).call({ from: userAddress });
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 5efaf7aa75e..5fc628d2814 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -330,8 +330,7 @@ $(document).ready(function() {
             $('#transaction_url').attr('href', linkURL);
             enableWaitState('#grants_form');
             set_form_disabled(false);
-            $('#tweetModal').css('display', 'block');
-
+            $('#tweetModal').modal('show');
           };
 
           if (!gitcoin_amount) {
@@ -558,7 +557,7 @@ const signSubscriptionHash = (subscriptionHash) => {
     web3.eth.personal.sign('' + subscriptionHash, accounts[0], function(err, signature) {
       indicateMetamaskPopup(true);
       set_form_disabled(false);
-      $('#tweetModal').css('display', 'block');
+      $('#tweetModal').modal('show');
 
       if (signature) {
         $('#signature').val(signature);
@@ -669,7 +668,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
     }).on('transactionHash', function(transactionHash) {
       indicateMetamaskPopup(1);
       set_form_disabled(false);
-      $('#tweetModal').css('display', 'block');
+      $('#tweetModal').modal('show');
       data = {
         'subscription_hash': 'onetime',
         'signature': 'onetime',
@@ -690,7 +689,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
       $('#transaction_url').attr('href', linkURL);
       enableWaitState('#grants_form');
       set_form_disabled(false);
-      $('#tweetModal').css('display', 'block');
+      $('#tweetModal').modal('show');
     }).on('confirmation', function(confirmationNumber, receipt) {
       data = {
         'subscription_hash': 'onetime',
diff --git a/app/assets/v2/js/grants/funding.js b/app/assets/v2/js/grants/funding.js
index 2b9e546b0f3..457c11cc8d4 100644
--- a/app/assets/v2/js/grants/funding.js
+++ b/app/assets/v2/js/grants/funding.js
@@ -14,7 +14,7 @@ $(document).ready(function() {
     _alert(message, 'success');
     localStorage.removeItem('contributions_were_successful');
     localStorage.removeItem('contributions_count');
-    $('#tweetModal').css('display', 'block');
+    $('#tweetModal').modal('show');
     let donations = CartData.loadCart();
 
     if (donations.length) {
@@ -31,13 +31,6 @@ $(document).ready(function() {
       $('#tweetModal a.button').attr('href', 'https://twitter.com/intent/tweet?text=I%20just%20funded%20these%20' + donations.length + '%20grants%20on%20@gitcoin%20=%3E%20' + bulk_add_cart);
     }
     CartData.setCart([]);
-
-    $(document).keydown(function(e) {
-      if (e.keyCode == 27) {
-        $('#tweetModal').remove();
-      }
-    });
-
   }
 
   $('#js-addToCart-form').submit(function(event) {
diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
index 9b483ade59f..61191fbdc5f 100644
--- a/app/assets/v2/js/grants/new.js
+++ b/app/assets/v2/js/grants/new.js
@@ -12,60 +12,8 @@ function changeTokens() {
 window.addEventListener('tokensReady', function(e) {
   changeTokens();
 }, false);
+needWalletConnection();
 
-$(document).ready(function() {
-
-  $('.select2-selection__choice').removeAttr('title');
-
-  if (web3 && web3.eth) {
-    web3.eth.net.isListening((error, connectionStatus) => {
-      if (connectionStatus)
-        init();
-      document.init = true;
-    });
-  }
-  // fix for triage bug https://gitcoincore.slack.com/archives/CAXQ7PT60/p1551220641086800
-  setTimeout(function() {
-    if (!document.init) {
-      show_error_banner();
-    }
-  }, 1000);
-});
-
-function saveGrant(grantData, isFinal) {
-  let csrftoken = $("#create-grant input[name='csrfmiddlewaretoken']").val();
-
-  $.ajax({
-    type: 'post',
-    url: '/grants/new',
-    processData: false,
-    contentType: false,
-    data: grantData,
-    headers: {'X-CSRFToken': csrftoken},
-    success: json => {
-      if (isFinal) {
-        if (json.url) {
-          document.suppress_loading_leave_code = true;
-          window.location = json.url;
-        } else {
-          console.error('Grant failed to save');
-        }
-      }
-    },
-    error: () => {
-      console.error('Grant failed to save');
-      _alert({ message: gettext('Your grant failed to save. Please try again.') }, 'error');
-    }
-  });
-}
-
-
-$('#new_button').on('click', function(e) {
-  if (!provider) {
-    e.preventDefault();
-    return onConnect().then(() => init());
-  }
-});
 
 const init = () => {
   /*
@@ -79,11 +27,8 @@ const init = () => {
     window.location = document.location.origin + '/grants/quickstart';
   }
 
-  web3.eth.getAccounts(function(err, accounts) {
-    $('#input-admin_address').val(accounts[0]);
-    $('#contract_owner_address').val(accounts[0]);
-  });
-
+  $('#input-admin_address').val(selectedAccount);
+  $('#contract_owner_address').val(selectedAccount);
   userSearch('.team_members', false, undefined, false, false, true);
 
   addGrantLogo();
@@ -206,14 +151,47 @@ const init = () => {
   });
 };
 
-window.addEventListener('load', async() => {
-  if (!provider && !web3Modal.cachedProvider || provider === 'undefined') {
-    onConnect().then(() => {
-      init();
-    });
-  } else {
-    web3Modal.on('connect', async(data) => {
-      init();
-    });
+window.addEventListener('dataWalletReady', function(e) {
+  init();
+}, false);
+
+$(document).ready(function() {
+
+  $('.select2-selection__choice').removeAttr('title');
+
+});
+
+function saveGrant(grantData, isFinal) {
+  let csrftoken = $("#create-grant input[name='csrfmiddlewaretoken']").val();
+
+  $.ajax({
+    type: 'post',
+    url: '/grants/new',
+    processData: false,
+    contentType: false,
+    data: grantData,
+    headers: {'X-CSRFToken': csrftoken},
+    success: json => {
+      if (isFinal) {
+        if (json.url) {
+          document.suppress_loading_leave_code = true;
+          window.location = json.url;
+        } else {
+          console.error('Grant failed to save');
+        }
+      }
+    },
+    error: () => {
+      console.error('Grant failed to save');
+      _alert({ message: gettext('Your grant failed to save. Please try again.') }, 'error');
+    }
+  });
+}
+
+
+$('#new_button').on('click', function(e) {
+  if (!provider) {
+    e.preventDefault();
+    return onConnect().then(() => init());
   }
 });
diff --git a/app/assets/v2/js/pages/bulk_payout.js b/app/assets/v2/js/pages/bulk_payout.js
index 0f28a8f777d..6491fbbed45 100644
--- a/app/assets/v2/js/pages/bulk_payout.js
+++ b/app/assets/v2/js/pages/bulk_payout.js
@@ -11,6 +11,12 @@ const normalizeUsername = function(username) {
   return username;
 };
 
+needWalletConnection();
+
+window.addEventListener('dataWalletReady', function(e) {
+  update_registry(selectedAccount);
+}, false);
+
 $(document).ready(function($) {
 
   $(document).on('blur', '#amount', function(event) {
@@ -167,6 +173,11 @@ $(document).ready(function($) {
     getFulfillers();
     update_registry(selectedAccount);
 
+    if (!provider) {
+      onConnect();
+      return false;
+    }
+
     if (!$('#terms').is(':checked')) {
       _alert('Please accept the TOS.', 'error');
       return;
@@ -190,7 +201,6 @@ $(document).ready(function($) {
 
   $('document').ready(function() {
     add_row();
-    update_registry(selectedAccount);
 
     $('.add_another').on('click', function() {
       add_row();
diff --git a/app/assets/v2/js/pages/create_bounty/ETH.js b/app/assets/v2/js/pages/create_bounty/ETH.js
index 92ea0ae01d8..605d0c27a26 100644
--- a/app/assets/v2/js/pages/create_bounty/ETH.js
+++ b/app/assets/v2/js/pages/create_bounty/ETH.js
@@ -239,7 +239,7 @@ const ethCreateBounty = async (data) => {
   const checkTokenAllowance = async () => {
     let currentAllowance = await getAllowance(bounty_address(), tokenAddress);
 
-    if (currentAllowance < bigAmount) {
+    if (BigInt(currentAllowance) < BigInt(bigAmount)) {
       let approvedAllowance;
 
       approvedAllowance = await approveAllowance(
@@ -331,8 +331,8 @@ const ethCreateBounty = async (data) => {
     indicateMetamaskPopup();
     web3.eth.sendTransaction({
       to: '0x00De4B13153673BCAE2616b67bf822500d325Fc3',
-      from: web3.account,
-      value: web3.utils.toWei(ethFeaturedPrice, 'ether'),
+      from: selectedAccount,
+      value: web3.utils.toWei(String(ethFeaturedPrice), 'ether'),
       gas: web3.utils.toHex(318730),
       gasLimit: web3.utils.toHex(318730)
     },
@@ -365,12 +365,13 @@ const ethCreateBounty = async (data) => {
   if (check_balance_and_alert_user_if_not_enough(tokenAddress, amountNoDecimal)) {
     processBounty();
   } else {
-    return unloading_button($('.js-submit'));
+     unloading_button($('.js-submit'));
+     return false;
   }
 
   function check_balance_and_alert_user_if_not_enough(tokenAddress, amount, msg) {
     const token_contract = new web3.eth.Contract(token_abi, tokenAddress);
-    const from = account;
+    const from = selectedAccount;
     const token_details = tokenAddressToDetails(tokenAddress);
     const token_decimals = token_details['decimals'];
     const token_name = token_details['name'];
@@ -399,14 +400,14 @@ const ethCreateBounty = async (data) => {
     };
 
     if (tokenAddress == '0x0000000000000000000000000000000000000000') {
-      const walletBalance = Number(balance);
+      const walletBalance = web3.utils.fromWei(new web3.utils.BN(BigInt(balance)),'ether');
 
       return checkBalance(walletBalance, total, token_name);
 
     } else {
       token_contract.methods.balanceOf(from).call({from: from}, function(error, result) {
         if (error) return;
-        const walletBalance = Number(balance);
+        const walletBalance = web3.utils.fromWei(new web3.utils.BN(BigInt(result)),'ether')
 
         return checkBalance(walletBalance, total, token_name);
       });
diff --git a/app/assets/v2/js/pages/dashboard-hackathon.js b/app/assets/v2/js/pages/dashboard-hackathon.js
index dace643354b..8c5f06ef4d7 100644
--- a/app/assets/v2/js/pages/dashboard-hackathon.js
+++ b/app/assets/v2/js/pages/dashboard-hackathon.js
@@ -776,8 +776,8 @@
     });
 
     $(`
-    #sidebar_container input[type=radio], #sidebar_container input[type=checkbox],
-    #sidebar_container .js-select2, #orgs`).on('change', function(e) {
+      #sidebar_container input[type=radio], #sidebar_container input[type=checkbox],
+      #sidebar_container .js-select2, #orgs`).on('change', function(e) {
       reset_offset();
       refreshBounties(null, 0, false);
       e.preventDefault();
@@ -861,13 +861,15 @@
           });
         }
       },
-      data: () => ({
-        csrf: $("input[name='csrfmiddlewaretoken']").val(),
-        tribesData: {},
-        hackathonSponsors: document.hackathonSponsors
-      })
+      data: function() {
+        return {
+          csrf: $("input[name='csrfmiddlewaretoken']").val(),
+          tribesData: {},
+          hackathonSponsors: document.hackathonSponsors
+        };
+      }
     });
-    var app = new Vue({
+    window.hackathonApp = new Vue({
       delimiters: [ '[[', ']]' ],
       el: '#dashboard-vue-app',
       updated: () => {
diff --git a/app/assets/v2/js/pages/fulfill_bounty/index.js b/app/assets/v2/js/pages/fulfill_bounty/index.js
index 937f604d2fb..01a846823c0 100644
--- a/app/assets/v2/js/pages/fulfill_bounty/index.js
+++ b/app/assets/v2/js/pages/fulfill_bounty/index.js
@@ -1,4 +1,20 @@
 /* eslint-disable no-console */
+needWalletConnection();
+
+const fetchFromWeb3Wallet = () => {
+  if (!provider) {
+    onConnect();
+  }
+  $('#payoutAddress').val(selectedAccount);
+  $('#payoutAddress').attr('readonly', true);
+}
+
+window.addEventListener('dataWalletReady', function(e) {
+  if (is_bounties_network) {
+    fetchFromWeb3Wallet();
+  }
+}, false);
+
 window.onload = function() {
 
   $('.rating input:radio').attr('checked', false);
@@ -8,10 +24,6 @@ window.onload = function() {
     $(this).parent().addClass('checked');
   });
 
-  if (is_bounties_network) {
-    fetchFromWeb3Wallet();
-  }
-
   if (typeof localStorage['githubUsername'] != 'undefined') {
     if (!$('input[name=githubUsername]').val()) {
       $('input[name=githubUsername]').val(localStorage['githubUsername']);
@@ -39,9 +51,3 @@ window.onload = function() {
   });
 };
 
-const fetchFromWeb3Wallet = () => {
-  web3.eth.getAccounts(function(_, accounts) {
-    $('#payoutAddress').val(accounts[0]);
-    $('#payoutAddress').attr('readonly', true);
-  });
-}
diff --git a/app/assets/v2/js/pages/kudos_send.js b/app/assets/v2/js/pages/kudos_send.js
index 05d9bbe4647..4404b774e8e 100644
--- a/app/assets/v2/js/pages/kudos_send.js
+++ b/app/assets/v2/js/pages/kudos_send.js
@@ -213,6 +213,10 @@ $(document).ready(function() {
     e.preventDefault();
     set_metadata();
 
+    if (!provider) {
+      return onConnect();
+    }
+
     if (typeof web3 == 'undefined') {
       _alert({ message: gettext('You must have a web3 enabled browser to do this.  Please download Metamask.') }, 'warning');
       return;
diff --git a/app/assets/v2/js/pages/new_bounty.js b/app/assets/v2/js/pages/new_bounty.js
index 9802d25290b..803d3c0c632 100644
--- a/app/assets/v2/js/pages/new_bounty.js
+++ b/app/assets/v2/js/pages/new_bounty.js
@@ -3,6 +3,7 @@
 /* eslint-disable no-lonely-if */
 // document.web3network = 'mainnet';
 load_tokens();
+needWalletConnection();
 
 const qr_tokens = [ 'ETC', 'cGLD', 'cUSD', 'ZIL' ];
 const fiat_tokens = ['USD'];
@@ -38,7 +39,7 @@ const updateOnNetworkOrTokenChange = () => {
     }
 
   } else {
-    if (!provider && !web3Modal.cachedProvider || provider === 'undefined') {
+    if (!provider) {
       onConnect().then(()=> {
         changeUi();
       });
@@ -593,6 +594,11 @@ $('#submitBounty').validate({
     }
   },
   submitHandler: function(form) {
+    if (!provider) {
+      onConnect();
+      return false;
+    }
+
     if (typeof ga != 'undefined') {
       dataLayer.push({
         'event': 'new_bounty',
diff --git a/app/assets/v2/js/pages/process_bounty.js b/app/assets/v2/js/pages/process_bounty.js
index 976ebe2d60a..fa477d478d3 100644
--- a/app/assets/v2/js/pages/process_bounty.js
+++ b/app/assets/v2/js/pages/process_bounty.js
@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+needWalletConnection();
 window.onload = function() {
 
   const rateUser = () => {
@@ -163,6 +164,11 @@ window.onload = function() {
 
       var isError = false;
 
+      if (!provider) {
+        onConnect();
+        return false;
+      }
+
       if ($('#terms:checked').length == 0) {
         _alert({ message: gettext('Please accept the terms of service.') }, 'warning');
         isError = true;
diff --git a/app/assets/v2/js/vue-components.js b/app/assets/v2/js/vue-components.js
index b9e21ebe94a..aabe1d14529 100644
--- a/app/assets/v2/js/vue-components.js
+++ b/app/assets/v2/js/vue-components.js
@@ -163,8 +163,8 @@ Vue.component('tribes-settings', {
           modules: {
             toolbar: [
               [ 'bold', 'italic', 'underline' ],
-              [{ 'align': [] }],
-              [{ 'list': 'ordered'}, { 'list': 'bullet' }],
+              [{'align': []}],
+              [{'list': 'ordered'}, {'list': 'bullet'}],
               [ 'link', 'code-block' ],
               ['clean']
             ]
@@ -176,7 +176,7 @@ Vue.component('tribes-settings', {
           modules: {
             toolbar: [
               [ 'bold', 'italic', 'underline' ],
-              [{ 'align': [] }],
+              [{'align': []}],
               [ 'link', 'code-block' ],
               ['clean']
             ]
@@ -202,11 +202,10 @@ Vue.component('project-directory', {
       vm.noResults = false;
 
       if (newPage) {
+        vm.projectsHasNext = null;
         vm.projectsPage = newPage;
       }
 
-      vm.params.page = vm.projectsPage;
-
       if (vm.hackathonId) {
         vm.params.hackathon = hackathonId;
       }
@@ -223,12 +222,11 @@ Vue.component('project-directory', {
 
       const searchParams = new URLSearchParams(vm.params);
 
-      const apiUrlProjects = `/api/v0.1/projects_fetch/?${searchParams.toString()}`;
+      const apiUrlProjects = vm.projectsHasNext ? vm.projectsHasNext : `/api/v0.1/projects_fetch/?${searchParams.toString()}`;
 
       const getProjects = fetchData(apiUrlProjects, 'GET');
 
       $.when(getProjects).then(function(response) {
-        vm.hackathonProjects = [];
         response.results.forEach(function(item) {
           vm.hackathonProjects.push(item);
         });
@@ -236,21 +234,14 @@ Vue.component('project-directory', {
         vm.userProjects = [];
         if (vm.userId) {
           vm.userProjects = vm.hackathonProjects.filter(
-            ({ profiles }) => profiles.some(
-              ({ id }) => id === parseInt(vm.userId, 10)
+            ({profiles}) => profiles.some(
+              ({id}) => id === parseInt(vm.userId, 10)
             )
           );
         }
-        vm.projectsNumPages = response.count;
         vm.projectsHasNext = response.next;
 
         vm.numProjects = response.count;
-        if (vm.projectsHasNext) {
-          vm.projectsPage = ++vm.projectsPage;
-
-        } else {
-          vm.projectsPage = 1;
-        }
 
         if (vm.hackathonProjects.length) {
           vm.noResults = false;
@@ -267,6 +258,20 @@ Vue.component('project-directory', {
 
       vm.fetchProjects(1);
 
+    },
+    bottomVisible: function() { // TODO: abstract this to the mixin, and have it take a callback which modifies the component state.
+      let vm = this;
+
+      const scrollY = window.scrollY;
+      const visible = document.documentElement.clientHeight;
+      const pageHeight = document.documentElement.scrollHeight - 500;
+      const bottomOfPage = visible + scrollY >= pageHeight;
+
+      if (!vm.isLoading && (bottomOfPage || pageHeight < visible)) {
+        if (vm.projectsHasNext) {
+          vm.fetchProjects();
+        }
+      }
     }
   },
   data: function() {
@@ -279,8 +284,7 @@ Vue.component('project-directory', {
       userProjects: document.userProjects || [],
       projectsPage: 1,
       hackathonId: document.hackathon_id || null,
-      projectsNumPages: 0,
-      projectsHasNext: false,
+      projectsHasNext: null,
       numProjects: 0,
       media_url,
       searchTerm: null,
@@ -321,21 +325,6 @@ Vue.component('project-directory', {
     window.removeEventListener('scroll', () => {
       this.bottom = this.bottomVisible();
     });
-  },
-  bottomVisible: function() { // TODO: abstract this to the mixin, and have it take a callback which modifies the component state.
-    let vm = this;
-
-    const scrollY = window.scrollY;
-    const visible = document.documentElement.clientHeight;
-    const pageHeight = document.documentElement.scrollHeight - 500;
-    const bottomOfPage = visible + scrollY >= pageHeight;
-
-    if (bottomOfPage || pageHeight < visible) {
-      if (vm.projectsHasNext) {
-        vm.projectsHasNext = false;
-        vm.fetchProjects();
-      }
-    }
   }
 });
 
@@ -352,7 +341,10 @@ Vue.component('project-card', {
       let vm = this;
 
       const url = '/api/v0.1/hackathon_project/set_winner/';
-      const markWinner = fetchData(url, 'POST', {project_id: project.pk, winner: $event ? 1 : 0}, {'X-CSRFToken': vm.csrf});
+      const markWinner = fetchData(url, 'POST', {
+        project_id: project.pk,
+        winner: $event ? 1 : 0
+      }, {'X-CSRFToken': vm.csrf});
 
       $.when(markWinner).then(response => {
         if (response.message) {
diff --git a/app/assets/v2/js/wallet.js b/app/assets/v2/js/wallet.js
index 628cc0bbb43..8b4dba095ab 100644
--- a/app/assets/v2/js/wallet.js
+++ b/app/assets/v2/js/wallet.js
@@ -1,6 +1,9 @@
 const Web3Modal = window.Web3Modal.default;
 const WalletConnectProvider = window.WalletConnectProvider.default;
+const eventWalletReady = new Event('walletReady', {bubbles: true});
+const eventDataWalletReady = new Event('dataWalletReady', {bubbles: true});
 
+let web3;
 let web3Modal;
 let provider;
 let selectedAccount;
@@ -43,6 +46,7 @@ function initWallet() {
     cacheProvider: true,
     providerOptions
   });
+  document.dispatchEvent(eventWalletReady);
 }
 
 function walletStateChanges() {
@@ -52,15 +56,18 @@ function walletStateChanges() {
 }
 
 const needWalletConnection = async() => {
-  if (!web3Modal.cachedProvider) {
-    return await onConnect();
-  }
+  window.addEventListener('walletReady', async function(e) {
+    if (!web3Modal || !web3Modal.cachedProvider) {
+      return await onConnect().then(console.log);
+    }
+  }, false);
 };
 
 async function fetchAccountData(provider) {
 
   // Get a Web3 instance for the wallet
-  web3 = new Web3(provider);
+  // web3 = new Web3(provider);
+  web3 = Web3 ? new Web3(provider || 'ws://localhost:8546') : null;
 
   console.log('Web3 instance is', web3);
 
@@ -165,6 +172,7 @@ async function fetchAccountData(provider) {
   // document.querySelector("#connected").style.display = "block";
   walletStateChanges();
   $('.wallet-option').on('click', changeWallet);
+  document.dispatchEvent(eventDataWalletReady);
 }
 
 function changeWallet(e) {
@@ -211,7 +219,8 @@ async function onConnect() {
   // regardless if we play around with a cacheProvider settings
   // in our localhost.
   // TODO: A clean API needed here
-  web3Modal.providerController.cachedProvider = null;
+  // web3Modal.providerController.cachedProvider = null;
+  web3Modal.clearCachedProvider();
   // web3Modal.clearCachedProvider();
 
   console.log('Opening a dialog', web3Modal);
diff --git a/app/dashboard/management/commands/cleanup_db_space.py b/app/dashboard/management/commands/cleanup_db_space.py
index 2331e7168f3..53066741c9c 100644
--- a/app/dashboard/management/commands/cleanup_db_space.py
+++ b/app/dashboard/management/commands/cleanup_db_space.py
@@ -48,6 +48,8 @@ def handle(self, *args, **options):
             ).exclude(
                 from_currency='USDT',
                 to_currency='ETH'
+            ).exclude(
+                source='manual',
             ).delete()
         print(f'ConversionRate: {result}')
 
diff --git a/app/dashboard/management/commands/grant_txn_failed_email.py b/app/dashboard/management/commands/grant_txn_failed_email.py
new file mode 100644
index 00000000000..cea356c3898
--- /dev/null
+++ b/app/dashboard/management/commands/grant_txn_failed_email.py
@@ -0,0 +1,32 @@
+'''
+    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/>.
+'''
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+from grants.models import Contribution
+from marketing.mails import grant_txn_failed
+
+
+class Command(BaseCommand):
+    help = 'sends emails for grant contributors whose contribution txns have failed'
+
+    def handle(self, *args, **options):
+        if settings.DEBUG:
+            print("not active in non prod environments")
+            return
+
+        failed_contribs = Contribution.objects.exclude(validator_passed=True)
+
+        for failed_contrib in failed_contribs:
+            grant_txn_failed(failed_contrib.subscription.contributor_profile, failed_contrib.subscription.grant, failed_contrib.tx_id)
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index c38a9e2ad24..127bab1120c 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2896,6 +2896,12 @@ def get_org_kudos(self):
             return Token.objects.none()
         return Token.objects.filter(Q(name__icontains=self.name)|Q(name__icontains=self.handle)).filter(cloned_from_id=F('token_id')).visible()
 
+    @property
+    def kudos_authored(self):
+        from kudos.models import Token
+        return Token.objects.filter(artist=self.handle)
+
+
     @property
     def get_my_kudos(self):
         from kudos.models import KudosTransfer
diff --git a/app/dashboard/router.py b/app/dashboard/router.py
index 8f01bbf9339..e15eb6ce63e 100644
--- a/app/dashboard/router.py
+++ b/app/dashboard/router.py
@@ -233,7 +233,7 @@ def get_queryset(self):
                 hackathon_event = HackathonEvent.objects.last()
 
             queryset = HackathonProject.objects.filter(hackathon=hackathon_event).exclude(
-                status='invalid').prefetch_related('profiles', 'bounty').order_by(order_by, 'id')
+                status='invalid').prefetch_related('profiles', 'bounty').order_by('-winner', order_by, 'id')
 
             if sponsor:
                 queryset = queryset.filter(
@@ -242,7 +242,7 @@ def get_queryset(self):
         elif sponsor:
             queryset = HackathonProject.objects.filter(Q(hackathon__sponsor_profiles__handle__iexact=sponsor) | Q(
                 bounty__bounty_owner_github_username=sponsor)).exclude(
-                status='invalid').prefetch_related('profiles', 'bounty').order_by(order_by, 'id')
+                status='invalid').prefetch_related('profiles', 'bounty').order_by('-winner', order_by, 'id')
 
         if q:
             queryset = queryset.filter(
diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 60f9b878e47..2e50084b044 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -215,8 +215,7 @@ <h1 class="font-title font-weight-semibold">Hackathon Coming Soon!</h1>
                   </template>
                   <project-directory inline-template user-id={{ user.profile.id | safe }}>
                     <div class="ml-4">
-                      <loading-screen v-if="isLoading"></loading-screen>
-                      <div v-if="!isLoading" class="sidebar-container flex-column flex-lg-row">
+                      <div class="sidebar-container flex-column flex-lg-row">
                         <transition name="fade">
                           <nav v-show="showFilters" class="sidebar flex-fill pr-4" role="navigation">
                             <div class="pb-4 border-bottom form-group">
@@ -293,6 +292,7 @@ <h1 class="font-title title ml-2 mt-4">
                         <div class="project-grid ml-2">
                           <project-card {% if is_staff %} v-bind:is_staff="true" {% endif %} v-for="project in hackathonProjects" v-bind:project="project" :key="project.id"/>
                         </div>
+                          <loading-screen v-if="isLoading"></loading-screen>
                       </div>
                     </div>
                       </div>
diff --git a/app/dashboard/templates/onepager/base.html b/app/dashboard/templates/onepager/base.html
index 4c3b26965aa..1699c191451 100644
--- a/app/dashboard/templates/onepager/base.html
+++ b/app/dashboard/templates/onepager/base.html
@@ -90,6 +90,7 @@
     {% block 'scripts' %}{% endblock %}
 
     <script>
+      needWalletConnection();
       if ('addEventListener' in window) {
         window.addEventListener('load', function () {
           document.body.className = document.body.className.replace(/\bis-loading\b/, '');
diff --git a/app/dashboard/templates/profiles/scorecard_hunter.html b/app/dashboard/templates/profiles/scorecard_hunter.html
index 3a0c5cf3bcf..7921c2c8824 100644
--- a/app/dashboard/templates/profiles/scorecard_hunter.html
+++ b/app/dashboard/templates/profiles/scorecard_hunter.html
@@ -46,6 +46,10 @@
                 - <b>{{ total_kudos_received_count }}</b>
                 Kudo{{total_kudos_received_count|pluralize}} received
               </li>
+              <li>
+                - <b>{{profile.kudos_authored.count}}</b>
+                Kudos authored
+              </li>
               <li>
                 - <b>{{ total_grant_created }}</b>
                 Grant{{total_grant_created|pluralize}} created
diff --git a/app/dashboard/templates/shared/profile_kudos.html b/app/dashboard/templates/shared/profile_kudos.html
index e162afba85f..4c65e254ce4 100644
--- a/app/dashboard/templates/shared/profile_kudos.html
+++ b/app/dashboard/templates/shared/profile_kudos.html
@@ -16,6 +16,26 @@
 {% endcomment %}
 {% load i18n static kudos_extras %}
 
+{% if profile.kudos_authored.count %}
+<div>
+
+  <h3>
+    Author of {{profile.kudos_authored.count}} Kudos
+  </h3>
+  <p>
+    <a href="/kudos/marketplace?q={{profile.handle}}">
+      <hr>
+      {% for token in profile.kudos_authored %}
+        <img src="{{token.preview_img_url}}" style="width: 100px; height: 100px;">
+      {% endfor %}
+      <br>
+      Click here to see the Kudos that @{{profile.handle}} has authored.
+    </a>
+  </p>
+
+</div>
+{% endif %}
+
 <ul class="nav nav-tabs my-5" id="myTab" role="tablist">
   <li class="nav-item">
     <a class="nav-link nav-line active" id="mykudos-tab" data-toggle="tab" href="#mykudos" role="tab" aria-controls="mykudos" aria-selected="true">{% if request.path == '/profile/' %}{% trans "Your Kudos" %}{% else %}{% trans "Kudos" %}{% endif %} ({{ kudos_count }})</a>
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index edffdcfd313..f1c4bd07404 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -924,7 +924,7 @@ def set_project_winner(request):
         return JsonResponse({
             'message': 'Invalid Project'
         })
-    project = HackathonProject.objects.get(pk=project_id).prefetch_related('bounty')
+    project = HackathonProject.objects.get(pk=project_id)
 
     if not request.user.is_authenticated and (request.user.is_staff or request.user.profile.handle == project.bounty.bounty_owner_github_username):
         return JsonResponse({
diff --git a/app/economy/models.py b/app/economy/models.py
index 810c27dc71b..54dfecfa9e1 100644
--- a/app/economy/models.py
+++ b/app/economy/models.py
@@ -167,11 +167,16 @@ def get_view_count(self):
 
 class ConversionRate(SuperModel):
     """Define the conversion rate model."""
-
+    SOURCE_TYPES = [
+        ('cryptocompare', 'cryptocompare'),
+        ('poloniex', 'poloniex'),
+        ('uniswap', 'uniswap'),
+        ('manual', 'manual'),
+    ]
     from_amount = models.FloatField()
     to_amount = models.FloatField()
     timestamp = models.DateTimeField(null=False, default=get_time, db_index=True)
-    source = models.CharField(max_length=30, db_index=True)
+    source = models.CharField(max_length=30, db_index=True, choices=SOURCE_TYPES)
     from_currency = models.CharField(max_length=30, db_index=True)
     to_currency = models.CharField(max_length=30, db_index=True)
 
diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index ee3b29e9409..59e1bcdfc7b 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -132,7 +132,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                       {% comment %} Grant amount and curency {% endcomment %}
                       <div class="col-12" style="margin-top:1rem;">
                         <div class="row flex-nowrap justify-content-between">
-                          <input class="col-5 form-control" style="margin-left:0.5rem" min="0"
+                          <input class="col-5 form-control" style="margin-left:0.5rem" min="0" step="any"
                             v-model="grant.grant_donation_amount" type="number" placeholder="Amount">
                           <select2 v-model="grant.grant_donation_currency" class="col-6 form-control"
                             style="margin-right:0.5rem" placeholder="Select token">
@@ -204,7 +204,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                     {% comment %} Grant amount and currency {% endcomment %}
                     <div class="col-3">
                       <div class="row flex-nowrap align-items-center justify-content-start">
-                        <input class="col-6 form-control" v-model="grant.grant_donation_amount" type="number" min="0"
+                        <input class="col-6 form-control" v-model="grant.grant_donation_amount" type="number" min="0" step="any"
                           placeholder="Amount" style="margin-right: 1rem">
                         <select2 v-model="grant.grant_donation_currency" class="col-6 form-control"
                           placeholder="Select token">
@@ -340,7 +340,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                         <div v-if="adjustGitcoinFactor"
                           class="col-12 col-xl-4 mt-4 my-xl-auto px-xl-0 font-weight-semibold text-center text-xl-left fee-slider-summary">
                           <div class="text-center custom d-inline-block">
-                            <input type="number" min="0" max="99" id="gitcoin-grant-input-amount"
+                            <input type="number" min="0" max="99" step="any" id="gitcoin-grant-input-amount"
                               name="gitcoin-grant-input-amount" class="form__input text-center"
                               :class="{inactive: [5,10,15].includes(gitcoinFactorRaw)}" value="5"
                               v-model="gitcoinFactorRaw">
diff --git a/app/grants/templates/grants/detail/index.html b/app/grants/templates/grants/detail/index.html
index 790b2e94924..478b3fe72b0 100644
--- a/app/grants/templates/grants/detail/index.html
+++ b/app/grants/templates/grants/detail/index.html
@@ -82,7 +82,6 @@
   <link rel="stylesheet" href="{% static "v2/css/activity_stream.css" %}">
   <script src="{% static "v2/js/status.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>
-  <script src="{% static "v2/js/tokens.js" %}"></script>
   <script src="{% static "v2/js/pages/tabs.js" %}"></script>
   <script src="{% static "v2/js/grants/index.js" %}"></script>
   <script src="{% static "v2/js/grants/funding.js" %}"></script>
diff --git a/app/grants/templates/grants/detail/info.html b/app/grants/templates/grants/detail/info.html
index c5db0a7deac..8abcf78350f 100644
--- a/app/grants/templates/grants/detail/info.html
+++ b/app/grants/templates/grants/detail/info.html
@@ -69,10 +69,10 @@ <h1 class="font-title-xl my-4 font-weight-bold">
           {{ grant.title }}
         {% endif %}
       </h1>
-  
+
        <!-- SUMMARY INFO -->
       <div class="summary-info mb-0 pb-1">
-  
+
         {% if grant.hidden and not grant.link_to_new_grant %}
           <div class="mb-2 font-smaller-2">
             <i style="width: 14px; top:0.6rem" class="mb-2 mb-md-0 fas fa-eye-slash mr-2 text-center position-relative"></i>
@@ -81,8 +81,8 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
-  
+
+
         <div class="font-body mb-2">
           {% if is_team_member %}
             <textarea id="form--input__reference-url" class="p-0 m-0 inline-edit" disabled>{{ grant.reference_url }}</textarea>
@@ -101,7 +101,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
           </p>
         </div>
       {% endif %}
-  
+
         <div class="mb-2">
           <i style="width: 14px;" class="fab fa-ethereum mr-2 text-center"></i>
           <a id="wallet-address" class="wallet-address"
@@ -109,7 +109,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             {{ grant.admin_address }}
           </a>
         </div>
-  
+
         {% if is_unsubscribed_from_updates_from_this_grant %}
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-comment-slash mr-2 text-center"></i>
@@ -117,12 +117,12 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
+
         {% if grant.link_to_new_grant %}
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-times mr-2 text-center"></i>
             <p class="d-inline-block mb-0" data-toggle="tooltip" data-placement="top" title="The grant owner has migrated to a new grant. Click below to visit new grant and fund">
-              Not accepting contributions as a new grant was created to replace this one by the owner

+              Not accepting contributions as a new grant was created to replace this one by the owner
             </p>
           </div>
         {% elif grant.token_symbol %}
@@ -141,7 +141,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
+
         {% if user_non_errored_subscription %}
           <div class="font-body mb-2">
             <i style="width: 14px;" class="fas fa-info-circle mr-2 text-center"></i>
@@ -152,7 +152,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
             </p>
           </div>
         {% endif %}
-  
+
       </div>
     </div>
   </div>
diff --git a/app/grants/templates/grants/shared/shared_scripts.html b/app/grants/templates/grants/shared/shared_scripts.html
index 51387c191aa..9a5da6974a8 100644
--- a/app/grants/templates/grants/shared/shared_scripts.html
+++ b/app/grants/templates/grants/shared/shared_scripts.html
@@ -20,5 +20,5 @@
 
 <script src="{% static "v2/js/lib/web3.min.js" %}"></script>
 <script>
-  var web3 = Web3 ? new Web3(Web3.givenProvider || "ws://localhost:8546") : null;
+  // var web3 = Web3 ? new Web3(Web3.givenProvider || "ws://localhost:8546") : null;
 </script>
diff --git a/app/kudos/admin.py b/app/kudos/admin.py
index 7d4e8ff29c1..b5bc0918864 100644
--- a/app/kudos/admin.py
+++ b/app/kudos/admin.py
@@ -47,13 +47,15 @@ def response_change(self, request, obj):
             notify_kudos_rejected(obj)
             self.message_user(request, f"Notified user of rejection")
             return redirect('/_administrationkudos/tokenrequest/?approved=f&rejection_reason=')
-        if "_change_owner" in request.POST:
+        if "_change_owner" in request.POST or request.POST.get('_change_owner_mint_kudos', False):
             obj.to_address = '0x6239FF1040E412491557a7a02b2CBcC5aE85dc8F'
             obj.save()
             self.message_user(request, f"Changed owner to gitcoin")
-        if "_mint_kudos" in request.POST:
+        if "_mint_kudos" in request.POST or request.POST.get('_change_owner_mint_kudos', False):
             from kudos.tasks import mint_token_request
             try:
+                obj.rejection_reason = 'n/a'
+                obj.save()
                 mint_token_request.delay(obj.id)
                 self.message_user(request, f"Mint/sync submitted to chain")
             except Exception as e:
diff --git a/app/kudos/migrations/0017_token_metadata.py b/app/kudos/migrations/0017_token_metadata.py
new file mode 100644
index 00000000000..bf7aaf82454
--- /dev/null
+++ b/app/kudos/migrations/0017_token_metadata.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2020-06-24 20:37
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kudos', '0016_auto_20200605_1302'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='token',
+            name='metadata',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
+        ),
+    ]
diff --git a/app/kudos/models.py b/app/kudos/models.py
index 8722fad0e38..5e0b717e42b 100644
--- a/app/kudos/models.py
+++ b/app/kudos/models.py
@@ -64,6 +64,7 @@ def keyword(self, keyword):
         return self.filter(
             Q(name__icontains=keyword) |
             Q(description__icontains=keyword) |
+            Q(artist__icontains=keyword) |
             Q(tags__icontains=keyword)
         )
 
@@ -125,6 +126,7 @@ class Meta:
     platform = models.CharField(max_length=255, null=True, blank=True)
     external_url = models.CharField(max_length=255, null=True)
     background_color = models.CharField(max_length=255, null=True)
+    metadata = JSONField(default=dict, blank=True)
 
     # Extra fields added to database (not on blockchain)
     owner_address = models.CharField(max_length=255)
@@ -148,6 +150,16 @@ def save(self, *args, **kwargs):
 
         super().save(*args, **kwargs)
 
+    @property
+    def artist_count(self):
+        return self.artist_others.count()
+
+    @property
+    def artist_others(self):
+        if not self.artist:
+            return Token.objects.none()
+        return Token.objects.filter(artist=self.artist)
+
     @property
     def static_image(self):
         if 'v2' in self.image:
diff --git a/app/kudos/templates/kudos_details.html b/app/kudos/templates/kudos_details.html
index 8107299b13a..466276dc91d 100644
--- a/app/kudos/templates/kudos_details.html
+++ b/app/kudos/templates/kudos_details.html
@@ -46,6 +46,9 @@
           {% endif %}
           <h3 id="kudosName" class="kudos-details__title">{{ kudos.ui_name }} {% if kudos.generation %}<small class="lead">Gen {{ kudos.generation }}</small>{% endif %}</h3>
           <div>Owner Address: <a target="_blank" href="https://etherscan.io/address/{{ kudos.owner_address }}" class="kudos-details__address" title="{{ kudos.owner_address }}">{{ kudos.owner_address|humanize_address }}</a></div>
+          {% if kudos.artist %}
+            <div>Artist: <img style="width: 30px; height: 30px;" src="/dynamic/avatar/{{kudos.artist}}" > <a href="/profile/{{kudos.artist}}/kudos" class="kudos-details__address" title="@{{ kudos.artist }} has this kudos on {{kudos.created_on}}">{{kudos.artist}}</a> | <a href="/kudos/marketplace?q={{kudos.artist}}">View all {{kudos.artist_count}} Kudos by @{{kudos.artist}}</a></div>
+          {% endif %}
           {% if kudos.quests_reward.count %}
             Reward for beating
             {% for quest in reward_for %}
diff --git a/app/kudos/templates/kudos_marketplace.html b/app/kudos/templates/kudos_marketplace.html
index 878aaef87cf..fdd94d9fe0f 100644
--- a/app/kudos/templates/kudos_marketplace.html
+++ b/app/kudos/templates/kudos_marketplace.html
@@ -89,7 +89,7 @@ <h1>UH-OH!</h1>
 
       {% if listings %}
       <div class="col-xs-12 col-sm-6 col-lg-3 mb-3">
-        <a href="https://github.com/gitcoinco/kudosbadges/issues/new" target="_blank" class="cta-square kd-shadow">
+        <a href="/kudos/new" target="_blank" class="cta-square kd-shadow">
           <div>
             <span>{% trans "Don’t See One You Like?" %}</span>
             <small>{% trans "Mint Your Own!" %}</small>
diff --git a/app/kudos/templates/shared/kudos_card.html b/app/kudos/templates/shared/kudos_card.html
index c0bf150ab34..c84112c2e1b 100644
--- a/app/kudos/templates/shared/kudos_card.html
+++ b/app/kudos/templates/shared/kudos_card.html
@@ -21,5 +21,11 @@
     <img id="kudosImage" src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 3 2'%3E%3C/svg%3E" data-src="{{listing.preview_img_url}}" alt="{{ listing.name }}" class="img-thumbnail kd-shadow border-transparent" loading="lazy" width="250" style="min-height: 200px;">
   </a>
   <span class="kd-price">{{ listing.price_in_eth }} ETH</span>
-  <div class="kd-name text-truncate" title="{{ listing.ui_name }}">{{ listing.ui_name }}</div>
+  <div class="kd-name text-truncate" title="{{ listing.ui_name }}">{{ listing.ui_name }}
+  {% if listing.artist %}
+  by <img loading="lazy" style="width: 30px; height: 30px;" data-src="/dynamic/avatar/{{listing.artist}}" > <a href="/profile/{{listing.artist}}/kudos" class="kudos-details__address" title="@{{ listing.artist }} has this kudos on {{listing.created_on}}">@{{listing.artist}}</a>
+  
+  {% endif %}
+  </div>
+
 </div>
diff --git a/app/kudos/templates/transaction/base.html b/app/kudos/templates/transaction/base.html
index ba010747e0c..fad3fabd67b 100644
--- a/app/kudos/templates/transaction/base.html
+++ b/app/kudos/templates/transaction/base.html
@@ -50,6 +50,7 @@
     {% include 'shared/footer_scripts.html' with slim=1 %}
     {% block 'scripts' %}{% endblock %}
     <script>
+      needWalletConnection();
       if ('addEventListener' in window) {
         window.addEventListener('load', function () {
           document.body.className = document.body.className.replace(/\bis-loading\b/, '');
diff --git a/app/kudos/utils.py b/app/kudos/utils.py
index 4f02b64dff0..9b240c4d0ff 100644
--- a/app/kudos/utils.py
+++ b/app/kudos/utils.py
@@ -201,6 +201,7 @@ def get_kudos_map(kudos, metadata):
                 mapping['platform'] = attrib['value']
 
         mapping['tags'] = ', '.join(tags)
+        mapping['metadata'] = metadata
 
         # Add the rest of the fields
         kudos_map = {**mapping, **metadata}
diff --git a/app/marketing/mails.py b/app/marketing/mails.py
index 0048a442891..23c591fa81d 100644
--- a/app/marketing/mails.py
+++ b/app/marketing/mails.py
@@ -36,7 +36,7 @@
     render_bounty_expire_warning, render_bounty_feedback, render_bounty_request, render_bounty_startwork_expire_warning,
     render_bounty_unintersted, render_comment, render_faucet_rejected, render_faucet_request,
     render_featured_funded_bounty, render_funder_payout_reminder, render_funder_stale, render_gdpr_reconsent,
-    render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute, render_grant_update,
+    render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute, render_grant_txn_failed, render_grant_update,
     render_kudos_email, render_match_distribution, render_match_email, render_mention, render_new_bounty,
     render_new_bounty_acceptance, render_new_bounty_rejection, render_new_bounty_roundup, render_new_grant_email,
     render_new_supporter_email, render_new_work_submission, render_no_applicant_reminder, render_nth_day_email_campaign,
@@ -288,6 +288,25 @@ def grant_cancellation(grant, subscription):
     finally:
         translation.activate(cur_language)
 
+def grant_txn_failed(profile, grant, tx_id):
+    from_email = settings.CONTACT_EMAIL
+    to_email = profile.email
+    if not to_email:
+        if profile and profile.user:
+            to_email = profile.user.email
+    if not to_email:
+        return
+
+    cur_language = translation.get_language()
+
+    subject = f"Your Grant transaction failed. Wanna try again?"
+
+    try:
+        setup_lang(to_email)
+        html, text = render_grant_txn_failed(to_email, grant, tx_id)
+        send_mail(from_email, to_email, subject, text, html, categories=['transactional', func_name()])
+    finally:
+        translation.activate(cur_language)
 
 def subscription_terminated(grant, subscription):
     if subscription and subscription.negative:
diff --git a/app/quests/templates/quests/base.html b/app/quests/templates/quests/base.html
index ec07a339914..cccf0cdf877 100644
--- a/app/quests/templates/quests/base.html
+++ b/app/quests/templates/quests/base.html
@@ -45,9 +45,9 @@
         {% endblock %}
       </div>
     </div>
+    {% include 'shared/footer.html' with prefix="data-" %}
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
-    {% include 'shared/footer.html' with prefix="data-" %}
 
   </body>
   {% csrf_token %}
diff --git a/app/quests/templates/quests/index.html b/app/quests/templates/quests/index.html
index ae5ac9e0c4c..b10952b3583 100644
--- a/app/quests/templates/quests/index.html
+++ b/app/quests/templates/quests/index.html
@@ -581,7 +581,6 @@ <h4 class="pt-0">Play Gitcoin Quests Now.</h4>
 {% block 'scripts' %}
 <script src="{% static "v2/js/lib/jquery-unveil.js" %}"></script>
 <script src="{% static "v2/js/pages/quests.index.js" %}"></script>
-<script src="{% static "v2/js/user_card.js" %}"></script>
 <script>
   $(document).ready(function() {
     setInterval(function(){
diff --git a/app/retail/emails.py b/app/retail/emails.py
index 0677cfdf685..6fb6d2eae7d 100644
--- a/app/retail/emails.py
+++ b/app/retail/emails.py
@@ -69,6 +69,7 @@
     ('comment', _('Comment Emails'), _('Only when you are sent a comment')),
     ('wall_post', _('Wall Post Emails'), _('Only when someone writes on your wall')),
     ('grant_updates', _('Grant Update Emails'), _('Updates from Grant Owners about grants you\'ve funded.')),
+    ('grant_txn_failed', _('Grant Transaction Failed Emails'), _('Notifies Grant contributors when their contribution txn has failed.')),
 ]
 
 
@@ -889,6 +890,24 @@ def render_grant_recontribute(to_email, prev_round_start=(2020, 3, 23), prev_rou
 
     return response_html, response_txt
 
+def render_grant_txn_failed(to_email, grant, tx_id):
+    email_style = 27
+
+    params = {
+        'id': grant.id,
+        'grant_title': grant.title,
+        'tx_id': tx_id,
+        'tx_url': "https://etherscan.io/tx/"+tx_id,
+        'bulk_add_url': "https://gitcoin.co/grants/cart/bulk-add/" + str(grant.id),
+        'email_style': email_style,
+        'hide_bottom_logo': True,
+    }
+
+    response_html = premailer_transform(render_to_string("emails/grant_txn_failed.html", params))
+    response_txt = render_to_string("emails/grant_txn_failed.txt", params)
+
+    return response_html, response_txt
+
 def render_wallpost(to_email, activity):
     params = {
         'activity': activity,
@@ -1377,6 +1396,11 @@ def grant_update(request):
 def grant_recontribute(request):
     response_html, _ = render_grant_recontribute(settings.CONTACT_EMAIL)
     return HttpResponse(response_html)
+    
+def grant_txn_failed(request):
+    failed_contrib = Contribution.objects.filter(subscription__contributor_profile__user__email=settings.CONTACT_EMAIL).exclude(validator_passed=True).first()
+    response_html, _ = render_grant_txn_failed(settings.CONTACT_EMAIL, failed_contrib.subscription.grant, failed_contrib.tx_id)
+    return HttpResponse(response_html)
 
 @staff_member_required
 def wallpost(request):
diff --git a/app/retail/templates/emails/grant_txn_failed.html b/app/retail/templates/emails/grant_txn_failed.html
new file mode 100644
index 00000000000..be3b3d837c5
--- /dev/null
+++ b/app/retail/templates/emails/grant_txn_failed.html
@@ -0,0 +1,59 @@
+{% extends 'emails/template.html' %}
+{% comment %}
+  Copyright (C) 2018 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 humanize %}
+
+{% block content %}
+
+<style>
+  .etherscan-link {
+    display: inline-block;
+    font-family: 'Muli', sans-serif;
+    color: #3E00FF;
+  }
+
+  .grant-txn-msg, .grant-txn-id {
+    margin: 0 auto;
+  }
+
+  .grant-txn-id a {
+    overflow-wrap: break-word;
+  }
+</style>
+
+<h1>Grants transaction failed, try again?</h1>
+
+<div class="grant-txn-msg">
+  <p>
+    Your contribution to <b>{{ grant_title }}</b> failed due to a technical issue.
+  </p>
+</div>
+
+<div class="grant-txn-id">
+  <p>
+    Transaction ID: <br>
+    <a href="{{ tx_url }}">{{ tx_id }}</a>
+  </p>
+</div>
+
+<div style="margin-bottom: 3em; margin-top: 3em;">
+  <a class="button" href="{{ bulk_add_url }}">{% trans "Resubmit Transaction" %}</a>
+  <br>
+  <a class="etherscan-link" href="{{ tx_url }}">View on Etherscan</a>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/retail/templates/emails/grant_txn_failed.txt b/app/retail/templates/emails/grant_txn_failed.txt
new file mode 100644
index 00000000000..8a0f1241089
--- /dev/null
+++ b/app/retail/templates/emails/grant_txn_failed.txt
@@ -0,0 +1,7 @@
+Grants transaction failed, try again?
+
+    Your contribution to {{ grant_title }} failed due to a technical issue.
+
+    Transaction ID: {{ tx_id }}
+
+  View on Etherscan
\ No newline at end of file
diff --git a/app/retail/templates/emails/template.html b/app/retail/templates/emails/template.html
index fb85fb71768..78288e1f1f7 100644
--- a/app/retail/templates/emails/template.html
+++ b/app/retail/templates/emails/template.html
@@ -323,6 +323,18 @@
     }
   }
   
+  @media (min-width: 768px) {
+    .grant-txn-msg {
+      width: 70%;
+    }
+  }
+
+  @media (min-width: 1200px) {
+    .grant-txn-msg {
+      width: 60%;
+    }
+  }
+  
   /* Bootstrap styles used for activities -- START */
   
     *,
diff --git a/app/retail/templates/shared/footer_scripts.html b/app/retail/templates/shared/footer_scripts.html
index f3efb56c5dd..3985d5a7d5c 100644
--- a/app/retail/templates/shared/footer_scripts.html
+++ b/app/retail/templates/shared/footer_scripts.html
@@ -43,7 +43,8 @@
   $.fn.bootstrapModal = bootstrapModal;
 
 </script>
-<script src="{% static "v2/js/lib/web3modal.min.js" %}"></script>
+<!-- <script src="{% static "v2/js/lib/web3modal.min.js" %}"></script> -->
+<script src="https://unpkg.com/web3modal"></script>
 <script src="https://cdn.jsdelivr.net/npm/authereum@latest/authereum.js"></script>
 <script src="{% static "v2/js/lib/fortmatic.js" %}"></script>
 <script src="{% static "v2/js/lib/walletconnect-v1.0.0-beta-47.js" %}"></script>
diff --git a/app/retail/templates/shared/footer_scripts_lite.html b/app/retail/templates/shared/footer_scripts_lite.html
index e5b26e6a9fb..05cd11175a1 100644
--- a/app/retail/templates/shared/footer_scripts_lite.html
+++ b/app/retail/templates/shared/footer_scripts_lite.html
@@ -41,7 +41,9 @@
   const bootstrapTooltip = $.fn.tooltip.noConflict()
   $.fn.bootstrapTooltip = bootstrapTooltip;
 </script>
-<script src="{% static "v2/js/lib/web3modal.min.js" %}"></script>
+<!-- <script src="{% static "v2/js/lib/web3modal.min.js" %}"></script> -->
+<script src="https://unpkg.com/web3modal"></script>
+
 <script src="https://cdn.jsdelivr.net/npm/authereum@latest/authereum.js"></script>
 <script src="{% static "v2/js/lib/fortmatic.js" %}"></script>
 <script src="{% static "v2/js/lib/walletconnect-v1.0.0-beta-47.js" %}"></script>
diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index c0df4ce18ed..53b6cc05a68 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -16,11 +16,11 @@
 
 {% endcomment %}
 {% load i18n static %}
-    <div class="modal" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" style="background-color: #eee;">
-      <div class="modal-dialog" role="document" style="max-height: 100vh; overflow-y: scroll;">
+    <div class="modal" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-scrollable" role="document">
         <div class="modal-content">
           <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="javascript:$('#tweetModal').remove();">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>
           </div>
diff --git a/app/retail/templates/shared/shared_scripts.html b/app/retail/templates/shared/shared_scripts.html
index dad35d7bd83..ca58f41abff 100644
--- a/app/retail/templates/shared/shared_scripts.html
+++ b/app/retail/templates/shared/shared_scripts.html
@@ -21,5 +21,5 @@
 <script src="{% static "v2/js/lib/web3.min.js" %}"></script>
 
 <script>
-    var web3 = window.web3 ? new Web3(window.web3.currentProvider) : new Web3(new Web3.providers.HttpProvider("https://mainnet.infura.io/v3/{{INFURA_V3_PROJECT_ID}}"));
+    // var web3 = window.web3 ? new Web3(window.web3.currentProvider) : new Web3(new Web3.providers.HttpProvider("https://mainnet.infura.io/v3/{{INFURA_V3_PROJECT_ID}}"));
 </script>
diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html
index 64b50f69bdc..4e3d8024b62 100644
--- a/app/townsquare/templates/townsquare/index.html
+++ b/app/townsquare/templates/townsquare/index.html
@@ -221,7 +221,6 @@ <h1 class="font-title text-white mt-5">We’re excited you’re here! Let’s ge
     <script src="{% static "v2/js/ipfs.js" %}"></script>
     <script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
     <script src="{% static "v2/js/abi.js" %}"></script>
-    <script src="{% static "onepager/js/send.js" %}"></script>
 
     <script src="{% static "v2/js/status.js" %}"></script>
     <script src="{% static "v2/js/pages/townsquare.js" %}"></script>
diff --git a/chatconfig/config.json b/chatconfig/config.json
index b55cdc7bada..c99cd294d4d 100644
--- a/chatconfig/config.json
+++ b/chatconfig/config.json
@@ -560,4 +560,4 @@
         "RemoteImageProxyURL": "",
         "RemoteImageProxyOptions": ""
     }
-}
+}
\ No newline at end of file
diff --git a/scripts/debug/check_approval_amount.js b/scripts/debug/check_approval_amount.js
index 547b6fa4170..c6fb60cb3c0 100644
--- a/scripts/debug/check_approval_amount.js
+++ b/scripts/debug/check_approval_amount.js
@@ -1,10 +1,12 @@
-// on settings/token page
+var _selectedAccount = '0x8ff5c070e1f9bc771fc65132086e6e220bcfd989';
+var _tokenAddress = '0x6b175474e89094c44da98b954eedeac495271d0f';// DAI
+const _token_contract = new web3.eth.Contract(token_abi, _tokenAddress);
+const _to = bounty_address();
 
-var from = '0x7d96b5c4279e20bab1ca0043a65f2bb156b0c6eb';
-var token_address = '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359';// DAI
-var to = '0x2af47a65da8cd66729b4209c22017d6a5c2d2400'; //stdbounties
-var token_contract = web3.eth.contract(token_abi).at(token_address);
-
-token_contract.allowance.call(from, to, function(error, result) {
-    console.log(result.toString())
+_token_contract.methods.allowance(_selectedAccount, _to).call({from: selectedAccount}, (error, result) => {
+if (error || Number(result) == 0) {
+  isTokenAuthed = false;
+}
+console.log(result)
 });
+

From 7aec99f80a8acee1a50774940e09d90339099f61 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 15:09:58 -0600
Subject: [PATCH 36/75] make fix

---
 app/dashboard/admin.py                     |  4 ++--
 app/grants/views.py                        |  2 +-
 app/kudos/templates/kudos_details.html     |  2 +-
 app/kudos/templates/shared/kudos_card.html |  2 +-
 app/marketing/mails.py                     | 20 ++++++++++----------
 app/retail/templates/shared/activity.html  |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/dashboard/admin.py b/app/dashboard/admin.py
index 24ff0219f8a..291060ed686 100644
--- a/app/dashboard/admin.py
+++ b/app/dashboard/admin.py
@@ -29,8 +29,8 @@
     Activity, Answer, BlockedURLFilter, BlockedUser, Bounty, BountyEvent, BountyFulfillment, BountyInvites,
     BountySyncRequest, CoinRedemption, CoinRedemptionRequest, Coupon, Earning, FeedbackEntry, FundRequest,
     HackathonEvent, HackathonProject, HackathonRegistration, HackathonSponsor, Interest, Investigation, LabsResearch,
-    ObjectView, Option, Poll, PollMedia, PortfolioItem, Profile, ProfileVerification, ProfileView, Question, SearchHistory, 
-    Sponsor, Tip, TipPayout, TokenApproval, TribeMember, UserAction, UserVerificationModel, 
+    ObjectView, Option, Poll, PollMedia, PortfolioItem, Profile, ProfileVerification, ProfileView, Question,
+    SearchHistory, Sponsor, Tip, TipPayout, TokenApproval, TribeMember, UserAction, UserVerificationModel,
 )
 
 
diff --git a/app/grants/views.py b/app/grants/views.py
index fd6c55dce86..3e2a90651ec 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -49,8 +49,8 @@
 from dashboard.models import Activity, Profile, SearchHistory
 from dashboard.tasks import increment_view_count
 from dashboard.utils import get_web3, has_tx_mined
-from economy.utils import convert_amount
 from economy.models import Token as FTokens
+from economy.utils import convert_amount
 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, GrantCategory, MatchPledge, PhantomFunding, Subscription,
diff --git a/app/kudos/templates/kudos_details.html b/app/kudos/templates/kudos_details.html
index 466276dc91d..76275a66b48 100644
--- a/app/kudos/templates/kudos_details.html
+++ b/app/kudos/templates/kudos_details.html
@@ -47,7 +47,7 @@
           <h3 id="kudosName" class="kudos-details__title">{{ kudos.ui_name }} {% if kudos.generation %}<small class="lead">Gen {{ kudos.generation }}</small>{% endif %}</h3>
           <div>Owner Address: <a target="_blank" href="https://etherscan.io/address/{{ kudos.owner_address }}" class="kudos-details__address" title="{{ kudos.owner_address }}">{{ kudos.owner_address|humanize_address }}</a></div>
           {% if kudos.artist %}
-            <div>Artist: <img style="width: 30px; height: 30px;" src="/dynamic/avatar/{{kudos.artist}}" > <a href="/profile/{{kudos.artist}}/kudos" class="kudos-details__address" title="@{{ kudos.artist }} has this kudos on {{kudos.created_on}}">{{kudos.artist}}</a> | <a href="/kudos/marketplace?q={{kudos.artist}}">View all {{kudos.artist_count}} Kudos by @{{kudos.artist}}</a></div>
+            <div>Artist: <img style="width: 30px; height: 30px; border-radius: 20px;" src="/dynamic/avatar/{{kudos.artist}}" > <a href="/profile/{{kudos.artist}}/kudos" class="kudos-details__address" title="@{{ kudos.artist }} has this kudos on {{kudos.created_on}}">{{kudos.artist}}</a> | <a href="/kudos/marketplace?q={{kudos.artist}}">View all {{kudos.artist_count}} Kudos by @{{kudos.artist}}</a></div>
           {% endif %}
           {% if kudos.quests_reward.count %}
             Reward for beating
diff --git a/app/kudos/templates/shared/kudos_card.html b/app/kudos/templates/shared/kudos_card.html
index c84112c2e1b..5705648d1e1 100644
--- a/app/kudos/templates/shared/kudos_card.html
+++ b/app/kudos/templates/shared/kudos_card.html
@@ -23,7 +23,7 @@
   <span class="kd-price">{{ listing.price_in_eth }} ETH</span>
   <div class="kd-name text-truncate" title="{{ listing.ui_name }}">{{ listing.ui_name }}
   {% if listing.artist %}
-  by <img loading="lazy" style="width: 30px; height: 30px;" data-src="/dynamic/avatar/{{listing.artist}}" > <a href="/profile/{{listing.artist}}/kudos" class="kudos-details__address" title="@{{ listing.artist }} has this kudos on {{listing.created_on}}">@{{listing.artist}}</a>
+  by <img loading="lazy" style="width: 30px; height: 30px; border-radius: 20px;" data-src="/dynamic/avatar/{{listing.artist}}" > <a style="color: #777;" href="/profile/{{listing.artist}}/kudos" class="kudos-details__address" title="@{{ listing.artist }} has this kudos on {{listing.created_on}}">@{{listing.artist}}</a>
   
   {% endif %}
   </div>
diff --git a/app/marketing/mails.py b/app/marketing/mails.py
index 23c591fa81d..e5f83798d1c 100644
--- a/app/marketing/mails.py
+++ b/app/marketing/mails.py
@@ -36,16 +36,16 @@
     render_bounty_expire_warning, render_bounty_feedback, render_bounty_request, render_bounty_startwork_expire_warning,
     render_bounty_unintersted, render_comment, render_faucet_rejected, render_faucet_request,
     render_featured_funded_bounty, render_funder_payout_reminder, render_funder_stale, render_gdpr_reconsent,
-    render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute, render_grant_txn_failed, render_grant_update,
-    render_kudos_email, render_match_distribution, render_match_email, render_mention, render_new_bounty,
-    render_new_bounty_acceptance, render_new_bounty_rejection, render_new_bounty_roundup, render_new_grant_email,
-    render_new_supporter_email, render_new_work_submission, render_no_applicant_reminder, render_nth_day_email_campaign,
-    render_quarterly_stats, render_request_amount_email, render_reserved_issue, render_share_bounty,
-    render_start_work_applicant_about_to_expire, render_start_work_applicant_expired, render_start_work_approved,
-    render_start_work_new_applicant, render_start_work_rejected, render_subscription_terminated_email,
-    render_successful_contribution_email, render_support_cancellation_email, render_tax_report,
-    render_thank_you_for_supporting_email, render_tip_email, render_unread_notification_email_weekly_roundup,
-    render_wallpost, render_weekly_recap,
+    render_gdpr_update, render_grant_cancellation_email, render_grant_recontribute, render_grant_txn_failed,
+    render_grant_update, render_kudos_email, render_match_distribution, render_match_email, render_mention,
+    render_new_bounty, render_new_bounty_acceptance, render_new_bounty_rejection, render_new_bounty_roundup,
+    render_new_grant_email, render_new_supporter_email, render_new_work_submission, render_no_applicant_reminder,
+    render_nth_day_email_campaign, render_quarterly_stats, render_request_amount_email, render_reserved_issue,
+    render_share_bounty, render_start_work_applicant_about_to_expire, render_start_work_applicant_expired,
+    render_start_work_approved, render_start_work_new_applicant, render_start_work_rejected,
+    render_subscription_terminated_email, render_successful_contribution_email, render_support_cancellation_email,
+    render_tax_report, render_thank_you_for_supporting_email, render_tip_email,
+    render_unread_notification_email_weekly_roundup, render_wallpost, render_weekly_recap,
 )
 from sendgrid.helpers.mail import Attachment, Content, Email, Mail, Personalization
 from sendgrid.helpers.stats import Category
diff --git a/app/retail/templates/shared/activity.html b/app/retail/templates/shared/activity.html
index c07b48456b4..80bdbf778f5 100644
--- a/app/retail/templates/shared/activity.html
+++ b/app/retail/templates/shared/activity.html
@@ -102,7 +102,7 @@
         {% elif row.activity_type == 'mini_clr_payout' %}
           {% trans "got a distribution of" %} <strong>{{row.metadata.amount|floatformat:2}} DAI</strong> in {{row.metadata.round_description}}
         {% elif row.activity_type == 'created_kudos' %}
-          a new kudos has been minted:
+          a new kudos, created by the illustrious <img style="height: 20px; width: 20px; border-radius: 20px;" src="/dynamic/avatar/{{row.kudos.artist}}"> <a href={{row.kudos.artist}}>@{{row.kudos.artist}}</a>, has been minted:
           <a href="{{ row.kudos.external_url }}">
             {{ row.kudos.ui_name }}
           </a>

From 70eeb9d51201ab2f32df5e0f9698b7d36aa2b8ba Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 15:30:08 -0600
Subject: [PATCH 37/75] hotfix for kudos stuff

---
 app/assets/v2/css/base.css                    |  4 ++--
 app/dashboard/models.py                       |  3 +--
 .../templates/shared/profile_kudos.html       |  2 +-
 app/kudos/models.py                           |  2 +-
 app/kudos/templates/shared/kudos_card.html    |  3 +--
 .../templates/shared/kudos_card_profile.html  |  7 +++++++
 .../templates/transaction/receive_bulk.html   | 19 ++++++++++++++++---
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
index df3f150a4cd..987af39c7a6 100644
--- a/app/assets/v2/css/base.css
+++ b/app/assets/v2/css/base.css
@@ -969,8 +969,8 @@ input.is-invalid {
 }
 
 .alpha-warning {
-  background-color: #fb9470;
-  color: #fbe0d6;
+  background-color: #ada7d4;
+  color: white;
   padding: 5px 10px;
   border-radius: 2px;
   margin-bottom: 15px;
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index 127bab1120c..eae31129253 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2899,8 +2899,7 @@ def get_org_kudos(self):
     @property
     def kudos_authored(self):
         from kudos.models import Token
-        return Token.objects.filter(artist=self.handle)
-
+        return Token.objects.filter(artist=self.handle, num_clones_allowed__gt=1, hidden=False)
 
     @property
     def get_my_kudos(self):
diff --git a/app/dashboard/templates/shared/profile_kudos.html b/app/dashboard/templates/shared/profile_kudos.html
index 4c65e254ce4..414397eab4b 100644
--- a/app/dashboard/templates/shared/profile_kudos.html
+++ b/app/dashboard/templates/shared/profile_kudos.html
@@ -20,7 +20,7 @@
 <div>
 
   <h3>
-    Author of {{profile.kudos_authored.count}} Kudos
+    Author of {{profile.kudos_authored.count}} Kudos 👩‍🎨🖼
   </h3>
   <p>
     <a href="/kudos/marketplace?q={{profile.handle}}">
diff --git a/app/kudos/models.py b/app/kudos/models.py
index 5e0b717e42b..e96a940f2a6 100644
--- a/app/kudos/models.py
+++ b/app/kudos/models.py
@@ -158,7 +158,7 @@ def artist_count(self):
     def artist_others(self):
         if not self.artist:
             return Token.objects.none()
-        return Token.objects.filter(artist=self.artist)
+        return Token.objects.filter(artist=self.artist, num_clones_allowed__gt=1, hidden=False)
 
     @property
     def static_image(self):
diff --git a/app/kudos/templates/shared/kudos_card.html b/app/kudos/templates/shared/kudos_card.html
index 5705648d1e1..7395f78532d 100644
--- a/app/kudos/templates/shared/kudos_card.html
+++ b/app/kudos/templates/shared/kudos_card.html
@@ -23,8 +23,7 @@
   <span class="kd-price">{{ listing.price_in_eth }} ETH</span>
   <div class="kd-name text-truncate" title="{{ listing.ui_name }}">{{ listing.ui_name }}
   {% if listing.artist %}
-  by <img loading="lazy" style="width: 30px; height: 30px; border-radius: 20px;" data-src="/dynamic/avatar/{{listing.artist}}" > <a style="color: #777;" href="/profile/{{listing.artist}}/kudos" class="kudos-details__address" title="@{{ listing.artist }} has this kudos on {{listing.created_on}}">@{{listing.artist}}</a>
-  
+  by <img loading="lazy" style="width: 30px; height: 30px; border-radius: 20px;" data-src="/dynamic/avatar/{{listing.artist}}" > <a style="color: #777;" href="/profile/{{listing.artist}}/kudos" class="kudos-details__address" title="@{{ listing.artist }} has this kudos on {{listing.created_on}}">@{{listing.artist}}</a>  
   {% endif %}
   </div>
 
diff --git a/app/kudos/templates/shared/kudos_card_profile.html b/app/kudos/templates/shared/kudos_card_profile.html
index 1d085d320de..fbe33e30b64 100644
--- a/app/kudos/templates/shared/kudos_card_profile.html
+++ b/app/kudos/templates/shared/kudos_card_profile.html
@@ -29,6 +29,9 @@
               <a href="/kudos/{{ kudos_group.list.0.kudos_token_cloned_from.id }}/{{ kudos_group.list.0.kudos_token_cloned_from.name }}" class="kd-title" title="{% trans 'Go to ' %}{{ kudos_group.list.0.kudos_token_cloned_from.name|humanize_name }}" tabindex="0">
                 {{ kudos_group.list.0.kudos_token_cloned_from.name|humanize_name }}
               </a>
+              {% if kudos_group.list.0.kudos_token_cloned_from.artist %}
+              by <img loading="lazy" style="width: 30px; height: 30px; border-radius: 20px;" src="/dynamic/avatar/{{kudos_group.list.0.kudos_token_cloned_from.artist}}" > <a style="color: #777;" href="/profile/{{kudos_group.list.0.kudos_token_cloned_from.artist}}/kudos" class="kudos-details__address" title="@{{ kudos_group.list.0.kudos_token_cloned_from.artist }} has this kudos on {{kudos_group.list.0.kudos_token_cloned_from.created_on}}">@{{kudos_group.list.0.kudos_token_cloned_from.artist}}</a>  
+              {% endif %}
             </div>
             <p>
               {{ kudos_group.list.0.kudos_token_cloned_from.description|truncatechars:60 }}
@@ -62,6 +65,10 @@
               <a href="/kudos/{{ kudos_group.list.0.kudos_token_cloned_from.id }}/{{ kudos_group.list.0.kudos_token_cloned_from.name }}" class="kd-title" title="{% trans 'Go to ' %}{{ kudos_group.list.0.kudos_token_cloned_from.name|humanize_name }}" tabindex="0">
                 {{ kudos_group.list.0.kudos_token_cloned_from.name|humanize_name }}
               </a>
+              {% if kudos_group.list.0.kudos_token_cloned_from.artist %}
+              by <img loading="lazy" style="width: 30px; height: 30px; border-radius: 20px;" src="/dynamic/avatar/{{kudos_group.list.0.kudos_token_cloned_from.artist}}" > <a style="color: #777;" href="/profile/{{kudos_group.list.0.kudos_token_cloned_from.artist}}/kudos" class="kudos-details__address" title="@{{ kudos_group.list.0.kudos_token_cloned_from.artist }} has this kudos on {{kudos_group.list.0.kudos_token_cloned_from.created_on}}">@{{kudos_group.list.0.kudos_token_cloned_from.artist}}</a>  
+              {% endif %}
+
             </div>
             <p>
               {{ kudos_group.list.0.kudos_token_cloned_from.description|truncatechars:60 }}
diff --git a/app/kudos/templates/transaction/receive_bulk.html b/app/kudos/templates/transaction/receive_bulk.html
index 2ed2a1dfde3..49b6919633d 100644
--- a/app/kudos/templates/transaction/receive_bulk.html
+++ b/app/kudos/templates/transaction/receive_bulk.html
@@ -71,9 +71,22 @@ <h1 class="h2 mt-5">
 
       <br>
       <span id="kudosComment" class="d-block">
-        <h3><a style='color:black; text-decoration: underline;' href="{{coupon.token.url}}"><span id="kudosName" data-kudosname="{{ coupon.token.name }}" >{{ coupon.token.humanized_name }} </span>{% trans "Kudos" %}</a></h3>
+        <h3 class="mb-0 pb-0">
+          <a style='color:black; text-decoration: underline;' href="{{coupon.token.url}}"><span id="kudosName" data-kudosname="{{ coupon.token.name }}" >{{ coupon.token.humanized_name }}</span></a>
+          {% trans "Kudos" %}{% if coupon.token.artist %},{% endif %} 
+          </h3>
+          {% if coupon.token.artist %}
+          <h4 class="mt-0 pt-0">
+          created w 💓 by <img style="width: 30px; height: 30px; border-radius: 20px;" src="/dynamic/avatar/{{coupon.token.artist}}" > <a href="/profile/{{coupon.token.artist}}/kudos" title="@{{ coupon.token.artist }} has this kudos on {{coupon.token.created_on}}" style="color:black; text-decoration: underline;"> digital artist, {{coupon.token.artist}}</a>. 
+            <hr>
+          </h4>
+          {% endif %}
+
+
+
         {% if coupon.comments_to_put_in_kudos_transfer %}
-        with an attached message, just for you:
+        <img style="max-height: 25px; max-width: 25px;" src="/dynamic/avatar/{{coupon.sender_profile.handle}}">
+      <a style='color:black; text-decoration: underline;' href="{{coupon.sender_profile.url}}">@{{coupon.sender_profile.handle}}</a> sent this kudos w. an attached message, just for you:
         <p style="
     width: 80%;
     height: 100px;
@@ -107,7 +120,7 @@ <h3 class="text-center" style="margin: 0px auto;">👇 Redeem It Here 👇</h3>
         {% trans "Logged in as" %} {% if not request.user.is_authenticated %}(<a href="{% url 'social:begin' 'github' %}?next={{ request.get_full_path }}" onclick="dataLayer.push({'event': 'login'});">{% trans "Login" %}</a>) {% endif %}
         <input type="text" placeholder="@username" id="user" value="{% if user.is_authenticated  %}{{ user }}{% endif %}" disabled="disabled" class='form-control'  required >
         {% if not request.user.is_authenticated %}
-        <p style="color:red;">{% trans "You must be logged in to receive this kudos." %}</p>
+        <p style="color:red;">{% trans "You must be logged in to receive this coupon.token." %}</p>
         {% endif %}
       </div>
 

From 37023d413a79e02eddcedae7fa2c6cdf54978c27 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 15:44:57 -0600
Subject: [PATCH 38/75] copy

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

diff --git a/app/dashboard/templates/shared/profile_kudos.html b/app/dashboard/templates/shared/profile_kudos.html
index 414397eab4b..8a36d086271 100644
--- a/app/dashboard/templates/shared/profile_kudos.html
+++ b/app/dashboard/templates/shared/profile_kudos.html
@@ -20,7 +20,7 @@
 <div>
 
   <h3>
-    Author of {{profile.kudos_authored.count}} Kudos 👩‍🎨🖼
+    Artist of {{profile.kudos_authored.count}} Kudos 👩‍🎨🖼
   </h3>
   <p>
     <a href="/kudos/marketplace?q={{profile.handle}}">

From fa65b0267bea32efe1b1be5b60850786d3f6a7a8 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 16:42:27 -0600
Subject: [PATCH 39/75] patches the super janky nav work in grants to not
 forget ur cateogry when u change sort option. herp derp. this probably all
 needs a rewrite at some pt

---
 app/assets/v2/js/shared.js | 23 +++++++++++++++--------
 app/grants/views.py        |  2 ++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
index dd9fd2a3853..9cca215e236 100644
--- a/app/assets/v2/js/shared.js
+++ b/app/assets/v2/js/shared.js
@@ -1014,29 +1014,36 @@ const updateParams = (key, value) => {
   params = new URLSearchParams(window.location.search);
   if (params.get(key) === value) return;
   params.set(key, value);
-  if (key != 'category') {
-    params.set('category', '');
+
+  let path = '/';
+
+  if (params.get('type', '')) {
+    path = '/' + params.get('type', '');
   }
-  window.location.href = '/grants/?' + decodeURIComponent(params.toString());
+  window.location.href = '/grants' + path + '?' + decodeURIComponent(params.toString());
 };
 
-const updateMultipleParams = (newParams) => {
+const updateMultipleParams = (_newParams) => {
   params = new URLSearchParams(window.location.search);
-  newParams = Object.entries(newParams);
+  newParams = Object.entries(_newParams);
   for (const [ key, value ] of newParams) {
     params.set(key, value);
   }
-  let category_str = '';
+  let path = '/';
+
+  if (params.get('type', '')) {
+    path = '/' + params.get('type', '');
+  }
 
   if (params.get('type')) {
-    category_str = params.get('type') + '/';
     params.delete('type');
   }
   if (!params.get('category')) {
     params.delete('category');
   }
+  params.delete('keyword');
 
-  window.location.href = '/grants/' + category_str + '?' + decodeURIComponent(params.toString());
+  window.location.href = '/grants' + path + '?' + decodeURIComponent(params.toString());
 };
 
 
diff --git a/app/grants/views.py b/app/grants/views.py
index 3e2a90651ec..bed488cd148 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -266,6 +266,8 @@ def grants_by_grant_type(request, grant_type):
     keyword = request.GET.get('keyword', '')
     state = request.GET.get('state', 'active')
     category = request.GET.get('category', '')
+    if keyword:
+        category = ''
     profile = get_profile(request)
     _grants = None
     bg = 4

From d208d803a2279adf865c6a5a9df8ef2da0c3afe0 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 17:07:29 -0600
Subject: [PATCH 40/75] fix for donation comments not showing

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

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 8d202b33473..0007c2e5e6b 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -732,7 +732,7 @@ Vue.component('grants-cart', {
         const tokenAddress = isEth ? '0x0000000000000000000000000000000000000000' : tokenDetails.addr;
 
         // Replace undefined comments with empty strings
-        const comment = donation.comment === undefined ? '' : donation.comment;
+        const comment = donation.grant.grant_comments === undefined ? '' : donation.grant.grant_comments;
 
         // For automatic contributions to Gitcoin, set 'gitcoin-grant-input-amount' to 100.
         // Why 100? Because likely no one will ever use 100% or a normal grant, so using

From 26e87ad5ca43fb1aa371d5eebb3ad3024ae34282 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 17:13:30 -0600
Subject: [PATCH 41/75] usdc issue

---
 app/app/settings.py | 2 +-
 app/grants/views.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/app/settings.py b/app/app/settings.py
index 7755fbdc96e..870e5814454 100644
--- a/app/app/settings.py
+++ b/app/app/settings.py
@@ -762,7 +762,7 @@ def callback(request):
 IPFS_API_ROOT = env('IPFS_API_ROOT', default='/api/v0')
 IPFS_API_SCHEME = env('IPFS_API_SCHEME', default='https')
 
-STABLE_COINS = ['DAI', 'SAI', 'USDT', 'TUSD', 'aDAI']
+STABLE_COINS = ['DAI', 'SAI', 'USDT', 'TUSD', 'aDAI', 'USDC']
 
 # Silk Profiling and Performance Monitoring
 ENABLE_SILK = env.bool('ENABLE_SILK', default=False)
diff --git a/app/grants/views.py b/app/grants/views.py
index bed488cd148..d10d194bfad 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -836,7 +836,7 @@ def grant_fund(request, grant_id, grant_slug):
 
     if request.method == 'POST':
         from grants.tasks import process_grant_contribution
-        process_grant_contribution.delay(grant_id, grant_slug, profile.pk, request.POST)
+        process_grant_contribution(grant_id, grant_slug, profile.pk, request.POST)
 
         return JsonResponse({
             'success': True,

From 352f8eb5d3867a940c08cca0c33e224f48d75193 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Wed, 24 Jun 2020 17:19:03 -0600
Subject: [PATCH 42/75] increment grant id

---
 app/assets/v2/js/cart.js                  | 2 +-
 app/grants/templates/grants/cart-vue.html | 2 +-
 app/grants/views.py                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 0007c2e5e6b..c8adf9cf9d1 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -169,7 +169,7 @@ Vue.component('grants-cart', {
           grant_image_css: '',
           grant_logo: '',
           grant_slug: 'gitcoin-sustainability-fund',
-          grant_title: 'Gitcoin Grants Round 6+ Development Fund',
+          grant_title: 'Gitcoin Grants Round 7+ Development Fund',
           grant_token_address: '0x0000000000000000000000000000000000000000',
           grant_token_symbol: '',
           isAutomatic: true // we add this field to help properly format the POST requests
diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index 59e1bcdfc7b..7f933e3be5e 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -314,7 +314,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                             <span class="gitcoin-grant-percent">[[gitcoinFactorRaw]]%</span>
                             {% trans "of your contribution to the" %} <a
                               href="https://gitcoin.co/grants/86/gitcoin-sustainability-fund" target="_blank">Gitcoin
-                              Grants Round 6+ Development Fund <i class="fas fa-external-link-alt"></i></a>.
+                              Grants Round 7+ Development Fund <i class="fas fa-external-link-alt"></i></a>.
                             <div class="font-smaller-1 hyperlink" @click="adjustGitcoinFactor=true">
                               Adjust &gt;&gt;
                             </div>
diff --git a/app/grants/views.py b/app/grants/views.py
index d10d194bfad..bed488cd148 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -836,7 +836,7 @@ def grant_fund(request, grant_id, grant_slug):
 
     if request.method == 'POST':
         from grants.tasks import process_grant_contribution
-        process_grant_contribution(grant_id, grant_slug, profile.pk, request.POST)
+        process_grant_contribution.delay(grant_id, grant_slug, profile.pk, request.POST)
 
         return JsonResponse({
             'success': True,

From 0e4eeb36ec52aa4c27f6d87923dd8c420d3397a0 Mon Sep 17 00:00:00 2001
From: Paul <41552663+molecula451@users.noreply.github.com>
Date: Thu, 25 Jun 2020 08:35:46 -0400
Subject: [PATCH 43/75] Quests Table (#6808)

* [WIP] Quests Table

* styles

* styles

* fixed header table

* Quest tables layout

* quest description

* purged card style code owocki-lostone request

* purged card style

* Update index.html
---
 app/assets/v2/css/quests.css           |  99 ------------------------
 app/quests/templates/quests/index.html | 103 ++++++++++++-------------
 2 files changed, 50 insertions(+), 152 deletions(-)

diff --git a/app/assets/v2/css/quests.css b/app/assets/v2/css/quests.css
index 3718859b290..b94821e65f2 100644
--- a/app/assets/v2/css/quests.css
+++ b/app/assets/v2/css/quests.css
@@ -216,56 +216,6 @@
   width: 100%;
 }
 
-.card_head {
-  height: 140px;
-}
-
-.Example .card_head {
-  display: none;
-}
-
-.card_head span {
-  background-color: #e7f0fa;
-  color: var(--gc-blue);
-  font-size: 10px;
-  display: inline-block;
-  list-style: none;
-  padding: 5px;
-  transform: rotate(-15deg);
-  position: relative;
-}
-
-.card_head span.reward {
-  top: -45px;
-  left: -75px;
-  z-index: 999;
-}
-
-.card_head span.boss {
-  top: -50px;
-  left: -20px;
-  z-index: 999;
-}
-
-.card_img {
-  height: 120px;
-  width: 120px;
-  margin: 0px auto;
-  margin-bottom: 20px;
-  position: relative;
-}
-
-.card_img.reward {
-  width: 110px;
-  top: -120px;
-  right: -50px;
-}
-
-.card_img.boss {
-  top: 0px;
-  left: -50px;
-}
-
 .tags {
   text-align: center;
   margin-left: 0px;
@@ -407,18 +357,6 @@ body.quest_battle p {
   border: 5px solid #0fce7c;
 }
 
-.quest-card.locked img {
-  filter: grayscale(1);
-}
-
-.quest-card .card_head img {
-  filter: grayscale(100%);
-}
-
-.quest-card:hover .card_head img {
-  filter: grayscale(0%);
-}
-
 #announce img {
   margin: 0px auto;
   margin-top: -150px;
@@ -519,47 +457,18 @@ body.quest_battle p {
   right: 25%;
 }
 
-.quest-card.available:hover {
-  background-color: #aea0df !important;
-  cursor: pointer;
-}
-
-.quest-card.available:hover .pr-3 {
-  background-color: #4e40af !important;
-  border-top: 3px solid #2e208f !important;
-}
-
 .announce a:hover {
   color: black;
   font-weight: bold;
   background-color: #f5d3d4;
 }
 
-.quest-card.locked div,
-.quest-card.locked div a {
-  color: #aaa !important;
-}
-
-.quest-card.available:hover .pr-3,
-.quest-card.available:hover .pr-3 a,
-.quest-card.available:hover .pr-3 p {
-  color: white !important;
-}
-
-.quest-card.available:hover a.btn {
-  font-size: 18px;
-}
-
 .back_gradient {
   background: linear-gradient(to right top, #0fce7c, #00a5a1, #0077b5, #0046a1, #0d0764) no-repeat;
   animation: gradient 40s ease infinite;
   background-size: 100% 400px !important;
 }
 
-.quest-card.available:hover .pr-3 p.desc {
-  border-top: 1px solid white !important;
-}
-
 #cta_button {
   margin-top: 10%;
   width: 60%;
@@ -717,14 +626,6 @@ body.quest_battle .bottom_notification {
   color: red;
 }
 
-.quest-card.beaten div.pt-3 {
-  background-color: #c0eec0 !important;
-}
-
-.quest-card.cooldown div.pt-3 {
-  background-color: #aad4e5 !important;
-}
-
 #protagonist .flair div {
   top: 35px;
 }
diff --git a/app/quests/templates/quests/index.html b/app/quests/templates/quests/index.html
index b10952b3583..2bceaf42016 100644
--- a/app/quests/templates/quests/index.html
+++ b/app/quests/templates/quests/index.html
@@ -73,63 +73,60 @@ <h3>No Quests Found</h3>
       Try again or <a href="/quests/new/">create your own</a>.
     </div>
     {% endif %}
-    {% for unlocked, beaten, cooldown, quest in the_quests %}
-    <div id="{{difficulty_level}}" style="{% cycle 'background-color: #fafafa;' '' %}; width: 250px; display: block; float: left; border-radius: 10px; height: 530px; text-align: center;" class="{{quest.style}} m-3 p-2 quest-card {% if not unlocked %} locked {% elif beaten %} beaten {% else %} available {% endif %} {% if cooldown %} cooldown {% endif %}">
-      <div class="card_head">
-        <span class="boss">#boss</span>
-        <img class="card_img boss" data-src="{{quest.art_url}}" title="{{quest.game_metadata.enemy.title}}">
-        <span class="reward">#prize</span>
-        <img class="card_img reward" data-src="{{quest.kudos_reward.img_url}}" title="{{quest.kudos_reward.humanized_name}} Kudos">
-      </div>
-      <div style="background-color: #eee; border-top: 3px solid #bbb; border-radius: 5px;" class="pr-3 pt-3 pl-3 pb-1 mb-1 mt-3">
-        <span style="position: relative; top: -50px; font-size: 30px;">
-          {% if cooldown %}
-            🥶
-          {% elif beaten %}
-            ✅
-          {% else %}
-            🔒
-          {% endif %}
-        </span>
-        <a href="{{quest.url}}">
-          <h2 style="margin-top: -50px; font-size: 20px;">
-            {{quest.title}}
-          </h2>
-        </a>
-        <ul class='tags mb-1'>
-          {% for tag in quest.ui_data.tags %}
-            <li>#{{tag|lower}}</li>
-          {% endfor %}
-        </ul>
-        <p style="color: #222; font-size: 11px; margin-bottom: 3px;"><strong>{{quest.ui_data.attempts_count}}</strong> Attempts | <strong>{{quest.ui_data.success_pct}}%</strong> Winners | Created by <a href="{{quest.ui_data.creator.url}}">@{{quest.ui_data.creator.handle}}</a> | Prize: <a href="{{quest.kudos_reward.url}}">{{quest.kudos_reward.humanized_name}} Kudos</a> </p>
-        <p class="desc" style=" max-height: 90px; overflow-y: scroll; font-size: 10px; border-top: 1px solid #333;">{{quest.description}}</p>
-      </div>
-      {% if beaten %}
-        ( ✅ Quest Beaten)
-      {% elif cooldown %}
-        ( 🥶 In Cooldown Period)
-      {% elif unlocked %}
-        <p style="font-size: 10px;">
-          <span style="font-weight: bold;">Play Time:</span> <br>
-          {{quest.est_total_time_required}} mins (reading) <br>
-          {{quest.est_skim_time_mins}} mins (skimming)
-        </p>
-
-        <a style="position: relative; bottom: 20px; left: 0px;" class="btn btn-xs btn-gc-blue mt-2" role="button" href="{{quest.url}}">Play Quest</a>
-      {% else %}
-        🔒Locked; To unlock
-        {% if quest.unlocked_by_hackathon %}
+    
+      <!-- Quest table -->
+  <div id="{{difficulty_level}}">    
+    <table  class="table table-fixed">
+     <thead>
+         <tr>
+            <th scope="row"></th>
+                  <th scope="col">Quest Name</th>
+                  <th scope="col">Quest Prize</th>
+                  <th scope="col">Difficulty</th>
+                  <th scope="col">Attempts</th>
+                  <th scope="col">Description</th>
+                  <th scope="col">Play Time</th>
+                  <th scope="col">Play</th>
+                  <th scope="col"></th>
+                  <th scope="col">{% if difficulty_level == 'Created' %} Ownership {% endif %} </th>
+         </tr>
+      </thead>
+      {% for unlocked, beaten, cooldown, quest in the_quests %}
+            <tbody>
+               <tr>
+               <th scope="row"></th>
+                    <td> {{quest.title}}</td>
+                    <td> {{quest.kudos_reward.humanized_name}}</td>
+                    <td> {{difficulty_level}}</td>
+                    <td> {{quest.ui_data.attempts_count}}</td>
+                    <td> {{quest.description}}</td>
+                    <td>{{quest.est_total_time_required}} mins (reading) <br> {{quest.est_skim_time_mins}} mins (skimming)<br></td>
+                 {% if beaten %}
+                 <td>( ✅ Quest Beaten)
+                 </td>
+                {% elif cooldown %}
+                 <td>( 🥶 In Cooldown Period)
+                 </td>
+                 {% elif unlocked %}
+                 <td><span> <a style="position: relative; bottom: 3px; left: 0px;"  class="fa fa-gamepad fa-6" role="button" href="{{quest.url}}"></a></span>
+                 </td>
+                 <td>{% if difficulty_level == 'Created' %} <BR><td> <a class="mt-2" role="button" href="{{quest.edit_url}}">(Edit Quest)</a>
+                      {% endif %} </td>
+                 </td>
+                  {% else %}
+                    <td>🔒Locked; To unlock
+                    {% if quest.unlocked_by_hackathon %}
           register for <a href="{{quest.unlocked_by_hackathon.onboard_url}}">{{quest.unlocked_by_hackathon.name}}</a>.
         {% else %}
           beat <a href="{{quest.unlocked_by_quest.url}}">{{quest.unlocked_by_quest.title}}</a>.
-        {% endif %}
-      {% endif %}
-      {% if difficulty_level == 'Created' %}
-        <BR>
-        <a class="mt-2" role="button" href="{{quest.edit_url}}">(Edit Quest)</a>
-      {% endif %}
+                    </td>
+                  {% endif %}
+                  {% endif %}
+                </tr>
+             </tbody>
+      {% endfor %}
+    </table>
     </div>
-    {% endfor %}
   </div>
   {% endfor %}
 </div>

From de3cad74201dee56eeb877fdccc2d59edbcdfde0 Mon Sep 17 00:00:00 2001
From: codingsh <codingsh@pm.me>
Date: Thu, 25 Jun 2020 09:41:40 -0300
Subject: [PATCH 44/75] feat: New Box Hackathon Feature on Townsquare (#6898)

* add: Feature Hackathon on townsquare #6870

* add: click on name hackathon #6870

* fixed: design features on hackthon box  #6870

* re-indent

Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
---
 app/assets/v2/css/town_square.css             |  1 +
 .../emails/assets/css/activity_stream.css     |  3 +-
 .../templates/townsquare/index.html           | 66 +++++++++++++++++++
 .../townsquare/shared/hackathons.html         | 44 +++++++++++++
 .../templates/townsquare/shared/reflink.html  |  4 +-
 app/townsquare/views.py                       |  3 +
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 app/townsquare/templates/townsquare/shared/hackathons.html

diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css
index ae012971967..4db3ff7ee90 100644
--- a/app/assets/v2/css/town_square.css
+++ b/app/assets/v2/css/town_square.css
@@ -906,6 +906,7 @@ body.green.offer_view .announce {
 .townsquare_block-header.closed::after {
   content: "^"
 }
+
 #status .btn-group-toggle .btn-radio {
   background-color: var(--badge-blue-bg);
   color: var(--badge-blue-text);
diff --git a/app/retail/templates/emails/assets/css/activity_stream.css b/app/retail/templates/emails/assets/css/activity_stream.css
index c8204d90acb..705df8f3485 100644
--- a/app/retail/templates/emails/assets/css/activity_stream.css
+++ b/app/retail/templates/emails/assets/css/activity_stream.css
@@ -2,8 +2,9 @@
   cursor: pointer;
   font-size: 12px;
   padding: 3px;
-  background-color: #ecf0f4;
+  background-color: #fff;
   border: 0px solid;
+  color: #3d23fc;
 }
 
 .dark-mode #reflink {
diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html
index 4e3d8024b62..a6bc8f32339 100644
--- a/app/townsquare/templates/townsquare/index.html
+++ b/app/townsquare/templates/townsquare/index.html
@@ -28,6 +28,63 @@
     <link rel="stylesheet" href="{% static "v2/css/activity_stream.css" %}">
     <link rel="stylesheet" href="{% static "v2/css/tag.css" %}">
     <link rel="stylesheet" href="{% static "v2/css/theme_switcher.css" %}">
+    <style>
+      img.hackathon-card-logo{
+        max-height: 5rem;
+        max-width: 5rem;
+        border-radius: .3rem;
+        background: rgb(25, 0, 63);
+      }
+
+      .hackathon-card-logo a {
+        color: #000000;
+      }
+
+      .townsquare_block-header.box-collapse {
+        background: #fff;
+        padding: 10px;
+        border-bottom: 1px solid #ddd;
+        text-transform: none;
+        border-radius: 5px 5px 0 0;
+      }
+      
+      .box-hackathons {
+        background: #ffff;
+        border-bottom: 1px solid #ddd;
+        border-radius: 0 0 5px 5px;
+      }
+      
+      .box-hackathons .card {
+        border: none;
+      }
+
+      .box-hackathons .card-header {
+        border-bottom: none;
+        background-color: transparent;
+      }
+
+      .box-hackathons-townsquare .hackathon-actions {
+        font-weight: 700;
+        margin: 0;
+      }
+
+      .box-hackathons-townsquare .card-body {
+        padding: 11px 0;
+      }
+
+      .box-hackathons-townsquare .card-body .font-smaller-2 {
+        color: #666666;
+      }
+
+      .box-hackathons-townsquare .card-body .font-weight-semibold {
+        margin: 0;
+      }
+      
+      .box-hackathons .view-all {
+        padding: 0px 0px 0px 20px;
+        font-weight: 700;
+      }
+    </style>
     <script src="{% static "v2/js/theme_switcher.js" %}"></script> <!-- needs to be in the head section -->
   </head>
 
@@ -140,6 +197,15 @@
               {% if SHOW_DRESSING %}
 
                 {% include 'townsquare/shared/tribe.html' %}
+               
+
+                {% if hackathon_tabs|length %}
+                  <div class="townsquare_block-header box-collapse  mt-1" data-target="hackathons">
+                    Gitcoin Hackathons
+                  </div>
+                  {% include 'townsquare/shared/hackathons.html' %}
+                {% endif %}
+
                 {% include 'townsquare/shared/reflink.html' %}
 
                 <div class="townsquare_block-header text-left my-4 mt-sm-0 mb-sm-2" data-target="actions">
diff --git a/app/townsquare/templates/townsquare/shared/hackathons.html b/app/townsquare/templates/townsquare/shared/hackathons.html
new file mode 100644
index 00000000000..1fb2f820cef
--- /dev/null
+++ b/app/townsquare/templates/townsquare/shared/hackathons.html
@@ -0,0 +1,44 @@
+<div id="hackathons" class="mb-4 box-hackathons">
+  {% for hackathon in hackathon_tabs|slice:":5" %}
+    <div class="box-hackathons-townsquare">
+      <div class="card flex-row" id="{{hackathon.slug}}">
+        <div class="card-header">
+          {% firstof hackathon.logo_svg or hackathon.logo as logo %}
+          {% if logo %}
+            <img class="hackathon-card-logo" src="{{MEDIA_URL}}{{logo}}" alt="Hackathon logo" />
+          {% else %}
+            <div class="hackathon-card-logo text-center px-3 font-caption">
+              <a href="{% url 'hackathon_onboard' hackathon.slug %}">  {{ hackathon.title }} </a>
+            </div>
+          {% endif %}
+        </div>
+
+        <div class="card-body">
+          <h5 class="font-subheader font-weight-semibold">
+            <a href="{% url 'hackathon' hackathon.slug %}" class="text-black" target="_blank" rel="noopener noreferrer">
+              {{ hackathon.title }}
+            </a>
+          </h5>
+          <div class="font-smaller-2">
+            <span class>From</span>
+            <time class="font-weight-bold" datetime="{{ hackathon.start_date|date:'c' }}">
+              {{ hackathon.start|date:"m/d/Y" }}
+            </time>
+            <span>To</span>
+            <time class="font-weight-bold" datetime="{{ hackathon.end_date|date:'c' }}">
+              {{ hackathon.end|date:"m/d/Y" }}
+            </time>
+          </div>
+          <div class="mt-1 hackathon-actions">
+            {% if hackathon.end|timesince <= "1 min" %}
+              <a href="{% url 'hackathon_onboard' hackathon.slug %}">
+                Join Hackathon >
+              </a>
+            {% endif %}
+          </div>
+        </div>
+      </div>   
+    </div>
+  {% endfor %}
+  <a href="https://gitcoin.co/hackathon-list/" class="view-all">View all ></a>
+</div>
diff --git a/app/townsquare/templates/townsquare/shared/reflink.html b/app/townsquare/templates/townsquare/shared/reflink.html
index 051303f2e53..febec03e0ce 100644
--- a/app/townsquare/templates/townsquare/shared/reflink.html
+++ b/app/townsquare/templates/townsquare/shared/reflink.html
@@ -1,6 +1,6 @@
                 {% if REFER_LINK %}
-                  <div class="townsquare_block-header text-left mb-1 mt-0" data-target="reflink_container">
-                    Ref Link <i data-toggle="tooltip" data-html="true" class="fas fa-info-circle mr-3" title="
+                  <div class="townsquare_block-header box-collapse text-left mb-1 mt-0" data-target="reflink_container">
+                    Ref A Friend! <i data-toggle="tooltip" data-html="true" class="fas fa-info-circle mr-3" title="
                     <strong>
                       Gitcoin is better with friends!
                     </strong> - 
diff --git a/app/townsquare/views.py b/app/townsquare/views.py
index 8b0f33f3e0c..53893c6f60b 100644
--- a/app/townsquare/views.py
+++ b/app/townsquare/views.py
@@ -180,6 +180,9 @@ def get_sidebar_tabs(request):
         for hackathon in hackathons:
             connect = {
                 'title': hackathon.name,
+                'logo': hackathon.logo,
+                'start': hackathon.start_date,
+                'end': hackathon.end_date,
                 'slug': f'hackathon:{hackathon.pk}',
                 'url_slug': hackathon.slug,
                 'helper_text': f'Go to {hackathon.name} Townsquare.',

From b312aef3ee6730088b045f677f0f62c42bbe1a25 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 08:56:21 -0600
Subject: [PATCH 45/75] a few cleanup commits; fixes economy and kudos model..
 silences a sentry alert, and fixes the objectview tabled

---
 app/dashboard/tasks.py                         |  3 ++-
 .../migrations/0002_auto_20200625_1454.py      | 18 ++++++++++++++++++
 app/grants/views.py                            |  6 +++++-
 .../migrations/0018_auto_20200625_1454.py      | 18 ++++++++++++++++++
 app/kudos/models.py                            |  2 +-
 5 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 app/economy/migrations/0002_auto_20200625_1454.py
 create mode 100644 app/kudos/migrations/0018_auto_20200625_1454.py

diff --git a/app/dashboard/tasks.py b/app/dashboard/tasks.py
index 20107a5e733..a9d4ee047ba 100644
--- a/app/dashboard/tasks.py
+++ b/app/dashboard/tasks.py
@@ -155,6 +155,7 @@ def increment_view_count(self, pks, content_type, user_id, view_type, retry: boo
     :param view_type:
     :return:
     """
+    individual_storage = False # TODO: Change back to true IFF we figure out how to manage storage of this table
     user = None
     if user_id:
         user = User.objects.get(pk=user_id)
@@ -163,7 +164,7 @@ def increment_view_count(self, pks, content_type, user_id, view_type, retry: boo
         key = f"{content_type}_{pk}"
         print(key)
         result = redis.incr(key)
-        if pk and view_type == 'individual':
+        if pk and view_type == 'individual' and individual_storage:
             try:
                 ObjectView.objects.create(
                     viewer=user,
diff --git a/app/economy/migrations/0002_auto_20200625_1454.py b/app/economy/migrations/0002_auto_20200625_1454.py
new file mode 100644
index 00000000000..0ade5f57a8b
--- /dev/null
+++ b/app/economy/migrations/0002_auto_20200625_1454.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-06-25 14:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('economy', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='conversionrate',
+            name='source',
+            field=models.CharField(choices=[('cryptocompare', 'cryptocompare'), ('poloniex', 'poloniex'), ('uniswap', 'uniswap'), ('manual', 'manual')], db_index=True, max_length=30),
+        ),
+    ]
diff --git a/app/grants/views.py b/app/grants/views.py
index bed488cd148..1f967a4843f 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -232,7 +232,11 @@ def grants_addr_as_json(request):
 
 @cache_page(60 * 60)
 def grants_stats_view(request):
-    cht, chart_list = get_stats(request.GET.get('category'))
+    cht, chart_list = None, None
+    try:
+        cht, chart_list = get_stats(request.GET.get('category'))
+    except:
+        raise Http404
     params = {
         'cht': cht,
         'chart_list': chart_list,
diff --git a/app/kudos/migrations/0018_auto_20200625_1454.py b/app/kudos/migrations/0018_auto_20200625_1454.py
new file mode 100644
index 00000000000..0c27a0787ad
--- /dev/null
+++ b/app/kudos/migrations/0018_auto_20200625_1454.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-06-25 14:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kudos', '0017_token_metadata'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='token',
+            name='artist',
+            field=models.CharField(blank=True, db_index=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/app/kudos/models.py b/app/kudos/models.py
index e96a940f2a6..278f571fb4c 100644
--- a/app/kudos/models.py
+++ b/app/kudos/models.py
@@ -122,7 +122,7 @@ class Meta:
     image = models.CharField(max_length=255, null=True)
     rarity = models.CharField(max_length=255, null=True)
     tags = models.CharField(max_length=255, null=True, db_index=True)
-    artist = models.CharField(max_length=255, null=True, blank=True)
+    artist = models.CharField(max_length=255, null=True, blank=True, db_index=True)
     platform = models.CharField(max_length=255, null=True, blank=True)
     external_url = models.CharField(max_length=255, null=True)
     background_color = models.CharField(max_length=255, null=True)

From 19848688e5c96b218a9589dfc966635d494d5fba Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 13:44:09 -0600
Subject: [PATCH 46/75] fix for token validator

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index f94c259df60..25cf9481156 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -301,7 +301,9 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
             _value_decimal = Decimal(int(_value) / 10 ** _decimals)
             if amount:
                 delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
-                this_is_the_one = delta < 0.001
+                threshold_pct = 0.05
+                threshold = (float(abs(amount)) * threshold_pct)
+                this_is_the_one = delta < threshold
             if this_is_the_one:
                 if transfer.get('type') in ['TokenTransfer', 'EtherTransfer']:
                     return {

From 9372a9c5e60f1fe34b4506bb14735bae66624c82 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 13:51:36 -0600
Subject: [PATCH 47/75] one last stab at validating txn

---
 app/economy/tx.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 25cf9481156..4c3579ff6fe 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -201,7 +201,8 @@ def grants_transaction_validator(contribution):
             delta1 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period_minus_gas_price)
             delta2 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period)
             # TODO what about gitcoin transfers
-            validation['passed'] = abs(delta1) <= 0.01 or abs(delta2) <= 0.01
+            threshold = Decimal(abs(amount)) * validation_threshold_pct
+            validation['passed'] = abs(delta1) <= threshold or abs(delta2) <= threshold
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 
 
@@ -250,6 +251,7 @@ def get_token_recipient_senders(recipient_address, token_address):
 
 auth = settings.ALETHIO_KEY
 headers = {'Authorization': f'Bearer {auth}'}
+validation_threshold_pct = 0.05
 
 def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id='', amount=None):
     address = to_address
@@ -301,8 +303,7 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
             _value_decimal = Decimal(int(_value) / 10 ** _decimals)
             if amount:
                 delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
-                threshold_pct = 0.05
-                threshold = (float(abs(amount)) * threshold_pct)
+                threshold = (float(abs(amount)) * validation_threshold_pct)
                 this_is_the_one = delta < threshold
             if this_is_the_one:
                 if transfer.get('type') in ['TokenTransfer', 'EtherTransfer']:

From 05fe7ff266bd5cf25b474614a4e0f6aed119b98a Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 13:52:38 -0600
Subject: [PATCH 48/75] one last stab at validating txn

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 4c3579ff6fe..4e864004682 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -201,7 +201,7 @@ def grants_transaction_validator(contribution):
             delta1 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period_minus_gas_price)
             delta2 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period)
             # TODO what about gitcoin transfers
-            threshold = Decimal(abs(amount)) * validation_threshold_pct
+            threshold = Decimal(abs(contribution.subscription.amount_per_period_minus_gas_price)) * validation_threshold_pct
             validation['passed'] = abs(delta1) <= threshold or abs(delta2) <= threshold
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 

From 73cdff437fd192f4fbb074d05336ecb5b2cbd45a Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 13:53:44 -0600
Subject: [PATCH 49/75] usdc issue

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 4e864004682..fde79393673 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -201,7 +201,7 @@ def grants_transaction_validator(contribution):
             delta1 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period_minus_gas_price)
             delta2 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period)
             # TODO what about gitcoin transfers
-            threshold = Decimal(abs(contribution.subscription.amount_per_period_minus_gas_price)) * validation_threshold_pct
+            threshold = Decimal(Decimal(abs(contribution.subscription.amount_per_period_minus_gas_price)) * validation_threshold_pct)
             validation['passed'] = abs(delta1) <= threshold or abs(delta2) <= threshold
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 

From e458484b805a4918bd406366a0039138f8a8e8b7 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 13:55:02 -0600
Subject: [PATCH 50/75] wrestle with decimals

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index fde79393673..fc75421cb2f 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -201,7 +201,7 @@ def grants_transaction_validator(contribution):
             delta1 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period_minus_gas_price)
             delta2 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period)
             # TODO what about gitcoin transfers
-            threshold = Decimal(Decimal(abs(contribution.subscription.amount_per_period_minus_gas_price)) * validation_threshold_pct)
+            threshold = Decimal(Decimal(abs(contribution.subscription.amount_per_period_minus_gas_price)) * Decimal(validation_threshold_pct))
             validation['passed'] = abs(delta1) <= threshold or abs(delta2) <= threshold
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 

From 2529027029f5e9656f8d76d28512efacb25a7009 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 14:18:08 -0600
Subject: [PATCH 51/75] more validation fixes

---
 app/economy/tx.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index fc75421cb2f..092e85b3cac 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -113,6 +113,7 @@ def grants_transaction_validator(contribution):
         'comment': 'Default'
     }
     token_originators = []
+    amounts = [contribution.subscription.amount_per_period_minus_gas_price, contribution.subscription.amount_per_period]
 
     for tx in tx_list:
 
@@ -143,7 +144,7 @@ def grants_transaction_validator(contribution):
                 transaction = check_transaction(transaction_hash)
                 if transaction.value > 0.001:
                     recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
-                    transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx, amount=contribution.subscription.amount_per_period_minus_gas_price)
+                    transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx, amounts=amounts)
                     if transfer:
                         token_transfer = transfer
                 maybeprint(148, round(time.time(),2))
@@ -164,7 +165,7 @@ def grants_transaction_validator(contribution):
                 maybeprint(160, round(time.time(),2))
                 # get token transfers
                 if not token_transfer:
-                    transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx, amount=contribution.subscription.amount_per_period_minus_gas_price)
+                    transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx, amounts=amounts)
                     if transfers:
                         token_transfer = transfers
                 maybeprint(169, round(time.time(),2))
@@ -190,7 +191,7 @@ def grants_transaction_validator(contribution):
             from_address = Web3.toChecksumAddress(contribution.subscription.contributor_address)
             recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
             token_address = Web3.toChecksumAddress(contribution.subscription.token_address)
-            _transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx, amount=contribution.subscription.amount_per_period_minus_gas_price)
+            _transfers = get_token_originators(recipient_address, token_address, from_address=from_address, return_what='transfers', tx_id=tx, amounts=amounts)
             failsafe = _transfers['token_name'] == contribution.subscription.token_symbol
             if failsafe:
                 validation['comment'] = f"Token Transfer Passed on the second try"
@@ -253,7 +254,7 @@ def get_token_recipient_senders(recipient_address, token_address):
 headers = {'Authorization': f'Bearer {auth}'}
 validation_threshold_pct = 0.05
 
-def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id='', amount=None):
+def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id='', amounts=[]):
     address = to_address
 
     #is_address = requests.get('https://api.aleth.io/v1/accounts/' + address, headers=headers).status_code
@@ -301,10 +302,11 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
             _symbol = transfer.get('attributes', {}).get('symbol', 'ETH')
             _value = transfer.get('attributes', {}).get('value', 0)
             _value_decimal = Decimal(int(_value) / 10 ** _decimals)
-            if amount:
+            for amount in amounts:
                 delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
                 threshold = (float(abs(amount)) * validation_threshold_pct)
-                this_is_the_one = delta < threshold
+                if delta < threshold:
+                    this_is_the_one = True
             if this_is_the_one:
                 if transfer.get('type') in ['TokenTransfer', 'EtherTransfer']:
                     return {

From d7b59f1e234c438ede8b0dda938f2076d24fa215 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Thu, 25 Jun 2020 14:43:40 -0600
Subject: [PATCH 52/75] final fixes for validator

---
 app/economy/tx.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/economy/tx.py b/app/economy/tx.py
index 092e85b3cac..2568a79acff 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -145,6 +145,8 @@ def grants_transaction_validator(contribution):
                 if transaction.value > 0.001:
                     recipient_address = Web3.toChecksumAddress(contribution.subscription.grant.admin_address)
                     transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx, amounts=amounts)
+                    if not transfer:
+                        transfer = get_token_originators(recipient_address, '0x0', from_address=from_address, return_what='transfers', tx_id=tx)
                     if transfer:
                         token_transfer = transfer
                 maybeprint(148, round(time.time(),2))
@@ -199,10 +201,9 @@ def grants_transaction_validator(contribution):
                 token_transfer = _transfers
 
         else:
-            delta1 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period_minus_gas_price)
-            delta2 = Decimal(token_transfer['token_amount_decimal']) - Decimal(contribution.subscription.amount_per_period)
-            # TODO what about gitcoin transfers
-            threshold = Decimal(Decimal(abs(contribution.subscription.amount_per_period_minus_gas_price)) * Decimal(validation_threshold_pct))
+            delta1 = float(token_transfer['token_amount_decimal']) - float(contribution.subscription.amount_per_period_minus_gas_price)
+            delta2 = float(token_transfer['token_amount_decimal']) - float(contribution.subscription.amount_per_period)
+            threshold = float(float(abs(contribution.subscription.amount_per_period_minus_gas_price)) * float(validation_threshold_pct))
             validation['passed'] = abs(delta1) <= threshold or abs(delta2) <= threshold
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 
@@ -302,11 +303,13 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
             _symbol = transfer.get('attributes', {}).get('symbol', 'ETH')
             _value = transfer.get('attributes', {}).get('value', 0)
             _value_decimal = Decimal(int(_value) / 10 ** _decimals)
+            _this_is_the_one = False
             for amount in amounts:
                 delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
                 threshold = (float(abs(amount)) * validation_threshold_pct)
                 if delta < threshold:
-                    this_is_the_one = True
+                    _this_is_the_one = True
+            this_is_the_one = not len(amounts) or _this_is_the_one
             if this_is_the_one:
                 if transfer.get('type') in ['TokenTransfer', 'EtherTransfer']:
                     return {

From 092b2beb57734d371e9ed8a3ec2c690f8986f9c7 Mon Sep 17 00:00:00 2001
From: Matt <17163988+mds1@users.noreply.github.com>
Date: Thu, 25 Jun 2020 20:13:08 -0700
Subject: [PATCH 53/75] CLR cart updates (#6978)

* Add ability to bulk edit amounts on cart page

* Add ability to bulk edit side cart amounts

* chore: add Apply to all option to every grant on side cart

* api: add grants/v1/api/clr

* chore: update syc/get_amount to support multiple tokens

* Get latest CLR curves when cart is loaded

* Reduce number of requests for price data

* Fix for handling stablecoins

Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
---
 app/assets/v2/js/amounts.js                   |  8 +-
 app/assets/v2/js/cart.js                      | 75 +++++++++++++--
 app/assets/v2/js/grants/funding.js            | 95 ++++++++++++++-----
 app/assets/v2/js/shared.js                    |  3 +-
 app/dashboard/helpers.py                      | 38 +++++---
 app/dashboard/tests/test_dashboard_helpers.py |  2 +-
 app/grants/templates/grants/cart-vue.html     |  8 ++
 app/grants/urls.py                            |  6 +-
 app/grants/views.py                           | 42 +++++++-
 9 files changed, 220 insertions(+), 57 deletions(-)

diff --git a/app/assets/v2/js/amounts.js b/app/assets/v2/js/amounts.js
index 0acfae5a379..7100db9671d 100644
--- a/app/assets/v2/js/amounts.js
+++ b/app/assets/v2/js/amounts.js
@@ -86,7 +86,9 @@ var getUSDEstimate = function(amount, denomination, callback) {
   }
   var request_url = '/sync/get_amount?amount=' + amount + '&denomination=' + denomination;
 
-  jQuery.get(request_url, function(result) {
+  jQuery.get(request_url, function(results) {
+    const result = results[0];
+
     amount_usdt = result['usdt'];
     eth_amount = parseFloat(result['eth']);
     conv_rate = amount_usdt / amount;
@@ -137,7 +139,9 @@ var getAmountEstimate = function(usd_amount, denomination, callback) {
   }
   var request_url = '/sync/get_amount?amount=' + amount + '&denomination=' + denomination;
 
-  jQuery.get(request_url, function(result) {
+  jQuery.get(request_url, function(results) {
+    const result = results[0];
+
     amount_usdt = result['usdt'];
     eth_amount = parseFloat(result['eth']);
     conv_rate = amount_usdt / amount;
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index c8adf9cf9d1..65f6c3c1cbe 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -513,6 +513,26 @@ Vue.component('grants-cart', {
       return amount.div(factor).toString(10);
     },
 
+    async applyAmountToAllGrants(grant) {
+      const preferredAmount = grant.grant_donation_amount;
+      const preferredTokenName = grant.grant_donation_currency;
+      const fallbackAmount = await this.valueToEth(preferredAmount, preferredTokenName);
+
+      this.grantData.forEach((grant, index) => {
+        const acceptedCurrencies = this.currencies[index]; // tokens accepted by this grant
+
+        if (!acceptedCurrencies.includes(preferredTokenName)) {
+          // If the selected token is not available, fallback to ETH
+          this.grantData[index].grant_donation_amount = fallbackAmount;
+          this.grantData[index].grant_donation_currency = 'ETH';
+        } else {
+          // Otherwise use the user selected option
+          this.grantData[index].grant_donation_amount = preferredAmount;
+          this.grantData[index].grant_donation_currency = preferredTokenName;
+        }
+      });
+    },
+
     /**
      * @notice Checkout flow
      */
@@ -804,19 +824,23 @@ Vue.component('grants-cart', {
       return y_lower + (((y_upper - y_lower) * (x - x_lower)) / (x_upper - x_lower));
     },
 
-    async valueToDai(amount, tokenSymbol) {
+    valueToDai(amount, tokenSymbol, tokenPrices) {
+      const tokenIndex = tokenPrices.findIndex(item => item.token === tokenSymbol);
+      const amountOfOne = tokenPrices[tokenIndex].usdt; // value of 1 tokenSymbol
+
+      return Number(amount) * Number(amountOfOne); // convert based on quantity and return
+    },
+
+    async valueToEth(amount, tokenSymbol) {
       const url = `${window.location.origin}/sync/get_amount?amount=${amount}&denomination=${tokenSymbol}`;
       const response = await fetch(url);
       const newAmount = await response.json();
 
-      return newAmount.usdt;
+      return newAmount.eth;
     },
 
-    async predictCLRMatch(grant) {
-      const rawAmount = Number(grant.grant_donation_amount);
-      let amount = await this.valueToDai(rawAmount, grant.grant_donation_currency);
-
-      const clr_prediction_curve_2d = JSON.parse(grant.grant_clr_prediction_curve);
+    async predictCLRMatch(grant, amount) {
+      const clr_prediction_curve_2d = grant.grant_clr_prediction_curve;
       const clr_prediction_curve = clr_prediction_curve_2d.map(row => row[2]);
 
       if (amount > 10000) {
@@ -877,6 +901,12 @@ Vue.component('grants-cart', {
     grantData: {
       async handler() {
         CartData.setCart(this.grantData);
+        const tokenNames = Array.from(new Set(this.grantData.map(grant => grant.grant_donation_currency)));
+
+        const priceUrl = `${window.location.origin}/sync/get_amount?denomination=${tokenNames}`;
+        const priceResponse = await fetch(priceUrl);
+        const tokenPrices = (await priceResponse.json());
+
         for (let i = 0; i < this.grantData.length; i += 1) {
           const verification_required_to_get_match = false;
 
@@ -887,7 +917,16 @@ Vue.component('grants-cart', {
             this.grantData[i].grant_donation_clr_match = 0;
           } else {
             const grant = this.grantData[i];
-            const matchAmount = await this.predictCLRMatch(grant);
+            // Convert amount to DAI
+            const rawAmount = Number(grant.grant_donation_amount);
+            const STABLE_COINS = [ 'DAI', 'SAI', 'USDT', 'TUSD', 'aDAI', 'USDC' ];
+            // All stable coins are handled with USDT (see app/app/settings.py for list)
+            const tokenName = STABLE_COINS.includes(grant.grant_donation_currency)
+              ? 'USDT'
+              : grant.grant_donation_currency;
+
+            const amount = this.valueToDai(rawAmount, tokenName, tokenPrices);
+            const matchAmount = await this.predictCLRMatch(grant, amount);
 
             this.grantData[i].grant_donation_clr_match = matchAmount ? matchAmount.toFixed(2) : 0;
           }
@@ -922,6 +961,26 @@ Vue.component('grants-cart', {
     this.grantData = CartData.loadCart();
     // Initialize array of empty comments
     this.comments = this.grantData.map(grant => undefined);
+
+    // Get list of all grant IDs and unique tokens in the cart
+    const grantIds = this.grantData.map(grant => grant.grant_id);
+
+    // Fetch updated CLR curves for all grants
+    const url = `${window.location.origin}/grants/v1/api/clr?pks=${grantIds.join(',')}`;
+    const response = await fetch(url);
+    const clrCurves = (await response.json()).grants;
+
+    // Update CLR curves
+    this.grantData.forEach((grant, index) => {
+      // Find the clrCurves entry with the same grant ID as this grant
+      const clrIndex = clrCurves.findIndex(item => {
+        return Number(item.pk) === Number(grant.grant_id);
+      });
+
+      // Replace the CLR prediction curve
+      this.grantData[index].grant_clr_prediction_curve = clrCurves[clrIndex].clr_prediction_curve;
+    });
+
     // Wait until we can load token list
     let elapsedTime = 0;
     let delay = 50; // 50 ms debounce
diff --git a/app/assets/v2/js/grants/funding.js b/app/assets/v2/js/grants/funding.js
index 457c11cc8d4..486a35dcfc1 100644
--- a/app/assets/v2/js/grants/funding.js
+++ b/app/assets/v2/js/grants/funding.js
@@ -56,41 +56,84 @@ $(document).ready(function() {
   $('#close-side-cart').click(function() {
     hideSideCart();
   });
+
+  $('#side-cart-data').on('click', '#apply-to-all', async function() {
+    // Get preferred cart data
+    let cartData = CartData.loadCart();
+    const network = document.web3network || 'mainnet';
+    const selected_grant_index = $(this).data('id');
+    const preferredAmount = cartData[selected_grant_index].grant_donation_amount;
+    const preferredTokenName = cartData[selected_grant_index].grant_donation_currency;
+    const preferredTokenAddress = tokens(network)
+      .filter(token => token.name === preferredTokenName)
+      .map(token => token.addr)[selected_grant_index];
+
+    // Get fallback amount in ETH (used when token is not available for a grant)
+    const url = `${window.location.origin}/sync/get_amount?amount=${preferredAmount}&denomination=${preferredTokenName}`;
+    const response = await fetch(url);
+    const fallbackAmount = (await response.json()).eth;
+
+    // Update cart values
+    cartData.forEach((grant, index) => {
+      const acceptsAllTokens = (grant.grant_token_address === '0x0000000000000000000000000000000000000000');
+      const acceptsSelectedToken = grant.grant_token_address === preferredTokenAddress;
+
+      if (acceptsAllTokens || acceptsSelectedToken) {
+        // Use the user selected option
+        cartData[index].grant_donation_amount = preferredAmount;
+        cartData[index].grant_donation_currency = preferredTokenName;
+      } else {
+        // If the selected token is not available, fallback to ETH
+        cartData[index].grant_donation_amount = fallbackAmount;
+        cartData[index].grant_donation_currency = 'ETH';
+      }
+    }); // end cartData.forEach
+
+    // Update cart
+    CartData.setCart(cartData);
+    showSideCart();
+  });
 });
 
 // HELPERS
 
-function sideCartRowForGrant(grant) {
+function sideCartRowForGrant(grant, index) {
   let cartRow = `
-        <div id="side-cart-row-${grant.grant_id}" class="side-cart-row mb-3">
-            <div class="form-row mb-2">
-                <div class="col-2">
-                    <img src="${grant.grant_logo}" alt="Grant logo" width="40">
-                </div>
-                <div class="col-9">
-                    ${grant.grant_title}
-                </div>
-                <div class="col-1" style="opacity: 40%">
-                    <i id="side-cart-row-remove-${grant.grant_id}" class="fas fa-trash-alt" style="cursor: pointer"></i>
-                </div>
-            </div>
-            <div class="form-row">
-                <div class="col-2"></div>
-                <div class="col-5">
-                    <input type="number" id="side-cart-amount-${grant.grant_id}" class="form-control" value="${grant.grant_donation_amount}">
-                </div>
-                <div class="col-5">
-                    <select id="side-cart-currency-${grant.grant_id}" class="form-control">
+      <div id="side-cart-row-${grant.grant_id}" class="side-cart-row mb-3">
+        <div class="form-row mb-2">
+          <div class="col-2">
+            <img src="${grant.grant_logo}" alt="Grant logo" width="40">
+          </div>
+          <div class="col-9">
+              ${grant.grant_title}
+          </div>
+          <div class="col-1" style="opacity: 40%">
+            <i id="side-cart-row-remove-${grant.grant_id}" class="fas fa-trash-alt" style="cursor: pointer"></i>
+          </div>
+        </div>
+        <div class="form-row">
+          <div class="col-2"></div>
+          <div class="col-5">
+            <input type="number" id="side-cart-amount-${grant.grant_id}" class="form-control" value="${grant.grant_donation_amount}">
+          </div>
+          <div class="col-5">
+            <select id="side-cart-currency-${grant.grant_id}" class="form-control">
     `;
 
   cartRow += tokenOptionsForGrant(grant);
 
   cartRow += `
-                    </select>
-                </div>
-            </div>
+            </select>
+          </div>
         </div>
-    `;
+        <div class="form-row">
+          <div class="col-2"></div>
+          <div class="col-auto font-smaller-3 pt-1 text-highlight-gc-blue" style="cursor:pointer;" data-id="${index}" id="apply-to-all">
+            Apply to all
+          </div>
+        </div>
+      </div>
+  `;
 
   return cartRow;
 }
@@ -143,8 +186,8 @@ function showSideCart() {
   // Add all elements in side cart
   let cartData = CartData.loadCart();
 
-  cartData.forEach(grant => {
-    const cartRowHtml = sideCartRowForGrant(grant);
+  cartData.forEach((grant, index) => {
+    const cartRowHtml = sideCartRowForGrant(grant, index);
 
     $('#side-cart-data').append(cartRowHtml);
 
diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
index 9cca215e236..410821b5213 100644
--- a/app/assets/v2/js/shared.js
+++ b/app/assets/v2/js/shared.js
@@ -512,7 +512,8 @@ var retrieveAmount = function() {
   }
 
   // if not, use remote one
-  $.get(request_url, function(result) {
+  $.get(request_url, function(results) {
+    const result = results[0];
 
     // update UI
     var usd_amount = result['usdt'];
diff --git a/app/dashboard/helpers.py b/app/dashboard/helpers.py
index 759563debdf..6de8ae95e3d 100644
--- a/app/dashboard/helpers.py
+++ b/app/dashboard/helpers.py
@@ -127,25 +127,33 @@ def amount(request):
     response = {}
 
     try:
-        amount = str(request.GET.get('amount'))
+        amount = str(request.GET.get('amount', '1'))
+
         if not amount.replace('.','').isnumeric():
             return HttpResponseBadRequest('not number')
+
         denomination = request.GET.get('denomination', 'ETH')
-        if not denomination:
-            denomination = 'ETH'
+        tokens = denomination.split(',')
+
+        response = []
+
+        for token in tokens:
+            if token in settings.STABLE_COINS:
+                token = 'USDT'
+            if token == 'ETH':
+                amount_in_eth = float(amount)
+            else:
+                amount_in_eth = convert_amount(amount, token, 'ETH')
+            amount_in_usdt = convert_amount(amount_in_eth, 'ETH', 'USDT')
+
+            response.append({
+                'token': token,
+                'amount': float(amount),
+                'eth': amount_in_eth,
+                'usdt': amount_in_usdt
+            })
 
-        if denomination in settings.STABLE_COINS:
-            denomination = 'USDT'
-        if denomination == 'ETH':
-            amount_in_eth = float(amount)
-        else:
-            amount_in_eth = convert_amount(amount, denomination, 'ETH')
-        amount_in_usdt = convert_amount(amount_in_eth, 'ETH', 'USDT')
-        response = {
-            'eth': amount_in_eth,
-            'usdt': amount_in_usdt,
-        }
-        return JsonResponse(response)
+        return JsonResponse(response, safe=False)
     except ConversionRateNotFoundError as e:
         logger.debug(e)
         raise Http404
diff --git a/app/dashboard/tests/test_dashboard_helpers.py b/app/dashboard/tests/test_dashboard_helpers.py
index 0704eed8e3f..caaa5409f03 100644
--- a/app/dashboard/tests/test_dashboard_helpers.py
+++ b/app/dashboard/tests/test_dashboard_helpers.py
@@ -51,7 +51,7 @@ def test_amount(self):
         """Test the dashboard helper amount method."""
         params = {'amount': '5', 'denomination': 'ETH'}
         request = self.factory.get('/sync/get_amount', params)
-        assert amount(request).content == b'{"eth": 5.0, "usdt": 10.0}'
+        assert amount(request).content == b'[{"token": "ETH", "amount": 5, "eth": 5.0, "usdt": 10.0}]'
 
     def test_lowball_bounty(self):
         assert is_lowball_bounty(settings.LOWBALL_BOUNTY_THRESHOLD - 1.0)
diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index 7f933e3be5e..01c1d7a3b4b 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -142,6 +142,9 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                             </option>
                           </select2>
                         </div>
+                        <div class="font-smaller-2 hyperlink" @click="applyAmountToAllGrants(grant, index)">
+                          Apply to all
+                        </div>
                       </div>
                       {% comment %} Add comment {% endcomment %}
                       <div class="col-12 font-smaller-3" style="margin-top:1rem">
@@ -214,6 +217,11 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                           </option>
                         </select2>
                       </div>
+                      <div class="row flex-nowrap align-items-center justify-content-start">
+                        <div class="text-left font-smaller-2 hyperlink" @click="applyAmountToAllGrants(grant)">
+                          Apply to all
+                        </div>
+                      </div>
                     </div>
                     {% comment %} CLR Match Amount {% endcomment %}
                     <div class="col-2">
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 1e3d915afe7..8f5714c0d3b 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -21,8 +21,8 @@
 
 from grants.views import (
     flag, grant_activity, grant_categories, grant_details, grant_fund, grant_new, grant_new_whitelabel, grants,
-    grants_addr_as_json, grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_stats_view, invoice,
-    leaderboard, new_matching_partner, profile, quickstart, subscription_cancel,
+    grants_addr_as_json, grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_clr, grants_stats_view,
+    invoice, leaderboard, new_matching_partner, profile, quickstart, subscription_cancel,
 )
 
 app_name = 'grants'
@@ -57,4 +57,6 @@
     path('cart', grants_cart_view, name='cart'),
     path('<slug:grant_type>', grants_by_grant_type, name='grants_by_category2'),
     path('<slug:grant_type>/', grants_by_grant_type, name='grants_by_category'),
+    path('v1/api/clr', grants_clr, name='grants_clr'),
+
 ]
diff --git a/app/grants/views.py b/app/grants/views.py
index 1f967a4843f..1bad91401eb 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -394,17 +394,19 @@ def grants_by_grant_type(request, grant_type):
     title = matching_live + str(_('Grants'))
     has_real_grant_type = grant_type and grant_type != 'activity'
     grant_type_title_if_any = grant_type.title() if has_real_grant_type else ''
+
     if grant_type_title_if_any == "Media":
         grant_type_title_if_any = "Community"
-    if grant_type_title_if_any == "Change":
+    elif grant_type_title_if_any == "Change":
         grant_type_title_if_any = "Crypto for Black Lives"
-    grant_type_gfx_if_any = grant_type if has_real_grant_type else 'total'
+
     if has_real_grant_type:
         title = f"{matching_live} {grant_type_title_if_any.title()} {category.title()} Grants"
     if grant_type == 'stats':
         title = f"Round {clr_round} Stats"
     cht = []
     chart_list = ''
+
     try:
         what = 'all_grants'
         pinned = PinnedPost.objects.get(what=what)
@@ -1188,3 +1190,39 @@ def grant_activity(request, grant_id=None):
     return JsonResponse({
         'error': False
     })
+
+@require_GET
+def grants_clr(request):
+    response = {
+        'status': 400,
+        'message': 'error: Bad Request. Unable to fetch grant clr'
+    }
+
+    pks = request.GET.get('pks', None)
+
+    if not pks:
+        response['message'] = 'error: missing parameter pks'
+        return JsonResponse(response)
+
+    grants = []
+
+    try:
+        for grant in Grant.objects.filter(pk__in=pks.split(',')):
+           grants.append({
+               'pk': grant.pk,
+               'title': grant.title,
+               'clr_prediction_curve': grant.clr_prediction_curve
+           })
+    except Exception as e:
+        print(e)
+        response = {
+            'status': 500,
+            'message': 'error: something went wrong while fetching grants clr'
+        }
+        return JsonResponse(response)
+
+    response = {
+        'status': 200,
+        'grants': grants
+    }
+    return JsonResponse(response)

From a8a64dad4be548a1e15500d5722fc309e756b62d Mon Sep 17 00:00:00 2001
From: codingsh <codingsh@pm.me>
Date: Fri, 26 Jun 2020 00:14:19 -0300
Subject: [PATCH 54/75] feat: add news grants categorys (usability/devEx)
 (#6949)

- testing movie: https://share.getcloudapp.com/JruL1JDb
 #6948
---
 app/grants/models.py           |  2 ++
 app/grants/tests/test_views.py | 32 +++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index 5026a5f18d7..a30f953691a 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -89,6 +89,8 @@ def tech_categories():
             'community',
             'eth2.0',
             'eth1.x',
+            'devEx',
+            'usability',
         ]
 
     @staticmethod
diff --git a/app/grants/tests/test_views.py b/app/grants/tests/test_views.py
index 82bb013f7c4..02332be5db0 100644
--- a/app/grants/tests/test_views.py
+++ b/app/grants/tests/test_views.py
@@ -27,12 +27,14 @@ def test_fetching_grant_categories_from_api(self):
                 ['community',5],
                 ['eth2.0',6],
                 ['eth1.x',7],
-                ['twitter', 8],
-                ['reddit', 9],
-                ['blog', 10],
-                ['notes', 11],
-                ['COVID19 research',12],
-                ['COVID19 response',13]
+                ['devEx', 8],
+                ['usability', 9],
+                ['twitter', 10],
+                ['reddit', 11],
+                ['blog', 12],
+                ['notes', 13],
+                ['COVID19 research',14],
+                ['COVID19 response',15]
             ],
             'status': 200
         }
@@ -51,12 +53,14 @@ def test_retrieving_all_categories(self):
             ('community',5),
             ('eth2.0',6),
             ('eth1.x',7),
-            ('twitter', 8),
-            ('reddit',9),
-            ('blog',10),
-            ('notes',11),
-            ('COVID19 research',12),
-            ('COVID19 response',13)
+            ('devEx',8),
+            ('usability',9),
+            ('twitter', 10),
+            ('reddit',11),
+            ('blog',12),
+            ('notes',13),
+            ('COVID19 research',14),
+            ('COVID19 response',15)
         ]
 
         self.assertEqual(all_categories, expected_response)
@@ -72,7 +76,9 @@ def test_retrieving_tech_categories(self):
             ('wallets',4),
             ('community',5),
             ('eth2.0',6),
-            ('eth1.x',7)
+            ('eth1.x',7),
+            ('devEx', 8),
+            ('usability', 9)
         ]
 
         self.assertEqual(tech_categories, expected_response)

From a5818df32b64691cdbf3c20b97ef999d25b2be0e Mon Sep 17 00:00:00 2001
From: Matt <17163988+mds1@users.noreply.github.com>
Date: Thu, 25 Jun 2020 21:08:13 -0700
Subject: [PATCH 55/75] Fix parsing of fallback amount (#6997)

---
 app/assets/v2/js/cart.js           | 2 +-
 app/assets/v2/js/grants/funding.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 65f6c3c1cbe..fbc3f135d74 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -836,7 +836,7 @@ Vue.component('grants-cart', {
       const response = await fetch(url);
       const newAmount = await response.json();
 
-      return newAmount.eth;
+      return newAmount[0].eth;
     },
 
     async predictCLRMatch(grant, amount) {
diff --git a/app/assets/v2/js/grants/funding.js b/app/assets/v2/js/grants/funding.js
index 486a35dcfc1..1eb8595703a 100644
--- a/app/assets/v2/js/grants/funding.js
+++ b/app/assets/v2/js/grants/funding.js
@@ -71,7 +71,7 @@ $(document).ready(function() {
     // Get fallback amount in ETH (used when token is not available for a grant)
     const url = `${window.location.origin}/sync/get_amount?amount=${preferredAmount}&denomination=${preferredTokenName}`;
     const response = await fetch(url);
-    const fallbackAmount = (await response.json()).eth;
+    const fallbackAmount = (await response.json())[0].eth;
 
     // Update cart values
     cartData.forEach((grant, index) => {

From 257fb2e03b457acac252b553d3bf089324e39081 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 08:23:50 -0600
Subject: [PATCH 56/75] gitcoinbot is smart enough to know how much DAI
 equivilent is in carts

---
 app/marketing/management/commands/post_data.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/marketing/management/commands/post_data.py b/app/marketing/management/commands/post_data.py
index c78ac3dc43b..a65bb043ea8 100644
--- a/app/marketing/management/commands/post_data.py
+++ b/app/marketing/management/commands/post_data.py
@@ -27,6 +27,7 @@
 from django.utils import timezone
 
 from dashboard.models import Activity, Earning, Profile
+from economy.utils import convert_token_to_usdt
 from grants.models import *
 from grants.models import CartActivity, Contribution, PhantomFunding
 from grants.views import clr_round, next_round_start, round_end
@@ -254,9 +255,15 @@ def grants():
         for item in ca.metadata:
             currency, amount = item['grant_donation_currency'], item['grant_donation_amount']
             if currency not in amount_in_carts.keys():
-                amount_in_carts[currency] = 0
+                amount_in_carts[currency] = [0, 0]
             if amount:
-                amount_in_carts[currency] += float(amount)
+                usdt_amount = 0
+                try:
+                    usdt_amount = convert_token_to_usdt(currency) * float(amount)
+                except Exception as e:
+                    pass
+                amount_in_carts[currency][0] += float(amount)
+                amount_in_carts[currency][1] += float(usdt_amount)
 
     contributors = len(set(list(contributions.values_list('subscription__contributor_profile', flat=True)) + list(pfs.values_list('profile', flat=True))))
     amount = sum([float(contrib.subscription.amount_per_period_usdt) for contrib in contributions] + [float(pf.value) for pf in pfs])
@@ -264,9 +271,12 @@ def grants():
     pprint(f"Contributions: {total}")
     pprint(f"Contributors: {contributors}")
     pprint(f'Amount Raised: ${round(amount, 2)}')
-    pprint(f"In carts, but not yet checked out yet:")
+    total_usdt_in_carts = 0
     for key, val in amount_in_carts.items():
-        pprint(f"- {round(val, 2)} {key}")
+        total_usdt_in_carts += val[1]
+    pprint(f"{round(total_usdt_in_carts/1000, 1)}k DAI-equivilent in carts, but not yet checked out yet:")
+    for key, val in amount_in_carts.items():
+        pprint(f"- {round(val[0], 2)} {key} (worth {round(val[1], 2)} DAI)")
 
     ############################################################################3
     # top contributors

From f0898ee7651697beeb7513178b65ec38c3da7cab Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 08:24:56 -0600
Subject: [PATCH 57/75] increase main body of email size for connor

---
 .../migrations/0015_auto_20200626_1424.py      | 18 ++++++++++++++++++
 app/marketing/models.py                        |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 app/marketing/migrations/0015_auto_20200626_1424.py

diff --git a/app/marketing/migrations/0015_auto_20200626_1424.py b/app/marketing/migrations/0015_auto_20200626_1424.py
new file mode 100644
index 00000000000..f93c2d28ae3
--- /dev/null
+++ b/app/marketing/migrations/0015_auto_20200626_1424.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-06-26 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('marketing', '0014_upcomingdate'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='roundupemail',
+            name='body',
+            field=models.TextField(blank=True, max_length=15000),
+        ),
+    ]
diff --git a/app/marketing/models.py b/app/marketing/models.py
index 8b480770c6d..e7a121c8ca8 100644
--- a/app/marketing/models.py
+++ b/app/marketing/models.py
@@ -396,7 +396,7 @@ class RoundupEmail(SuperModel):
     from_email = models.EmailField(max_length=255)
     from_name = models.CharField(max_length=255)
     subject = models.CharField(max_length=255)
-    body = models.TextField(max_length=5000, blank=True)
+    body = models.TextField(max_length=15000, blank=True)
     kudos_ids = models.CharField(max_length=255, help_text="kudosid1,kudosid2,kudosid3")
     highlights = JSONField(default=dict, blank=True)
     sponsor = JSONField(default=dict, blank=True)

From 07664dff854dece2a3e22e83551004c668847d65 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 08:37:36 -0600
Subject: [PATCH 58/75] updates data script

---
 .../management/commands/post_data.py          | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/marketing/management/commands/post_data.py b/app/marketing/management/commands/post_data.py
index a65bb043ea8..e9f6312bfc3 100644
--- a/app/marketing/management/commands/post_data.py
+++ b/app/marketing/management/commands/post_data.py
@@ -284,6 +284,7 @@ def grants():
 
     all_contributors_by_amount = {}
     all_contributors_by_num = {}
+    all_contributions_by_token = {}
     for contrib in contributions:
         key = contrib.subscription.contributor_profile.handle
         if key not in all_contributors_by_amount.keys():
@@ -293,10 +294,18 @@ def grants():
         all_contributors_by_num[key] += 1
         all_contributors_by_amount[key] += contrib.subscription.amount_per_period_usdt
 
+        key = contrib.subscription.token_symbol
+        if key not in all_contributions_by_token.keys():
+            all_contributions_by_token[key] = 0
+        all_contributions_by_token[key] += contrib.subscription.amount_per_period_usdt
+
+
     all_contributors_by_num = sorted(all_contributors_by_num.items(), key=operator.itemgetter(1))
-    all_contributors_by_amount = sorted(all_contributors_by_amount.items(), key=operator.itemgetter(1))
     all_contributors_by_num.reverse()
+    all_contributors_by_amount = sorted(all_contributors_by_amount.items(), key=operator.itemgetter(1))
     all_contributors_by_amount.reverse()
+    all_contributions_by_token = sorted(all_contributions_by_token.items(), key=operator.itemgetter(1))
+    all_contributions_by_token.reverse()
 
     pprint("")
     pprint("=======================")
@@ -319,6 +328,16 @@ def grants():
         counter += 1
         pprint(f"{counter} - ${str(round(obj[1], 2))} by @{obj[0]}")
 
+    pprint("")
+    pprint("=======================")
+    pprint("")
+
+    counter = 0
+    pprint(f"Contributions by Token (Round {clr_round})")
+    for obj in all_contributions_by_token[0:limit]:
+        counter += 1
+        pprint(f"{counter} - ${str(round(obj[1], 2))} in {obj[0]}")
+
 
 
     ############################################################################3

From 86fa6f2abadca4a6f806773c20e44976d5941c3f Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 08:51:10 -0600
Subject: [PATCH 59/75] fix for
 https://gitcoin.co/townsquare?tab=activity:309082

---
 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 fd0c0aef778..e12a983589f 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -9,7 +9,7 @@ $(document).ready(function() {
   // inserts links into the text where there are URLS detected
 
   function urlify(text) {
-    var urlRegex = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
+    var urlRegex = /https?:\/\/(www\.)?[-a-zA-Z0-9@:;,%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:;,%_\+.~#?&//=]*)/g;
 
     return text.replace(urlRegex, function(url) {
       return '<a target=blank rel=nofollow href="' + url + '">' + url + '</a>';

From 3af9b4c1b290fd4a70d93d70f02948f051f6e57c Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 09:01:31 -0600
Subject: [PATCH 60/75] make account financials GA

---
 app/marketing/views.py                     | 25 ++++++++++++----------
 app/retail/templates/settings/account.html |  4 +---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/marketing/views.py b/app/marketing/views.py
index 78b764045b5..a01900c2be1 100644
--- a/app/marketing/views.py
+++ b/app/marketing/views.py
@@ -767,19 +767,22 @@ def tax_settings(request):
         # set it to the last location registered for the user
         location_components = profile.locations[-1]
         if 'city' in location_components:
-            location += location_components['city']
+            if location_components['city']:
+                location += location_components['city']
         if 'country_name' in location_components:
-            country_name = location_components['country_name']
-            if location:
-                location += ', ' + country_name
-            else:
-                location += country_name
+            if location_components['country_name']:
+                country_name = location_components['country_name']
+                if location:
+                    location += ', ' + country_name
+                else:
+                    location += country_name
         if 'country_code' in location_components:
-            country_code = location_components['country_code']
-            if location:
-                location += ', ' + country_code
-            else:
-                location += country_code
+            if location_components['country_code']:
+                country_code = location_components['country_code']
+                if location:
+                    location += ', ' + country_code
+                else:
+                    location += country_code
     
     #address is not empty
     if profile.address:
diff --git a/app/retail/templates/settings/account.html b/app/retail/templates/settings/account.html
index b2c96f32c89..0130765b3c3 100644
--- a/app/retail/templates/settings/account.html
+++ b/app/retail/templates/settings/account.html
@@ -98,9 +98,8 @@ <h5>{% trans "ETH Account Preferences" %}</h5>
   <input class='button button--primary' type='submit' name='submit' value="{% trans "Save" %}">
 </form>
 <div class="col-md-8 m-auto">
-  {% if is_alpha_tester %}
   <div class="form-group">
-    <h4 class="font-title mb-4 text-left">{% trans "Account Financials -- ALPHA" %}</h4>
+    <h4 class="font-title mb-4 text-left">{% trans "Account Financials" %}</h4>
   </div>
   <div class="form-group mb-4">
     <div class="major_button_container">
@@ -124,7 +123,6 @@ <h5 class="font-subheader">{% trans "Export Spending" %} ({{profile.sent_earning
       <p class="font-body">{% trans "Export all of your spending for @" %}{{ github_handle }}</p>
     </div>
   </div>
-  {% endif %}
   <h4 class="font-title mb-4 text-left">{% trans "Profile Photo" %}</h4>
   <div class="profile-avatar row mx-0 px-0 major_button_container">
     <div class="col-12 col-md-5 pl-0 pr-0 text-center">

From 85837f998fc5aae3bcbdec7c62be6a4218db24b5 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 10:23:57 -0600
Subject: [PATCH 61/75] ingest grants txns with txid

---
 app/grants/admin.py               |   1 +
 app/grants/models.py              |   2 +
 scripts/debug/ingest_grant_txn.py | 113 ++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 scripts/debug/ingest_grant_txn.py

diff --git a/app/grants/admin.py b/app/grants/admin.py
index 5ab4c107a42..d34161413eb 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -235,6 +235,7 @@ class ContributionAdmin(GeneralAdmin):
     raw_id_fields = ['subscription']
     list_display = ['id', 'profile', 'created_on', 'grant', 'github_created_on', 'from_ip_address', 'etherscan_links', 'amount', 'token', 'tx_cleared', 'success']
     readonly_fields = ['etherscan_links', 'amount_per_period_to_gitcoin', 'amount_per_period_minus_gas_price', 'amount_per_period']
+    search_fields = ['tx_id', 'split_tx_id', 'subscription__token_symbol']
 
     def txn_url(self, obj):
         tx_id = obj.tx_id
diff --git a/app/grants/models.py b/app/grants/models.py
index 5026a5f18d7..13c8c2cfa7d 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -1135,6 +1135,8 @@ class Contribution(SuperModel):
         help_text=_('The why or why not validator passed'),
     )
 
+    def get_absolute_url(self):
+        return self.subscription.grant.url + '?tab=transactions'
 
     def __str__(self):
         """Return the string representation of this object."""
diff --git a/scripts/debug/ingest_grant_txn.py b/scripts/debug/ingest_grant_txn.py
new file mode 100644
index 00000000000..6777d44fd6f
--- /dev/null
+++ b/scripts/debug/ingest_grant_txn.py
@@ -0,0 +1,113 @@
+handle = ''
+txid = ''
+token = ''
+to_address = ''
+from_address = ''
+do_write = True
+
+import requests
+from economy.tx import headers
+from dashboard.models import Activity, Profile
+from grants.models import Contribution, Grant, Subscription
+from django.utils import timezone
+from economy.utils import convert_token_to_usdt
+
+profile = Profile.objects.get(handle=handle)
+
+endpoint = 'token-transfers' if token != '0x0' else 'ether-transfers'
+url = f'https://api.aleth.io/v1/{endpoint}?'
+if from_address:
+    url += '&filter[from]=' + from_address
+if to_address:
+    url += '&filter[to]=' + to_address
+if token:
+    url += '&filter[token]=' + token
+url += '&page%5Blimit%5D=100'
+
+transfers = requests.get(
+    url,
+    headers=headers
+).json()
+transfers = transfers.get('data', {})
+
+if txid:
+    transfers = [xfr for xfr in transfers if txid.lower() in str(xfr).lower()]
+
+print(f"got {len(transfers)} transfers")
+
+for xfr in transfers:
+    symbol = xfr['attributes']['symbol']
+    value = xfr['attributes']['value']
+    decimals = xfr['attributes']['decimals']
+    value_adjusted = int(value) / 10 **int(decimals)
+    to = xfr['relationships']['to']['data']['id']
+    grant = Grant.objects.filter(admin_address__iexact=to).order_by('-positive_round_contributor_count').first()
+    print(f"{value_adjusted}{symbol}  => {to}, {grant.url} ")
+
+    if do_write:
+
+        #ingest data
+        currency = symbol
+        amount = value_adjusted
+        usd_val = amount * convert_token_to_usdt(symbol)
+
+        # convert formats
+        try:
+            date = timezone.now()
+
+            # create objects
+            validator_comment = f"created by ingest grant txn script"
+            subscription = Subscription()
+            subscription.is_postive_vote = True
+            subscription.active = False
+            subscription.error = True
+            subscription.contributor_address = '/NA'
+            subscription.amount_per_period = amount
+            subscription.real_period_seconds = 2592000
+            subscription.frequency = 30
+            subscription.frequency_unit = 'N/A'
+            subscription.token_address = '0x0'
+            subscription.token_symbol = currency
+            subscription.gas_price = 0
+            subscription.new_approve_tx_id = '0x0'
+            subscription.num_tx_approved = 1
+            subscription.network = 'mainnet'
+            subscription.contributor_profile = profile
+            subscription.grant = grant
+            subscription.comments = validator_comment
+            subscription.amount_per_period_usdt = usd_val
+            subscription.save()
+
+            contrib = Contribution.objects.create(
+                success=True,
+                tx_cleared=True,
+                tx_override=True,
+                tx_id=txid,
+                subscription=subscription,
+                validator_passed=True,
+                validator_comment=validator_comment,
+                )
+            print(f"ingested {subscription.pk} / {contrib.pk}")
+
+            metadata = {
+                'id': subscription.id,
+                'value_in_token': str(subscription.amount_per_period),
+                'value_in_usdt_now': str(round(subscription.amount_per_period_usdt,2)),
+                'token_name': subscription.token_symbol,
+                'title': subscription.grant.title,
+                'grant_url': subscription.grant.url,
+                'num_tx_approved': subscription.num_tx_approved,
+                'category': 'grant',
+            }
+            kwargs = {
+                'profile': profile,
+                'subscription': subscription,
+                'grant': subscription.grant,
+                'activity_type': 'new_grant_contribution',
+                'metadata': metadata,
+            }
+
+            Activity.objects.create(**kwargs)
+
+        except Exception as e:
+            print(e)

From 55ac45834e4135d4390a2a44b634f3bee4e930de Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 11:20:07 -0600
Subject: [PATCH 62/75] allows u to email grants contribs that failed

---
 .../commands/grant_txn_failed_email.py        |  2 +-
 app/grants/admin.py                           |  6 ++++++
 app/marketing/mails.py                        |  9 +++++----
 app/retail/emails.py                          | 20 +++++++++++++------
 app/retail/templates/admin/change_form.html   |  3 +++
 .../templates/emails/grant_txn_failed.html    | 11 +++++++++-
 6 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/app/dashboard/management/commands/grant_txn_failed_email.py b/app/dashboard/management/commands/grant_txn_failed_email.py
index cea356c3898..c0f974ea54a 100644
--- a/app/dashboard/management/commands/grant_txn_failed_email.py
+++ b/app/dashboard/management/commands/grant_txn_failed_email.py
@@ -29,4 +29,4 @@ def handle(self, *args, **options):
         failed_contribs = Contribution.objects.exclude(validator_passed=True)
 
         for failed_contrib in failed_contribs:
-            grant_txn_failed(failed_contrib.subscription.contributor_profile, failed_contrib.subscription.grant, failed_contrib.tx_id)
+            grant_txn_failed(failed_contrib)
diff --git a/app/grants/admin.py b/app/grants/admin.py
index d34161413eb..8f50508d09d 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -283,6 +283,12 @@ def amount_per_period_minus_gas_price(self, instance):
 
     def response_change(self, request, obj):
         from django.shortcuts import redirect
+        if "_notify_contribution_failure" in request.POST:
+            from marketing.mails import grant_txn_failed
+            grant_txn_failed(obj)
+            obj.validator_comment += f"User Notified {timezone.now()}"
+            obj.save()
+            self.message_user(request, "notified user of failure")
         if "_update_tx_status" in request.POST:
             obj.update_tx_status()
             obj.save()
diff --git a/app/marketing/mails.py b/app/marketing/mails.py
index e5f83798d1c..90a4e6ddb96 100644
--- a/app/marketing/mails.py
+++ b/app/marketing/mails.py
@@ -288,12 +288,13 @@ def grant_cancellation(grant, subscription):
     finally:
         translation.activate(cur_language)
 
-def grant_txn_failed(profile, grant, tx_id):
+def grant_txn_failed(failed_contrib):
+    profile, grant, tx_id = failed_contrib.subscription.contributor_profile, failed_contrib.subscription.grant, failed_contrib.tx_id
+
     from_email = settings.CONTACT_EMAIL
     to_email = profile.email
     if not to_email:
-        if profile and profile.user:
-            to_email = profile.user.email
+        to_email = profile.email
     if not to_email:
         return
 
@@ -303,7 +304,7 @@ def grant_txn_failed(profile, grant, tx_id):
 
     try:
         setup_lang(to_email)
-        html, text = render_grant_txn_failed(to_email, grant, tx_id)
+        html, text = render_grant_txn_failed(failed_contrib)
         send_mail(from_email, to_email, subject, text, html, categories=['transactional', func_name()])
     finally:
         translation.activate(cur_language)
diff --git a/app/retail/emails.py b/app/retail/emails.py
index 6fb6d2eae7d..7e65d6483b0 100644
--- a/app/retail/emails.py
+++ b/app/retail/emails.py
@@ -890,15 +890,23 @@ def render_grant_recontribute(to_email, prev_round_start=(2020, 3, 23), prev_rou
 
     return response_html, response_txt
 
-def render_grant_txn_failed(to_email, grant, tx_id):
-    email_style = 27
 
+def render_grant_txn_failed(contribution):
+    email_style = 27
+    contributions = Contribution.objects.none()
+    tx_id = contribution.tx_id
+    if contribution.tx_id:
+        contributions = Contribution.objects.filter(tx_id=contribution.tx_id)
+    elif contribution.split_tx_id:
+        tx_id = contribution.split_tx_id
+        contributions = Contribution.objects.filter(split_tx_id=contribution.split_tx_id)
+
+    grants = [ele.subscription.grant for ele in contributions if ele.subscription]
     params = {
-        'id': grant.id,
-        'grant_title': grant.title,
+        'grants': grants,
         'tx_id': tx_id,
         'tx_url': "https://etherscan.io/tx/"+tx_id,
-        'bulk_add_url': "https://gitcoin.co/grants/cart/bulk-add/" + str(grant.id),
+        'bulk_add_url': "https://gitcoin.co/grants/cart/bulk-add/" + ",".join([str(ele.id) for ele in grants]),
         'email_style': email_style,
         'hide_bottom_logo': True,
     }
@@ -1399,7 +1407,7 @@ def grant_recontribute(request):
     
 def grant_txn_failed(request):
     failed_contrib = Contribution.objects.filter(subscription__contributor_profile__user__email=settings.CONTACT_EMAIL).exclude(validator_passed=True).first()
-    response_html, _ = render_grant_txn_failed(settings.CONTACT_EMAIL, failed_contrib.subscription.grant, failed_contrib.tx_id)
+    response_html, _ = render_grant_txn_failed(failed_contrib)
     return HttpResponse(response_html)
 
 @staff_member_required
diff --git a/app/retail/templates/admin/change_form.html b/app/retail/templates/admin/change_form.html
index c7813c381c3..841f42e5596 100644
--- a/app/retail/templates/admin/change_form.html
+++ b/app/retail/templates/admin/change_form.html
@@ -22,6 +22,9 @@
             <input type="submit" value="Make into Bulk Transfer Coupon" name="btc_coupon" value="1">
         {% elif 'grants/contribution' in request.build_absolute_uri %}
             <input type="submit" value="Pull Contrib Status" name="_update_tx_status" value="1">
+            {% if not original.success %}
+                <input type="submit" value="Notify User of Contribution Failure" name="_notify_contribution_failure" value="1">
+            {% endif %}
         {% elif 'kudos/tokenrequest' in request.build_absolute_uri %}
             <input type="submit" value="Change Owner + Mint + Sync Kudos" name="_change_owner_mint_kudos" value="1">
             <input type="submit" value="Mint + Sync Kudos" name="_mint_kudos" value="1">
diff --git a/app/retail/templates/emails/grant_txn_failed.html b/app/retail/templates/emails/grant_txn_failed.html
index be3b3d837c5..27e30a31107 100644
--- a/app/retail/templates/emails/grant_txn_failed.html
+++ b/app/retail/templates/emails/grant_txn_failed.html
@@ -33,13 +33,22 @@
   .grant-txn-id a {
     overflow-wrap: break-word;
   }
+  .grant-txn-msg li,
+  .grant-txn-msg a{
+    line-height: 16px;
+    margin-top: 3px;
+    margin-bottom: 10px;
+  }
 </style>
 
 <h1>Grants transaction failed, try again?</h1>
 
 <div class="grant-txn-msg">
   <p>
-    Your contribution to <b>{{ grant_title }}</b> failed due to a technical issue.
+    Your contribution to these grants failed due to a technical issue.
+    {% for grant in grants %}
+      <li st><a href="{{grant.url}}">{{grant.title}}</a></li>
+    {% endfor %}
   </p>
 </div>
 

From e13f7a3bc5735112e402bab3343045692fbb0d68 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 11:23:33 -0600
Subject: [PATCH 63/75] make fix

---
 scripts/debug/ingest_grant_txn.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/debug/ingest_grant_txn.py b/scripts/debug/ingest_grant_txn.py
index 6777d44fd6f..e012054fcc4 100644
--- a/scripts/debug/ingest_grant_txn.py
+++ b/scripts/debug/ingest_grant_txn.py
@@ -5,12 +5,13 @@
 from_address = ''
 do_write = True
 
+from django.utils import timezone
+
 import requests
-from economy.tx import headers
 from dashboard.models import Activity, Profile
-from grants.models import Contribution, Grant, Subscription
-from django.utils import timezone
+from economy.tx import headers
 from economy.utils import convert_token_to_usdt
+from grants.models import Contribution, Grant, Subscription
 
 profile = Profile.objects.get(handle=handle)
 

From 64aaddfb52e737ef3dfbe294684963b70e1135e8 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 16:58:10 -0600
Subject: [PATCH 64/75] - Sybil scoring - better grants txn validation with
 total amount validation - more readable grant contribution links

---
 app/dashboard/admin.py                      | 11 +++-
 app/dashboard/models.py                     | 64 ++++++++++++++++++++-
 app/economy/tx.py                           |  6 +-
 app/grants/admin.py                         | 18 ++++--
 app/retail/templates/admin/change_form.html |  1 +
 5 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/app/dashboard/admin.py b/app/dashboard/admin.py
index 291060ed686..bbde508d843 100644
--- a/app/dashboard/admin.py
+++ b/app/dashboard/admin.py
@@ -171,10 +171,13 @@ class ProfileAdmin(admin.ModelAdmin):
     raw_id_fields = ['user', 'preferred_kudos_wallet', 'referrer', 'organizations_fk']
     ordering = ['-id']
     search_fields = ['email', 'data']
-    list_display = ['handle', 'created_on']
+    list_display = ['handle', 'user_sybil_score', 'created_on']
     readonly_fields = ['active_bounties_list', 'user_sybil_info']
     actions = [recalculate_profile]
 
+    def user_sybil_score(self, obj):
+        return f"{obj.sybil_score} ({obj.sybil_score_str})"
+
     def active_bounties_list(self, instance):
         interests = instance.active_bounties
         htmls = []
@@ -194,6 +197,12 @@ def user_sybil_info(self, instance):
 
     def response_change(self, request, obj):
         from django.shortcuts import redirect
+        if "_recalc_sybil" in request.POST:
+            Investigation.investigate_sybil(obj)
+            obj.calculate_all()
+            obj.save()
+            self.message_user(request, "Recalc done")
+            return redirect(obj.admin_url)
         if "_recalc_flontend" in request.POST:
             obj.calculate_all()
             obj.save()
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index eae31129253..4e7c925043d 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2755,7 +2755,37 @@ class Profile(SuperModel):
     def suggested_bounties(self):
         suggested_bounties = BountyRequest.objects.filter(tribe=self, status='o').order_by('created_on')
 
-        return suggested_bounties if suggested_bounties else []
+    @property
+    def sybil_score(self):
+        try:
+            investigation = self.investigations.filter(key='sybil')
+            if not investigation.exists():
+                return -1
+            investigation = investigation.first()
+            score = investigation.description.split("SYBIL_SCORE:")[1].split(' ')[1]
+            if 'SYBIL_SCORE' not in investigation.description:
+                return -1
+            return int(score)
+        except IndexError as e:
+            return -1
+        except Exception as e:
+            return -2
+
+    @property
+    def sybil_score_str(self):
+        _map = {
+            -2: 'Error',
+            -1: 'N/A',
+            0: 'Low',
+            2: 'Medium',
+            3: 'High',
+            4: 'Very High',
+            5: 'Very Very High',
+        }
+        score = self.sybil_score
+        if score > 5:
+            return 'Very Very High'
+        return _map.get(score, "Unknown") 
 
     @property
     def chat_num_unread_msgs(self):
@@ -5153,26 +5183,55 @@ def investigate_sybil(instance):
         from django.contrib.humanize.templatetags.humanize import naturaltime
         ipAddresses = (userActions.values('ip_address').annotate(Count("id")).order_by('-id__count'))
         cities = (userActions.values('location_data__city').annotate(Count("id")).order_by('-id__count'))
+        total_sybil_score = 0
+        if instance.squelches.filter(active=True).exists():
+            htmls.append('USER HAS ACTIVE SQUELCHES')
+            total_sybil_score += 3
+            htmls.append('(DINGx3)')
 
         htmls += [f"<a href=/_administrationdashboard/useraction/?profile={instance.pk}>View Recent User Actions</a><BR>"]
 
         htmls += [ f"Github Created: {instance.github_created_on.strftime('%Y-%m-%d')} ({naturaltime(instance.github_created_on)})<BR>"]
+
+        if instance.github_created_on > (timezone.now() - timezone.timedelta(days=7)):
+            htmls.append('New Github (DING)')
+            total_sybil_score += 1
+        if instance.github_created_on > (timezone.now() - timezone.timedelta(days=1)):
+            total_sybil_score += 1
+            htmls.append('VERY New Github (DING)')
+        if instance.created_on > (timezone.now() - timezone.timedelta(days=1)):
+            total_sybil_score += 1
+            htmls.append('New Profile (DING)')
+
         print(f" - preferred payout {time.time()}")
         if instance.preferred_payout_address:
             htmls.append('Preferred Payout Address')
             htmls.append(f' - {instance.preferred_payout_address}')
             other_Profiles = Profile.objects.filter(preferred_payout_address=instance.preferred_payout_address).exclude(pk=instance.pk).values_list('handle', flat=True)
+            if other_Profiles.count() > 0:
+                total_sybil_score += 1
+                htmls.append('Other Profiles with this addr (DING)')
+            if other_Profiles.count() > 3:
+                total_sybil_score += 1
+                htmls.append('Many other Profiles with this addr (DING)')
             url = f'/_administrationdashboard/profile/?preferred_payout_address={instance.preferred_payout_address}'
             htmls += [f" -- <a href={url}>{len(other_Profiles)} other profiles share this ppa: {', '.join(list(other_Profiles))}</a><BR>"]
 
         print(f" - ip ({len(ipAddresses)}) {time.time()}")
         htmls.append('IP Addresses')
         htmls.append("<div style='max-height: 300px; overflow-y: scroll'>")
+        ip_flagged = False
         for ip in ipAddresses:
             html = f"- <a href=/_administrationdashboard/useraction/?ip_address={ip['ip_address']}>{ip['ip_address']} ({ip['id__count']} Visits)</a>"
             other_Profiles = UserAction.objects.filter(ip_address=ip['ip_address'], profile__isnull=False).exclude(profile=instance).distinct('profile').values_list('profile__handle', flat=True)
             if len(other_Profiles):
                 html += f"<BR> -- {len(other_Profiles)} other profiles share this IP: {', '.join(list(other_Profiles))}"
+            if other_Profiles.count() > 0:
+                if not ip_flagged:
+                    ip_flagged = True
+                    total_sybil_score += 1
+                    htmls.append('Other Profiles with this IP Addr (DING)')
+
             htmls.append(html)
         htmls.append("</div>'")
 
@@ -5191,6 +5250,7 @@ def investigate_sybil(instance):
         for earning in earnings:
             html = f"- <a href={earning.admin_url}>{earning}</a>"
             htmls.append(html)
+            #TODO: if shared with a known sybil, then total_sybil_score += 1
         htmls.append("</div>'")
 
         sent_earnings = instance.sent_earnings.filter(network='mainnet').all()
@@ -5202,6 +5262,8 @@ def investigate_sybil(instance):
             htmls.append(html)
         htmls.append("</div>'")
 
+        htmls += [f"SYBIL_SCORE: {total_sybil_score} "]
+
         print(f" - End {time.time()}")
         htmls = ("<BR>".join(htmls))
         instance.investigations.filter(key='sybil').delete()
diff --git a/app/economy/tx.py b/app/economy/tx.py
index 2568a79acff..ffb145c6813 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -204,7 +204,7 @@ def grants_transaction_validator(contribution):
             delta1 = float(token_transfer['token_amount_decimal']) - float(contribution.subscription.amount_per_period_minus_gas_price)
             delta2 = float(token_transfer['token_amount_decimal']) - float(contribution.subscription.amount_per_period)
             threshold = float(float(abs(contribution.subscription.amount_per_period_minus_gas_price)) * float(validation_threshold_pct))
-            validation['passed'] = abs(delta1) <= threshold or abs(delta2) <= threshold
+            validation['passed'] = (abs(delta1) <= threshold or abs(delta2) <= threshold) or (abs(delta1) <= threshold_total or abs(delta2) <= threshold_total)
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 
 
@@ -254,6 +254,7 @@ def get_token_recipient_senders(recipient_address, token_address):
 auth = settings.ALETHIO_KEY
 headers = {'Authorization': f'Bearer {auth}'}
 validation_threshold_pct = 0.05
+validation_threshold_total = 0.05
 
 def get_token_originators(to_address, token, from_address='', return_what='transfers', tx_id='', amounts=[]):
     address = to_address
@@ -307,7 +308,8 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
             for amount in amounts:
                 delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
                 threshold = (float(abs(amount)) * validation_threshold_pct)
-                if delta < threshold:
+                threshold_total = (float(abs(amount)) * validation_threshold_total)
+                if delta < threshold or delta < threshold_total:
                     _this_is_the_one = True
             this_is_the_one = not len(amounts) or _this_is_the_one
             if this_is_the_one:
diff --git a/app/grants/admin.py b/app/grants/admin.py
index 8f50508d09d..be3d17026da 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -233,7 +233,7 @@ def error_email_copy_not_active(self, instance):
 class ContributionAdmin(GeneralAdmin):
     """Define the Contribution administration layout."""
     raw_id_fields = ['subscription']
-    list_display = ['id', 'profile', 'created_on', 'grant', 'github_created_on', 'from_ip_address', 'etherscan_links', 'amount', 'token', 'tx_cleared', 'success']
+    list_display = ['pk', 'created_on_nt', 'created_on', 'id', 'user_sybil_score', 'etherscan_links', 'amount_str', 'profile', 'grant', 'tx_cleared', 'success', 'validator_comment']
     readonly_fields = ['etherscan_links', 'amount_per_period_to_gitcoin', 'amount_per_period_minus_gas_price', 'amount_per_period']
     search_fields = ['tx_id', 'split_tx_id', 'subscription__token_symbol']
 
@@ -247,11 +247,21 @@ def txn_url(self, obj):
     def profile(self, obj):
         return format_html(f"<a href='/{obj.subscription.contributor_profile.handle}'>{obj.subscription.contributor_profile}</a>")
 
+    def created_on_nt(self, obj):
+        from django.contrib.humanize.templatetags.humanize import naturaltime
+        return naturaltime(obj.created_on)
+
+    def amount_str(self, obj):
+        return f"{round(obj.subscription.amount_per_period, 2)} {obj.subscription.token_symbol} (${round(obj.subscription.amount_per_period_usdt,2)})"
+
     def token(self, obj):
         return obj.subscription.token_symbol
 
+    def user_sybil_score(self, obj):
+        return f"{obj.subscription.contributor_profile.sybil_score} ({obj.subscription.contributor_profile.sybil_score_str})"
+
     def grant(self, obj):
-        return obj.subscription.grant.title
+        return mark_safe(f"<a href={obj.subscription.grant.url}>{obj.subscription.grant.title}</a>")
 
     def amount(self, obj):
         return obj.subscription.amount_per_period
@@ -268,8 +278,8 @@ def from_ip_address(self, instance):
         return " , ".join(visits)
 
     def etherscan_links(self, instance):
-        html = f"<a href='https://etherscan.io/tx/{instance.tx_id}' target=new>TXID: {instance.tx_id}</a><BR>"
-        html += f"<a href='https://etherscan.io/tx/{instance.split_tx_id}' target=new>SPLITTXID: {instance.split_tx_id}</a>"
+        html = f"<a href='https://etherscan.io/tx/{instance.tx_id}' target=new>TXID: {instance.tx_id[0:25]}...</a><BR>"
+        html += f"<a href='https://etherscan.io/tx/{instance.split_tx_id}' target=new>SPLITTXID: {instance.split_tx_id[0:25]}...</a>"
         return mark_safe(html)
 
     def amount_per_period(self, instance):
diff --git a/app/retail/templates/admin/change_form.html b/app/retail/templates/admin/change_form.html
index 841f42e5596..4eaa299a331 100644
--- a/app/retail/templates/admin/change_form.html
+++ b/app/retail/templates/admin/change_form.html
@@ -5,6 +5,7 @@
     <div class="submit-row">
         {% if 'dashboard/profile' in request.build_absolute_uri %}
             <input type="submit" value="Impersonate" name="_impersonate" value="1">
+            <input type="submit" value="Recalculate Sybil Investigation" name="_recalc_sybil" value="1">
             <input type="submit" value="Recalculate Profile Frontend" name="_recalc_flontend" value="1">
         {% elif 'dashboard/activity' in request.build_absolute_uri %}
             <input type="submit" value="Make Into Nano Bounty" name="_make_nano_bounty" value="1">

From 3fb83779e4d65487c9a2b2a47eb2e1505cf548e2 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 17:13:32 -0600
Subject: [PATCH 65/75] makes sybil score a first class part of profiles

---
 app/dashboard/admin.py                        |  1 -
 .../management/commands/investigate_sybil.py  |  1 +
 .../migrations/0124_profile_sybil_score.py    | 18 ++++++++++++++++++
 app/dashboard/models.py                       | 19 +++----------------
 4 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 app/dashboard/migrations/0124_profile_sybil_score.py

diff --git a/app/dashboard/admin.py b/app/dashboard/admin.py
index bbde508d843..ed678f454e2 100644
--- a/app/dashboard/admin.py
+++ b/app/dashboard/admin.py
@@ -199,7 +199,6 @@ def response_change(self, request, obj):
         from django.shortcuts import redirect
         if "_recalc_sybil" in request.POST:
             Investigation.investigate_sybil(obj)
-            obj.calculate_all()
             obj.save()
             self.message_user(request, "Recalc done")
             return redirect(obj.admin_url)
diff --git a/app/dashboard/management/commands/investigate_sybil.py b/app/dashboard/management/commands/investigate_sybil.py
index b935d68694c..796796ef9ba 100644
--- a/app/dashboard/management/commands/investigate_sybil.py
+++ b/app/dashboard/management/commands/investigate_sybil.py
@@ -35,5 +35,6 @@ def handle(self, *args, **options):
             start_time = time.time()
             print(f"{profile.pk} at {round(start_time,2)}")
             Investigation.investigate_sybil(profile)
+            profile.save()
             the_time = time.time() - start_time
             print(f"END {profile.pk} after {round(the_time,2)} s")
diff --git a/app/dashboard/migrations/0124_profile_sybil_score.py b/app/dashboard/migrations/0124_profile_sybil_score.py
new file mode 100644
index 00000000000..c17f92a71ed
--- /dev/null
+++ b/app/dashboard/migrations/0124_profile_sybil_score.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-06-26 23:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0123_auto_20200617_1549'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='sybil_score',
+            field=models.IntegerField(default=-1),
+        ),
+    ]
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index 4e7c925043d..4dcb5c8c11c 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2747,6 +2747,7 @@ class Profile(SuperModel):
     validation_attempts = models.PositiveSmallIntegerField(default=0, help_text=_('Number of generated SMS codes to validate account'))
     last_validation_request = models.DateTimeField(blank=True, null=True, help_text=_("When the user requested a code for last time "))
     encoded_number = models.CharField(max_length=255, blank=True, help_text=_('Number with the user validate the account'))
+    sybil_score = models.IntegerField(default=-1)
 
     objects = ProfileManager()
     objects_full = ProfileQuerySet.as_manager()
@@ -2755,22 +2756,6 @@ class Profile(SuperModel):
     def suggested_bounties(self):
         suggested_bounties = BountyRequest.objects.filter(tribe=self, status='o').order_by('created_on')
 
-    @property
-    def sybil_score(self):
-        try:
-            investigation = self.investigations.filter(key='sybil')
-            if not investigation.exists():
-                return -1
-            investigation = investigation.first()
-            score = investigation.description.split("SYBIL_SCORE:")[1].split(' ')[1]
-            if 'SYBIL_SCORE' not in investigation.description:
-                return -1
-            return int(score)
-        except IndexError as e:
-            return -1
-        except Exception as e:
-            return -2
-
     @property
     def sybil_score_str(self):
         _map = {
@@ -5273,6 +5258,8 @@ def investigate_sybil(instance):
             key='sybil',
         )
 
+        instance.sybil_score = total_sybil_score
+
 
 class ObjectView(SuperModel):
     """Records object views ."""

From 35c807b27af0a2ec62c75aaaf4cc3888811a5ecb Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 17:16:50 -0600
Subject: [PATCH 66/75] index users by sybvil score

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

diff --git a/app/dashboard/admin.py b/app/dashboard/admin.py
index ed678f454e2..e1e8465efa2 100644
--- a/app/dashboard/admin.py
+++ b/app/dashboard/admin.py
@@ -168,10 +168,10 @@ def recalculate_profile(modeladmin, request, queryset):
 recalculate_profile.short_description = "Recalculate Profile Frontend Info"
 
 class ProfileAdmin(admin.ModelAdmin):
+    list_display = ['handle', 'sybil_score', 'user_sybil_score', 'created_on']
     raw_id_fields = ['user', 'preferred_kudos_wallet', 'referrer', 'organizations_fk']
     ordering = ['-id']
     search_fields = ['email', 'data']
-    list_display = ['handle', 'user_sybil_score', 'created_on']
     readonly_fields = ['active_bounties_list', 'user_sybil_info']
     actions = [recalculate_profile]
 

From d5c2cdd3c4eca51bc2fdc3bc41569ed71f9bff76 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 17:19:44 -0600
Subject: [PATCH 67/75] quickie validation fix - hanging commit

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

diff --git a/app/economy/tx.py b/app/economy/tx.py
index ffb145c6813..aa550fa28fb 100644
--- a/app/economy/tx.py
+++ b/app/economy/tx.py
@@ -204,7 +204,7 @@ def grants_transaction_validator(contribution):
             delta1 = float(token_transfer['token_amount_decimal']) - float(contribution.subscription.amount_per_period_minus_gas_price)
             delta2 = float(token_transfer['token_amount_decimal']) - float(contribution.subscription.amount_per_period)
             threshold = float(float(abs(contribution.subscription.amount_per_period_minus_gas_price)) * float(validation_threshold_pct))
-            validation['passed'] = (abs(delta1) <= threshold or abs(delta2) <= threshold) or (abs(delta1) <= threshold_total or abs(delta2) <= threshold_total)
+            validation['passed'] = (abs(delta1) <= threshold or abs(delta2) <= threshold) or (abs(delta1) <= validation_threshold_total or abs(delta2) <= validation_threshold_total)
             validation['comment'] = f"Transfer Amount is off by {round(delta1, 2)} / {round(delta2, 2)}"
 
 
@@ -308,8 +308,7 @@ def get_token_originators(to_address, token, from_address='', return_what='trans
             for amount in amounts:
                 delta = abs(float(abs(_value_decimal)) - float(abs(amount)))
                 threshold = (float(abs(amount)) * validation_threshold_pct)
-                threshold_total = (float(abs(amount)) * validation_threshold_total)
-                if delta < threshold or delta < threshold_total:
+                if delta < threshold or delta < validation_threshold_total:
                     _this_is_the_one = True
             this_is_the_one = not len(amounts) or _this_is_the_one
             if this_is_the_one:

From 488693d7eae40d49cfc246f514092369b7a2ec10 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 17:23:06 -0600
Subject: [PATCH 68/75] str map; last one

---
 app/dashboard/models.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index 4dcb5c8c11c..0c98acdfedc 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2762,10 +2762,11 @@ def sybil_score_str(self):
             -2: 'Error',
             -1: 'N/A',
             0: 'Low',
+            1: 'Medium-Low',
             2: 'Medium',
-            3: 'High',
-            4: 'Very High',
-            5: 'Very Very High',
+            3: 'Medium-High',
+            4: 'High',
+            5: 'Very High',
         }
         score = self.sybil_score
         if score > 5:

From 74e8dd458d94fa0eda9b6fbc2a4ded01daf8bc66 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Fri, 26 Jun 2020 23:41:37 -0600
Subject: [PATCH 69/75] sybil info on profiles a few results updates, updates
 to kudos, megafunders => tribes

---
 app/dashboard/models.py                       | 16 +++--
 .../templates/profiles/activity_stats.html    |  5 ++
 .../templates/profiles/scorecard_funder.html  |  1 +
 app/grants/templates/grants/detail/info.html  |  2 +-
 app/retail/templates/results.html             | 58 +++++++++----------
 app/retail/templates/shared/footer.html       |  8 +--
 app/retail/utils.py                           | 37 +++++++++++-
 7 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index 0c98acdfedc..425e3dd5157 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -2752,6 +2752,14 @@ class Profile(SuperModel):
     objects = ProfileManager()
     objects_full = ProfileQuerySet.as_manager()
 
+    @property
+    def latest_sybil_investigation(self):
+        try:
+            return self.investigations.filter(key='sybil').first().description
+        except:
+            return ''
+
+
     @property
     def suggested_bounties(self):
         suggested_bounties = BountyRequest.objects.filter(tribe=self, status='o').order_by('created_on')
@@ -2762,15 +2770,15 @@ def sybil_score_str(self):
             -2: 'Error',
             -1: 'N/A',
             0: 'Low',
-            1: 'Medium-Low',
-            2: 'Medium',
-            3: 'Medium-High',
+            1: 'Med-Low',
+            2: 'Med',
+            3: 'Med-High',
             4: 'High',
             5: 'Very High',
         }
         score = self.sybil_score
         if score > 5:
-            return 'Very Very High'
+            return f'VeryX{score} High'
         return _map.get(score, "Unknown") 
 
     @property
diff --git a/app/dashboard/templates/profiles/activity_stats.html b/app/dashboard/templates/profiles/activity_stats.html
index 4e044cd518c..422c8ba70e0 100644
--- a/app/dashboard/templates/profiles/activity_stats.html
+++ b/app/dashboard/templates/profiles/activity_stats.html
@@ -1,4 +1,9 @@
 {% load humanize %}
+      {% if is_staff and profile.sybil_score != -1 %}
+          Sybil Risk: <b class="mb-0 mt-1">{{ profile.sybil_score_str }}</b>
+          <i class='fa fa-info-circle' data-placement="bottom" data-toggle="tooltip" data-html="true" title="Staff Only: {{profile.latest_sybil_investigation|safe}}"></i>
+      {% endif %}
+
 {% if not profile.is_org %}
   <li>
     Last Seen: 
diff --git a/app/dashboard/templates/profiles/scorecard_funder.html b/app/dashboard/templates/profiles/scorecard_funder.html
index 60c3c12c66a..5a7fa80e5d3 100644
--- a/app/dashboard/templates/profiles/scorecard_funder.html
+++ b/app/dashboard/templates/profiles/scorecard_funder.html
@@ -2,6 +2,7 @@
 <div class="col-12 col-lg-6">
   <div class="row">
     <div class="col-12 col-lg-6">
+
       <div class="profile-header__stats profile-header__stats--funder card mb-4">
         <div class="card-header font-subheader">
           <b class="mb-0 mt-1">{{ profile.rank_funder }}</b>
diff --git a/app/grants/templates/grants/detail/info.html b/app/grants/templates/grants/detail/info.html
index 8abcf78350f..2e0d111c952 100644
--- a/app/grants/templates/grants/detail/info.html
+++ b/app/grants/templates/grants/detail/info.html
@@ -97,7 +97,7 @@ <h1 class="font-title-xl my-4 font-weight-bold">
         <div class="font-body mb-2">
           <i style="width: 14px;" class="fab fa-twitter-square mr-2 text-center"></i>
           <p class="d-inline-block mb-0">
-            <a href="https://twitter.com/{{grant.twitter_handle_1}}" target="new" rel="nofollow"  data-toggle="tooltip" data-html="true" data-placement="top" title="Project Twitter Account">@{{grant.twitter_handle_1}}</a>
+            <a href="https://twitter.com/{{grant.twitter_handle_1}}" target="new" rel="nofollow"  data-toggle="tooltip" data-html="true" data-placement="top" title="Project Twitter Account">{{grant.twitter_handle_1}}</a>
           </p>
         </div>
       {% endif %}
diff --git a/app/retail/templates/results.html b/app/retail/templates/results.html
index 397b146869e..d4a1b44c9b1 100644
--- a/app/retail/templates/results.html
+++ b/app/retail/templates/results.html
@@ -264,10 +264,10 @@ <h2>Platform Activities</h2>
       </div>
     </div>
 
-    <div class="content-block content-block--grey">
+    <div class="content-block content-block--blue-grey">
       <div class="container">
         <h2 class="content-block__title">
-          {% trans "Top Organizations" %} {% if keyword %}({{keyword}}){% endif %}
+          {% trans "Top Tribes" %} {% if keyword %}({{keyword}}){% endif %}
         </h2>
         <div class="col-md-12 align-items-center">
           <div id="repo_repos">
@@ -281,7 +281,7 @@ <h2 class="content-block__title">
       </div>
     </div>
 
-    <div class="content-block content-block--blue-grey">
+    <div class="content-block content-block--white">
       <div class="container">
         <h2 class="content-block__title">
           {% trans "Top Funders" %} {% if keyword %}({{keyword}}){% endif %}
@@ -298,24 +298,6 @@ <h2 class="content-block__title">
       </div>
     </div>
 
-    <div class="content-block content-block--white">
-      <div class="container">
-        <h2 class="content-block__title">{% trans "Top Mega-Funders" %}</h2>
-
-        <div class="col-md-12 align-items-center">
-            <a class="mega-founder" href="https://ethereum.org" title="Ethereum Foundation">
-              <img data-src="{% static 'v2/images/metafunders/ethereum-foundation.png' %}" alts="Ethereum Foundation"  title="Ethereum Foundation">
-            </a>
-            <a class="mega-founder" href="https://ecf.network" title="Ethereum Community Fund">
-              <img data-src="{% static 'v2/images/metafunders/ecf_logo.svg' %}" alts="Ethereum Community Fund" title="Ethereum Community Fund">
-            </a>
-            <a class="mega-founder" href="http://consensys.net/" title="Consensys">
-              <img data-src="{% static 'v2/images/metafunders/consensys_logo.png' %}" alts="Consensys" title="Consensys">
-            </a>
-        </div>
-      </div>
-    </div>
-
 
     <div class="content-block content-block--grey">
       <div class="container">
@@ -392,20 +374,34 @@ <h2 class="bounty-list-title">{% trans "And By Skill" %}</h2>
     {% if not keyword and kudos_tokens %}
       <div class="content-block content-block--grey">
         <div class="container" id="bounty_universe">
-          <h2 class="content-block__title">{% trans "Top Kudos" %}</h2>
+          <h2 class="content-block__title m-1 p-1">{% trans "Top Kudos" %} ♢</h2>
 
           <div class="row">
-            <div class="col-12 offset-md-0 d-flex justify-content-center align-items-center p-3 ">
-              <p style="text-align: center; font-size: 0.9rem;">Kudos is a way of showing your appreciation for another Gitcoin member. It's also a way to showcase special skills that a member might have, such as Pythonista, or Design Star. Kudos tokens can also be bought and sold on the <a href="/kudos/marketplace">Kudos Marketplace</a>.</p>
+            <div class="col-12 offset-md-0 m-0 p-0 d-flex justify-content-center align-items-center p-3 ">
+              <p style="text-align: center; font-size: 0.9rem;">Kudos is a digital collectible + a way of showing your appreciation for another Gitcoin member. It's also a way to showcase special skills that a member might have, such as Pythonista, or Design Star. Kudos tokens can also be bought and sold on the <a href="/kudos/marketplace">Kudos Marketplace</a>.</p>
             </div>
-            <div class="col-md-12 p-3">
-              <div>
-                {% for kudos in kudos_tokens %}
-                  <a href="{{kudos.url}}" title="{{kudos.name}}">
-                    <img data-src="{{kudos.static_image}}" alts="{{kudos.name}}" title="{{kudos.name}}"  style="max-width: 100px; max-height: 100px; margin: 5px;">
-                  </a>
+            <div class="col-md-12 p-1">
+              {% for kudos_leaderboard in kudos_leaderboards %}
+              <h4 class="m-1 p-1">{{kudos_leaderboard.0}}</h4>
+                {% for kudos in kudos_leaderboard.1 %}
+                  <p>
+                    <a href="/{{kudos.0}}/kudos">
+                    <img style="height: 40px;
+                      width: 40px;" data-src="/dynamic/avatar/{{kudos.0}}">
+                      @{{kudos.0}}
+                    </a>
+                    has {{kudos_leaderboard.2}} {{kudos.2|length}} Kudos that have been sold for {{kudos.1}} ETH in {{kudos.3}} kudo transactions:
+                    <div>
+                      <a href="/{{kudos.0}}/kudos">
+                        {% for ele in kudos.2|slice:"0:50" %}
+                        <img style="height: 40px;
+                        width: 40px;" data-src="/dynamic/kudos/{{ele}}/slug">
+                        {% endfor %}
+                      </a>
+                    </div>
+                  </p>
                 {% endfor %}
-              </div>
+              {% endfor %}
             </div>
           </div>
         </div>
diff --git a/app/retail/templates/shared/footer.html b/app/retail/templates/shared/footer.html
index 4af7d2820d7..b0d363c4930 100644
--- a/app/retail/templates/shared/footer.html
+++ b/app/retail/templates/shared/footer.html
@@ -27,12 +27,9 @@
       </div>
       <div class="col-md-8">
         <div class="nav mb-3">
-          <a class="nav-link" href="{% url "medium" %}">
+          <a class="nav-link" href="/blog">
             <img {{prefix}}src="{% static "v2/images/social/medium.png" %}" alt="Medium">
           </a>
-          <a class="nav-link" href="{% url "gitter" %}">
-            <img {{prefix}}src="{% static "v2/images/social/gitter.png" %}" alt="Gitter">
-          </a>
           <a class="nav-link" href="{% url "github" %}">
             <img {{prefix}}src="{% static "v2/images/social/github.png" %}" alt="Github">
           </a>
@@ -48,9 +45,6 @@
           <a class="nav-link" href="{% url "landing_chat" %}">
             <img {{prefix}}src="{% static "v2/images/social/slack.png" %}" alt="Chat">
           </a>
-          <a class="nav-link" href="{% url "btctalk" %}">
-            <img {{prefix}}src="{% static "v2/images/bitcointalk.png" %}" alt="Bitcoin">
-          </a>
           <a class="nav-link" href="mailto:founders@gitcoin.co">
             <img {{prefix}}src="{% static "v2/images/social/mail.png" %}" alt="Mail">
           </a>
diff --git a/app/retail/utils.py b/app/retail/utils.py
index 43388fc9147..fb2b56d9d89 100644
--- a/app/retail/utils.py
+++ b/app/retail/utils.py
@@ -24,6 +24,7 @@
 import time
 
 from django.conf import settings
+from django.db import connection
 from django.templatetags.static import static
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -464,8 +465,7 @@ def build_stat_results(keyword=None):
     context['top_funders'] = base_leaderboard.filter(active=True, leaderboard='quarterly_payers') \
         .order_by('rank').values_list('github_username', flat=True)[0:num_to_show]
     pp.profile_time('funders')
-    context['top_orgs'] = base_leaderboard.filter(active=True, leaderboard='quarterly_orgs') \
-        .order_by('rank').values_list('github_username', flat=True)[0:num_to_show]
+    context['top_orgs'] = ['ethereumclassic', 'web3foundation', 'ethereum', 'arweave', 'zilliqa']
     pp.profile_time('orgs')
     context['top_coders'] = base_leaderboard.filter(active=True, leaderboard='quarterly_earners') \
         .order_by('rank').values_list('github_username', flat=True)[0:num_to_show]
@@ -494,10 +494,43 @@ def build_stat_results(keyword=None):
     context['bounty_history'] = json.dumps(bounty_history)
     pp.profile_time('bounty_history')
 
+
+ 
+
+    def get_kudos_leaderboard(key='kudos_token.artist'):
+        query = f"""
+            select
+                replace({key}, '@', '') as theusername,
+                sum(kudos_kudostransfer.amount) as amount,
+                string_agg( DISTINCT kudos_kudostransfer.kudos_token_cloned_from_id::varchar(255), ','),
+                count(1) as num
+            from kudos_kudostransfer
+                inner join kudos_token on kudos_kudostransfer.kudos_token_cloned_from_id = kudos_token.id
+                where {key} != ''
+                group by theusername
+                order by amount desc
+            limit 10
+
+"""
+        with connection.cursor() as cursor:
+            cursor.execute(query)
+            rows = []
+            for row in cursor.fetchall():
+                _row = [ele for ele in row] # cast to array
+                _row[2] = _row[2].split(',')
+                rows.append(_row)
+
+        return rows
+
     # Bounties
     from marketing.models import ManualStat
     completion_rate = get_completion_rate(keyword)
     funder_receiver_stats = get_funder_receiver_stats(keyword)
+    context['kudos_leaderboards'] = [
+        ['Top Kudos Artists 👩‍🎨', get_kudos_leaderboard('kudos_token.artist'), 'created'],
+        ['Top Kudos Collectors 🖼', get_kudos_leaderboard('kudos_kudostransfer.username'), 'collected'],
+        ['Top Kudos Senders 💌', get_kudos_leaderboard('kudos_kudostransfer.from_username'), 'sent']
+        ]
     context['funders'] = funder_receiver_stats['funders']
     context['avg_value'] = funder_receiver_stats['avg_value']
     context['median_value'] = funder_receiver_stats['median_value']

From ded931eef36905b3b7cffa0a4b4f79e16caff2c9 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Sun, 28 Jun 2020 08:39:27 -0600
Subject: [PATCH 70/75] adds total saturation of round type to stats, discards
 cart amounts above 1000 as trolling

---
 .../management/commands/post_data.py          | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/marketing/management/commands/post_data.py b/app/marketing/management/commands/post_data.py
index e9f6312bfc3..74cb8b1674b 100644
--- a/app/marketing/management/commands/post_data.py
+++ b/app/marketing/management/commands/post_data.py
@@ -251,6 +251,7 @@ def grants():
     current_carts = CartActivity.objects.filter(latest=True)
     num_carts = 0
     amount_in_carts = {}
+    discount_cart_amounts_over_this_threshold_usdt_as_insincere_trolling = 1000
     for ca in current_carts:
         for item in ca.metadata:
             currency, amount = item['grant_donation_currency'], item['grant_donation_amount']
@@ -262,8 +263,9 @@ def grants():
                     usdt_amount = convert_token_to_usdt(currency) * float(amount)
                 except Exception as e:
                     pass
-                amount_in_carts[currency][0] += float(amount)
-                amount_in_carts[currency][1] += float(usdt_amount)
+                if usdt_amount < discount_cart_amounts_over_this_threshold_usdt_as_insincere_trolling:
+                    amount_in_carts[currency][0] += float(amount)
+                    amount_in_carts[currency][1] += float(usdt_amount)
 
     contributors = len(set(list(contributions.values_list('subscription__contributor_profile', flat=True)) + list(pfs.values_list('profile', flat=True))))
     amount = sum([float(contrib.subscription.amount_per_period_usdt) for contrib in contributions] + [float(pf.value) for pf in pfs])
@@ -333,11 +335,42 @@ def grants():
     pprint("")
 
     counter = 0
-    pprint(f"Contributions by Token (Round {clr_round})")
+    pprint(f"Saturation by Token (Round {clr_round})")
     for obj in all_contributions_by_token[0:limit]:
         counter += 1
         pprint(f"{counter} - ${str(round(obj[1], 2))} in {obj[0]}")
 
+    pprint("")
+    pprint("=======================")
+    pprint("")
+
+    active_rounds = ['tech', 'media', 'change']
+    from grants.clr import TOTAL_POT_TECH, TOTAL_POT_MEDIA, TOTAL_POT_CHANGE
+    active_round_threshold = {
+        'tech': TOTAL_POT_TECH,
+        'media': TOTAL_POT_MEDIA,
+        'change': TOTAL_POT_CHANGE,
+    }
+    active_rounds_allocation = {key: 0 for key in active_rounds}
+    for ar in active_rounds:
+        grants = Grant.objects.filter(active=True, grant_type=ar, is_clr_eligible=True, hidden=False)
+        for grant in grants:
+            try:
+                active_rounds_allocation[ar] += grant.clr_prediction_curve[0][1]
+            except:
+                pass
+
+    counter = 0
+    pprint(f"Total Saturation of Matching Funds By Round Type (Round {clr_round})")
+    for key, val in active_rounds_allocation.items():
+        counter += 1
+        allocation_target = active_round_threshold[key]
+        allocation_pct = round(100 * val/allocation_target)
+        if key == 'media':
+            key = 'community' #hack
+        pprint(f"{counter} {key} - ${round(val, 2)} ({allocation_pct}% allocated)")
+
+
 
 
     ############################################################################3

From 39588c0ecf4d934c94a50d840fff99930b99f9f0 Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Sun, 28 Jun 2020 10:47:29 -0600
Subject: [PATCH 71/75] fix for
 https://sentry.io/organizations/gitcoin/issues/1731743431/?project=1398424&query=is%3Aunresolved+activity&statsPeriod=14d&utc=true

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

diff --git a/app/grants/views.py b/app/grants/views.py
index 1bad91401eb..290648f63ff 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -1175,6 +1175,9 @@ def grant_activity(request, grant_id=None):
     metadata = request.POST.get('metadata')
     bulk = request.POST.get('bulk') == 'true'
 
+    if not metadata:
+        return redirect('/grants/activity/')
+
     if not grant_id:
         grant = None
     else:

From 199b2daec9d56ec29c5338d7aca7259abbef4c6d Mon Sep 17 00:00:00 2001
From: owocki <ksowocki@gmail.com>
Date: Mon, 29 Jun 2020 06:48:45 -0600
Subject: [PATCH 72/75] request from V: clenaed up grants view

---
 app/grants/templates/grants/transaction.html | 58 +++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/app/grants/templates/grants/transaction.html b/app/grants/templates/grants/transaction.html
index 4e0e4ec3f2d..1076b7f57d8 100644
--- a/app/grants/templates/grants/transaction.html
+++ b/app/grants/templates/grants/transaction.html
@@ -1,7 +1,13 @@
 {% load static humanize i18n grants_extra %}
-  <div class="py-3 mx-sm-0 row transaction-history">
-    <div class="d-none d-sm-block col-2 font-subheader text-center text-md-left my-auto">
-      {{ transaction.created_on|date:"d M Y" }}
+  <div class="py-2 mx-sm-0 row transaction-history" style="{% if forloop.counter|divisibleby:2 %}background-color: #f4f4f4; border-radius: 10px;{% else %}{% endif %}">
+    <div class="d-none d-sm-block col-1 col-sm-3 col-md-2 font-subheader text-center text-md-left my-auto">
+    {% if is_staff %}
+    <a href="{{transaction.admin_url}}">
+    {% endif %}      
+      {{ transaction.created_on|date:"y/m/d" }}
+    {% if is_staff %}
+    </a>
+    {% endif %}      
     </div>
     <div class="col-3 col-sm-2 col-md-1 justify-content-center special_tag">
       {% if not anonymous %}
@@ -12,7 +18,7 @@
         <img class="avatar rounded-circle" src="/dynamic/avatar/Anonymous">
       {% endif %}
     </div>
-    <div class="col-5 col-sm-4 my-auto">
+    <div class="col-2 my-auto">
       <div class="font-weight-bold font-body">
         {% if not anonymous %}
           <a href="{% url 'profile' transaction.subscription.contributor_profile.handle %}">
@@ -22,16 +28,10 @@
          Anonymous
         {% endif %}
       </div>
-      <div class="info font-caption">
-        {{ transaction.subscription.amount_per_period_minus_gas_price|floatformat:4|intcomma }} {{ transaction.subscription.token_symbol }}
-        {% if not transaction.tx_cleared %} (Pending) {% endif %}
-        {% if not transaction.success %} (Failed) {% endif %}
-
-        {% if transaction.success and transaction.subscription.amount_per_period_to_gitcoin %} 
-        <BR>
-        (+{{transaction.subscription.amount_per_period_to_gitcoin}}  {{ transaction.subscription.token_symbol }} optional tip to <a href="https://gitcoin.co/grants/86/gitcoin-sustainability-fund">Gitcoin</a>) {% endif %}
-
-      </div>
+    </div>
+    <div class="col-1 my-auto tags font-caption">
+        {% if not transaction.tx_cleared %} <BR>(Pending) {% endif %}
+        {% if not transaction.success %} <BR>(Failed) {% endif %}
     </div>
     {% if not transaction.subscription.contributor_profile.hide_wallet_address %}
       <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
@@ -42,25 +42,29 @@
         </a>
       </div>
     {% endif %}
-      {% if is_staff %}
         <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
-          <a href="{{transaction.admin_url}}">[Staff]</a>
+          <div class="tag tag-lg token">
+            <p>
+              {{ transaction.subscription.amount_per_period_minus_gas_price|floatformat:2|intcomma }}
+              <span>{{ transaction.subscription.token_symbol }}</span>
+            </p>
+          </div>
+
         </div>
-     {% endif %}      
-    <div class="offset-lg-1 col-4 col-md-2 my-auto tags font-caption">
-      <div class="tag tag-lg token">
-        <p>
-          {{ transaction.subscription.amount_per_period_minus_gas_price|floatformat:4|intcomma }}
-          <span>{{ transaction.subscription.token_symbol }}</span>
-        </p>
-      </div>
-      {% if transaction.value_in_usdt_now %}
+    <div class="col-2 my-auto tags font-caption">
+      {% if transaction.normalized_data.amount_per_period_usdt %}
         <div class="tag tag-lg usd">
           <p>
-            {{ transaction.value_in_usdt_now }}
-            <span>USD</span>
+            (
+            $
+            {{ transaction.normalized_data.amount_per_period_usdt|floatformat:2 }} )
           </p>
         </div>
       {% endif %}
     </div>
+    <div class="col-1 my-auto d-none d-xl-block tags font-caption">
+        {% if transaction.success and transaction.subscription.amount_per_period_to_gitcoin %} 
+        (+{{transaction.subscription.amount_per_period_to_gitcoin|floatformat:2}}  {{ transaction.subscription.token_symbol }} => <a href="https://gitcoin.co/grants/86/gitcoin-sustainability-fund"> Grants Dev Fund</a>)
+        {% endif %}
+    </div>
   </div>
\ No newline at end of file

From 3a408e47beaa73dad0b9a2a731d34b71e01c558c Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Mon, 29 Jun 2020 22:02:49 +0900
Subject: [PATCH 73/75] fix test format

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

diff --git a/app/dashboard/tests/test_dashboard_helpers.py b/app/dashboard/tests/test_dashboard_helpers.py
index caaa5409f03..579add5a50c 100644
--- a/app/dashboard/tests/test_dashboard_helpers.py
+++ b/app/dashboard/tests/test_dashboard_helpers.py
@@ -51,7 +51,7 @@ def test_amount(self):
         """Test the dashboard helper amount method."""
         params = {'amount': '5', 'denomination': 'ETH'}
         request = self.factory.get('/sync/get_amount', params)
-        assert amount(request).content == b'[{"token": "ETH", "amount": 5, "eth": 5.0, "usdt": 10.0}]'
+        assert amount(request).content == b'[{"token": "ETH", "amount": 5.0, "eth": 5.0, "usdt": 10.0}]'
 
     def test_lowball_bounty(self):
         assert is_lowball_bounty(settings.LOWBALL_BOUNTY_THRESHOLD - 1.0)

From e283403126e7cea08337b458674c4834be07e620 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Tue, 30 Jun 2020 00:30:43 +0900
Subject: [PATCH 74/75] Embiggen grant image field (#7010)

* embiggen grant logo file field length

* add migration for grant logo length
---
 .../migrations/0064_auto_20200629_1114.py     | 19 +++++++++++++++++++
 app/grants/models.py                          |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 app/grants/migrations/0064_auto_20200629_1114.py

diff --git a/app/grants/migrations/0064_auto_20200629_1114.py b/app/grants/migrations/0064_auto_20200629_1114.py
new file mode 100644
index 00000000000..d3d715f525f
--- /dev/null
+++ b/app/grants/migrations/0064_auto_20200629_1114.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2020-06-29 11:14
+
+from django.db import migrations, models
+import grants.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0063_auto_20200622_1218'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='grant',
+            name='logo',
+            field=models.ImageField(blank=True, help_text='The Grant logo image.', max_length=500, null=True, upload_to=grants.utils.get_upload_filename),
+        ),
+    ]
diff --git a/app/grants/models.py b/app/grants/models.py
index 30fe7c85315..c8c989bf01d 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -161,6 +161,7 @@ class Meta:
         upload_to=get_upload_filename,
         null=True,
         blank=True,
+        max_length=500,
         help_text=_('The Grant logo image.'),
     )
     logo_svg = models.FileField(

From af2efa353ce271b1158b0ca09fcf4c9aa26a4b6a Mon Sep 17 00:00:00 2001
From: codingsh <codingsh@pm.me>
Date: Mon, 29 Jun 2020 12:32:04 -0300
Subject: [PATCH 75/75] feat: Grants Tweaks  (#6900)

* feat: Grants Tweaks #6883

* chore: fixed twitter link
---
 app/assets/v2/css/grants/grant.css            |  8 ++++++
 app/grants/templates/grants/cart-vue.html     | 28 ++++++-------------
 .../templates/grants/shared/landing_hero.html |  4 ++-
 .../templates/shared/grant_thanks_modal.html  |  7 +++--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/assets/v2/css/grants/grant.css b/app/assets/v2/css/grants/grant.css
index 812d96e1238..bfb9fc4595e 100644
--- a/app/assets/v2/css/grants/grant.css
+++ b/app/assets/v2/css/grants/grant.css
@@ -387,6 +387,14 @@
   color: white;
 }
 
+.grants-hero .amount-round{
+  color: #25E899;
+}
+
+.grants-hero .title-round{
+  font-size: 24px; 
+}
+
 .grants-hero .font-header,
 .grants-hero h1,
 .explore_grants {
diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index 01c1d7a3b4b..7b83e872fdd 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -417,29 +417,23 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                   <div class="mb-3">
                     <h1 class="font-bigger-4 font-weight-bold">Verify your phone number</h1>
                   </div>
-                  <p class="mb-2 font-subheader text-left"><strong>It's instant, private & secure.</strong></p>
-                  <p class="mb-4 font-subheader text-left">
-                  1) This process is optional.
                   <BR>
-                  2) Verifying increases your trust level + the impact of your contributions.
+                  <p class="mb-4 font-subheader text-left">We'd like to verify your phone number to get your contribution matched. Phone number verification is optional.</p>
                   <BR>
-                  3) You can still contribute to grants without verifying, but your matching impact may be reduced until you are verified, especially in cases of many contributions.
+                  <p class="mb-4 font-subheader text-left">Verifying increases your trust level and impact of your contributions. You can still contribute to grants without
+                  verifying your phone number, but your contribution impact will be reduced.</p>
                   <BR>
-                  4) Gitcoin has gone to <a target="_blank" rel="noopener noreferrer" class="gc-text-blue" href="https://twitter.com/owocki/status/1272149204287160320">extreme lengths to preserve your privacy</a>.  Please only verify your SMS on sites you know and trust.
+                  <p class="mb-4 font-subheader text-left">Gitcoin does NOT store your phone number.</p>
                   <BR>
-                  5) <a target="_blank" rel="noopener noreferrer" class="gc-text-blue" href="https://twitter.com/owocki/status/1271088915982675974">Click here to read more on why Gitcoin is asking for your SMS number.</a>
-                </p>
-
+                  <p class="mb-4 font-subheader text-left">read more about <a target="_blank" rel="noopener noreferrer" class="gc-text-blue font-smaller-1"
+                    href="https://twitter.com/owocki/status/1271088915982675974">why we are asking for your phone number</a> or how Gitcoin <a target="_blank" rel="noopener noreferrer" class="gc-text-blue font-smaller-1"
+                      href="https://twitter.com/owocki/status/1271088915982675974">preserves your privacy.</a></p>
                   <b-button @click="validationStep='requestVerification'" class="btn-gc-blue mb-2" size="lg">Verify
-                   Instantly</b-button>
-                  <p class="mb-1 font-subheader text-center font-smaller-2 grey">
-                    (For privacy preservation purposes, Gitcoin does NOT store your phone number <i class="fas fa-lock"></i>)
-                  </p>
+                   Phone Number</b-button>
                   <div class="mb-1 font-subheader text-center">
-                    - or -
                     <a id="verify_offline" href="#">
                     <br>
-                    Verify Offline</a>
+                    Verify Offline or</a>  <a href="#" @click="dismissVerification()" variant="link">Skip</a>
                     <div id='verify_offline_target' style="display:none">
                       <strong>Verify Offline</strong>
                       <BR>
@@ -447,10 +441,6 @@ <h1 class="font-bigger-4 font-weight-bold">Verify your phone number</h1>
                       <br>
                       IMPORTANT: Be sure to include (1) your gitcoin username (2) proof of ownership of a SMS number.
                     </div>
-                    <br>
-                    - or -
-                    <br>
-                    <a href="#" @click="dismissVerification()" variant="link">Skip</a>
                   </div>
                 </div>
                 <div class="mx-5 my-5 text-center" v-if="validationStep == 'requestVerification'">
diff --git a/app/grants/templates/grants/shared/landing_hero.html b/app/grants/templates/grants/shared/landing_hero.html
index d96484ae8fe..0b38fc63db5 100644
--- a/app/grants/templates/grants/shared/landing_hero.html
+++ b/app/grants/templates/grants/shared/landing_hero.html
@@ -4,7 +4,9 @@
           <div class="row">
             <div class="col-12 col-md-6 order-md-last mb-5 mb-md-0">
               <p class="p-3 font-header">
-                <strong style="font-size: 24px;">${{total_clr_pot|intcomma}} matching going on now.</strong>
+                <strong>
+                  <span class="title-round"><span class="amount-round">${{total_clr_pot|intcomma}}</span> matching going on now.</span>
+                </strong>
                 <BR>
                 Matching ends on {{round_end|date:'Y-m-d'}} at noon EST.
                 <span style="">(<span class="m-0" data-time="{{round_end|date:'c'}}" data-base_time="{{now|date:'Y-m-d H:i'}}"></span>) so contribute today!</span>
diff --git a/app/retail/templates/shared/grant_thanks_modal.html b/app/retail/templates/shared/grant_thanks_modal.html
index 53b6cc05a68..16d5e8ba411 100644
--- a/app/retail/templates/shared/grant_thanks_modal.html
+++ b/app/retail/templates/shared/grant_thanks_modal.html
@@ -49,9 +49,10 @@ <h5>Thanks for Contributing! You Earned a Kudos</h5>
                 {% trans "Tweet About this Grant" %} 🐦
               </a>
             {% else %}
-              <a class="button button--primary" role="button" href="https://twitter.com/intent/tweet?text=I just funded grants on @gitcoin => https://{{ request.META.HTTP_HOST }}/grants"
-                target="_blank" rel="noopener noreferrer" OnClick="ga('send', 'event', 'Tweet Button', 'click', 'Grant Funder')">
-                {% trans "Tweet About It" %} 🐦
+              <a class="button button--primary" role="button"
+                href="https://gitcoin.co/grants/"
+                target="_blank" rel="noopener noreferrer" OnClick="ga('send', 'event', 'Fund New Grant', 'click', 'Grant Funder')">
+                {% trans "Fund a New Grant" %}
               </a>
             {% endif %}
           </div>