From 6b76d0fab333a7232c0c39d43ed3a6b8e6968e70 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 16 Jun 2020 01:12:07 -0300
Subject: [PATCH 1/6] missing if in fbpixel

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

diff --git a/app/retail/templates/shared/fbpixel.html b/app/retail/templates/shared/fbpixel.html
index 9a2305de328..a27d2761e59 100644
--- a/app/retail/templates/shared/fbpixel.html
+++ b/app/retail/templates/shared/fbpixel.html
@@ -14,7 +14,7 @@
   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 %}
-{% not pref_do_not_track %}
+{% if not pref_do_not_track %}
 {% if env == 'prod' %}
 <!-- Facebook Pixel Code -->
 <script>

From 8a76daf1e0f05ac18d92e296df77e4a1f4ce4d76 Mon Sep 17 00:00:00 2001
From: Miguel Angel G <miguel@gordian.dev>
Date: Tue, 16 Jun 2020 19:31:17 -0500
Subject: [PATCH 2/6] Add tracking cart functionality

---
 app/assets/v2/js/cart-data.js                 | 37 ++++++++++++++++--
 app/assets/v2/js/cart.js                      |  2 +-
 app/assets/v2/js/shared.js                    | 12 ++++++
 app/grants/admin.py                           | 20 +++++++++-
 .../migrations/0058_auto_20200617_0028.py     | 38 +++++++++++++++++++
 app/grants/models.py                          | 17 +++++++++
 app/grants/templates/grants/index.html        |  5 ++-
 app/grants/urls.py                            |  3 +-
 app/grants/views.py                           | 21 +++++++++-
 9 files changed, 144 insertions(+), 11 deletions(-)
 create mode 100644 app/grants/migrations/0058_auto_20200617_0028.py

diff --git a/app/assets/v2/js/cart-data.js b/app/assets/v2/js/cart-data.js
index 1017e2f72c9..c6e60a619c0 100644
--- a/app/assets/v2/js/cart-data.js
+++ b/app/assets/v2/js/cart-data.js
@@ -25,9 +25,11 @@ class CartData {
       network = 'mainnet';
     }
     const acceptsAllTokens = (grantData.grant_token_address === '0x0000000000000000000000000000000000000000');
-    const accptedTokenName = tokenAddressToDetailsByNetwork(grantData.grant_token_address, network).name;
+    const acceptedTokenName = tokenAddressToDetailsByNetwork(grantData.grant_token_address, network).name;
 
-    if (acceptsAllTokens || 'DAI' == accptedTokenName) {
+    grantData.uuid = get_UUID();
+
+    if (acceptsAllTokens || 'DAI' == acceptedTokenName) {
       grantData.grant_donation_amount = 5;
       grantData.grant_donation_currency = 'DAI';
     } else {
@@ -42,13 +44,27 @@ class CartData {
 
     cartList.push(grantData);
     this.setCart(cartList);
+
+    fetchData(`/grants/${grantData.grant_id}/activity`, 'POST', {
+      action: 'ADD_ITEM',
+      metadata: JSON.stringify(grantData)
+    }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
   }
 
   static removeIdFromCart(grantId) {
     let cartList = this.loadCart();
 
     const newList = cartList.filter(grant => {
-      return (grant.grant_id !== grantId);
+      if (grant.grant_id === grantId) {
+        fetchData(`/grants/${grant.grant_id}/activity`, 'POST', {
+          action: 'REMOVE_ITEM',
+          metadata: JSON.stringify(grant)
+        }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
+
+        return false;
+      }
+
+      return true;
     });
 
     this.setCart(newList);
@@ -77,6 +93,21 @@ class CartData {
     this.setCart(cartList);
   }
 
+  static clearCart() {
+    let cartList = this.loadCart();
+
+    cartList.map(grant => {
+      fetchData(`/grants/${grant.grant_id}/activity`, 'POST', {
+        action: 'REMOVE_ITEM',
+        metadata: JSON.stringify(grant),
+        bulk: true
+      }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
+    });
+
+    localStorage.setItem('grants_cart', JSON.stringify([]));
+    applyCartMenuStyles();
+  }
+
   static loadCart() {
     const cartList = localStorage.getItem('grants_cart');
 
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 02b387ebd8e..ce0e045f0b1 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -338,7 +338,7 @@ Vue.component('grants-cart', {
     },
 
     clearCart() {
-      CartData.setCart([]);
+      CartData.clearCart();
       this.grantData = [];
       update_cart_title();
     },
diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
index f1b4f2b0167..261dff74a76 100644
--- a/app/assets/v2/js/shared.js
+++ b/app/assets/v2/js/shared.js
@@ -1235,3 +1235,15 @@ const fetchIssueDetailsFromGithub = issue_url => {
     });
   });
 };
+
+const get_UUID = () => {
+  var dt = new Date().getTime();
+  const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    const r = (dt + Math.random() * 16) % 16 | 0;
+
+    dt = Math.floor(dt / 16);
+    return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+  });
+
+  return uuid;
+};
diff --git a/app/grants/admin.py b/app/grants/admin.py
index b6d88bbe029..fdfe9382557 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -22,7 +22,7 @@
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
-from grants.models import CLRMatch, Contribution, Flag, Grant, MatchPledge, PhantomFunding, Subscription
+from grants.models import CLRMatch, Contribution, Flag, Grant, MatchPledge, PhantomFunding, Subscription, CartActivity
 
 
 class GeneralAdmin(admin.ModelAdmin):
@@ -143,7 +143,7 @@ def subscriptions_links(self, instance):
 
     def contributions_links(self, instance):
         """Define the logo image tag to be displayed in the admin."""
-        eles = []   
+        eles = []
 
         for i in [True, False]:
             html = f"<h3>Success {i}</h3>"
@@ -283,6 +283,21 @@ def from_ip_address(self, instance):
         return " , ".join(visits)
 
 
+class CartActivityAdmin(admin.ModelAdmin):
+    list_display = ['id', 'grant', 'profile', 'action', 'bulk', 'tracking', 'created_on']
+    raw_id_fields = ['grant', 'profile']
+    search_fields = ['bulk', 'action', 'grant']
+
+    def tracking(self, instance):
+        if instance.metadata:
+            try:
+                return instance.metadata['uuid']
+            except:
+                pass
+
+        return ''
+
+
 admin.site.register(PhantomFunding, PhantomFundingAdmin)
 admin.site.register(MatchPledge, MatchPledgeAdmin)
 admin.site.register(Grant, GrantAdmin)
@@ -290,3 +305,4 @@ def from_ip_address(self, instance):
 admin.site.register(CLRMatch, CLRMatchAdmin)
 admin.site.register(Subscription, SubscriptionAdmin)
 admin.site.register(Contribution, ContributionAdmin)
+admin.site.register(CartActivity, CartActivityAdmin)
diff --git a/app/grants/migrations/0058_auto_20200617_0028.py b/app/grants/migrations/0058_auto_20200617_0028.py
new file mode 100644
index 00000000000..1b4444e538c
--- /dev/null
+++ b/app/grants/migrations/0058_auto_20200617_0028.py
@@ -0,0 +1,38 @@
+# Generated by Django 2.2.4 on 2020-06-17 00:28
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+import economy.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0122_merge_20200612_2059'),
+        ('grants', '0057_auto_20200527_1413'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='grant',
+            name='grant_type',
+            field=models.CharField(choices=[('tech', 'tech'), ('health', 'health'), ('Community', 'media'), ('Crypto for Black Lives', 'change'), ('matic', 'matic')], default='tech', help_text='Grant CLR category', max_length=15),
+        ),
+        migrations.CreateModel(
+            name='CartActivity',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)),
+                ('modified_on', models.DateTimeField(default=economy.models.get_time)),
+                ('action', models.CharField(choices=[('ADD_ITEM', 'Add item to cart'), ('REMOVE_ITEM', 'Remove item to cart')], help_text='Type of activity', max_length=20)),
+                ('metadata', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, help_text='Related data to the action')),
+                ('bulk', models.BooleanField(default=False)),
+                ('grant', models.ForeignKey(help_text='Related Grant Activity ', on_delete=django.db.models.deletion.CASCADE, related_name='cart_actions', to='grants.Grant')),
+                ('profile', models.ForeignKey(help_text='User Cart Activity', on_delete=django.db.models.deletion.CASCADE, related_name='cart_activity', to='dashboard.Profile')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/app/grants/models.py b/app/grants/models.py
index 58239a02141..75dc5af3aa1 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -1381,3 +1381,20 @@ def to_mock_contribution(self):
         context['tx_cleared'] = True
         context['success'] = True
         return context
+
+
+class CartActivity(SuperModel):
+    ACTIONS = (
+        ('ADD_ITEM', 'Add item to cart'),
+        ('REMOVE_ITEM', 'Remove item to cart')
+    )
+    grant = models.ForeignKey(Grant, on_delete=models.CASCADE, related_name='cart_actions',
+                              help_text=_('Related Grant Activity '))
+    profile = models.ForeignKey('dashboard.Profile', on_delete=models.CASCADE, related_name='cart_activity',
+                                help_text=_('User Cart Activity'))
+    action = models.CharField(max_length=20, choices=ACTIONS, help_text=_('Type of activity'))
+    metadata = JSONField(default=dict, blank=True, help_text=_('Related data to the action'))
+    bulk = models.BooleanField(default=False)
+
+    def __str__(self):
+        return f'{self.action} {self.grant.id} from the cart {self.profile.handle}'
diff --git a/app/grants/templates/grants/index.html b/app/grants/templates/grants/index.html
index 7e3dd9ecc34..6e093fdeac4 100644
--- a/app/grants/templates/grants/index.html
+++ b/app/grants/templates/grants/index.html
@@ -47,7 +47,7 @@
                   <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 prev_grant in prev_grants %}{{prev_grant.pk}},{% endfor %}">+
                     Add to Cart</a>
                   <p class="mb-2">Want to contribute to <a href="https://vitalik.ca/general/2020/04/30/round5.html" target="_blank">stability of ecosystem funding</a>? You funded {{prev_grants.count}} grant{{ prev_grants.count|pluralize }} last time. Fund
-                    them again?</p> 
+                    them again?</p>
                   <span class="font-smaller-3">{% for prev_grant in prev_grants %}
                   <a href="{{prev_grant.url}}">{{prev_grant.title}}</a>
                   {% if not forloop.last %}{% ifequal forloop.revcounter 2 %} and {% else %}, {% endifequal %}{% else %}{% endif %}
@@ -89,6 +89,7 @@
             </div>
           </div>
         </div>
+        {% csrf_token %}
       </div>
       <div id="side-cart" class="grant-side-cart px-5 px-md-4 pb-5 pb-md-0 pt-md-0" style="display: none;">
         {% include 'grants/detail/side-cart.html' %}
@@ -126,4 +127,4 @@
 {% endif %}
 
 
-</html>
\ No newline at end of file
+</html>
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 404835556a1..ab50d339a2a 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -22,7 +22,7 @@
 from grants.views import (
     flag, grant_categories, grant_details, grant_fund, grant_new, grant_new_whitelabel, grants, grants_addr_as_json,
     grants_bulk_add, grants_cart_view, grants_stats_view, invoice, leaderboard, new_matching_partner, profile,
-    quickstart, subscription_cancel,
+    quickstart, subscription_cancel, grant_activity,
 )
 
 app_name = 'grants'
@@ -31,6 +31,7 @@
     path('stats/', grants_stats_view, name='grants_stats'),
     path('grants.json', grants_addr_as_json, name='grants_json'),
     path('flag/<int:grant_id>', flag, name='grantflag'),
+    path('<int:grant_id>/activity', grant_activity, name='log_activity'),
     path('<int:grant_id>/<slug:grant_slug>', grant_details, name='details'),
     path('<int:grant_id>/<slug:grant_slug>/', grant_details, name='details2'),
     re_path(r'^matic/new', grant_new_whitelabel, name='new_whitelabel'),
diff --git a/app/grants/views.py b/app/grants/views.py
index ef9310cd69b..1677b618234 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -49,7 +49,8 @@
 from dashboard.utils import get_web3, has_tx_mined
 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 Contribution, Flag, Grant, GrantCategory, MatchPledge, PhantomFunding, Subscription
+from grants.models import Contribution, Flag, Grant, GrantCategory, MatchPledge, PhantomFunding, Subscription, \
+    CartActivity
 from grants.utils import get_leaderboard, is_grant_team_member
 from inbox.utils import send_notification_to_user_from_gitcoinbot
 from kudos.models import BulkTransferCoupon, Token
@@ -388,7 +389,7 @@ def grants(request):
     if request.user.is_authenticated:
         prev_grants = request.user.profile.grant_contributor.filter(created_on__gt=last_round_start, created_on__lt=last_round_end).values_list('grant', flat=True)
         prev_grants = Grant.objects.filter(pk__in=prev_grants)
-        
+
     params = {
         'active': 'grants_landing',
         'title': title,
@@ -1187,3 +1188,19 @@ def grant_categories(request):
     return JsonResponse({
         'categories': categories
     })
+
+
+@login_required
+def grant_activity(request, grant_id):
+    action = request.POST.get('action')
+    metadata = request.POST.get('metadata')
+    bulk = request.POST.get('bulk') == 'true'
+
+    grant = get_object_or_404(Grant, pk=grant_id)
+
+    CartActivity.objects.create(grant=grant, profile=request.user.profile, action=action,
+                                metadata=json.loads(metadata), bulk=bulk)
+
+    return JsonResponse({
+        'error': False
+    })

From 3f10a01c684ac522daeb8b8eac3e2a1585dd7120 Mon Sep 17 00:00:00 2001
From: Miguel Angel G <miguel@gordian.dev>
Date: Tue, 16 Jun 2020 21:51:47 -0500
Subject: [PATCH 3/6] Change the payload to be stored

---
 app/assets/v2/js/cart-data.js | 22 ++++++++--------------
 app/grants/admin.py           | 11 +----------
 app/grants/models.py          |  4 ++--
 app/grants/urls.py            |  1 +
 app/grants/views.py           |  7 +++++--
 5 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/app/assets/v2/js/cart-data.js b/app/assets/v2/js/cart-data.js
index c6e60a619c0..cc83371f307 100644
--- a/app/assets/v2/js/cart-data.js
+++ b/app/assets/v2/js/cart-data.js
@@ -47,25 +47,19 @@ class CartData {
 
     fetchData(`/grants/${grantData.grant_id}/activity`, 'POST', {
       action: 'ADD_ITEM',
-      metadata: JSON.stringify(grantData)
+      metadata: JSON.stringify(cartList)
     }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
   }
 
   static removeIdFromCart(grantId) {
     let cartList = this.loadCart();
 
-    const newList = cartList.filter(grant => {
-      if (grant.grant_id === grantId) {
-        fetchData(`/grants/${grant.grant_id}/activity`, 'POST', {
-          action: 'REMOVE_ITEM',
-          metadata: JSON.stringify(grant)
-        }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
+    const newList = cartList.filter(grant => grant.grant_id !== grantId);
 
-        return false;
-      }
-
-      return true;
-    });
+    fetchData(`/grants/${grantId}/activity`, 'POST', {
+      action: 'REMOVE_ITEM',
+      metadata: JSON.stringify(newList)
+    }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
 
     this.setCart(newList);
   }
@@ -97,9 +91,9 @@ class CartData {
     let cartList = this.loadCart();
 
     cartList.map(grant => {
-      fetchData(`/grants/${grant.grant_id}/activity`, 'POST', {
+      fetchData('/grants/activity', 'POST', {
         action: 'REMOVE_ITEM',
-        metadata: JSON.stringify(grant),
+        metadata: JSON.stringify(cartList),
         bulk: true
       }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
     });
diff --git a/app/grants/admin.py b/app/grants/admin.py
index fdfe9382557..2ede9bbef84 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -284,19 +284,10 @@ def from_ip_address(self, instance):
 
 
 class CartActivityAdmin(admin.ModelAdmin):
-    list_display = ['id', 'grant', 'profile', 'action', 'bulk', 'tracking', 'created_on']
+    list_display = ['id', 'grant', 'profile', 'action', 'bulk', 'created_on']
     raw_id_fields = ['grant', 'profile']
     search_fields = ['bulk', 'action', 'grant']
 
-    def tracking(self, instance):
-        if instance.metadata:
-            try:
-                return instance.metadata['uuid']
-            except:
-                pass
-
-        return ''
-
 
 admin.site.register(PhantomFunding, PhantomFundingAdmin)
 admin.site.register(MatchPledge, MatchPledgeAdmin)
diff --git a/app/grants/models.py b/app/grants/models.py
index 75dc5af3aa1..ef6bdbf46bd 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -1388,7 +1388,7 @@ class CartActivity(SuperModel):
         ('ADD_ITEM', 'Add item to cart'),
         ('REMOVE_ITEM', 'Remove item to cart')
     )
-    grant = models.ForeignKey(Grant, on_delete=models.CASCADE, related_name='cart_actions',
+    grant = models.ForeignKey(Grant, null=True, on_delete=models.CASCADE, related_name='cart_actions',
                               help_text=_('Related Grant Activity '))
     profile = models.ForeignKey('dashboard.Profile', on_delete=models.CASCADE, related_name='cart_activity',
                                 help_text=_('User Cart Activity'))
@@ -1397,4 +1397,4 @@ class CartActivity(SuperModel):
     bulk = models.BooleanField(default=False)
 
     def __str__(self):
-        return f'{self.action} {self.grant.id} from the cart {self.profile.handle}'
+        return f'{self.action} {self.grant.id if self.grant else "bulk"} from the cart {self.profile.handle}'
diff --git a/app/grants/urls.py b/app/grants/urls.py
index ab50d339a2a..1a605d5e43f 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -32,6 +32,7 @@
     path('grants.json', grants_addr_as_json, name='grants_json'),
     path('flag/<int:grant_id>', flag, name='grantflag'),
     path('<int:grant_id>/activity', grant_activity, name='log_activity'),
+    path('activity', grant_activity, name='log_activity'),
     path('<int:grant_id>/<slug:grant_slug>', grant_details, name='details'),
     path('<int:grant_id>/<slug:grant_slug>/', grant_details, name='details2'),
     re_path(r'^matic/new', grant_new_whitelabel, name='new_whitelabel'),
diff --git a/app/grants/views.py b/app/grants/views.py
index 1677b618234..d2fa3c879ea 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -1191,12 +1191,15 @@ def grant_categories(request):
 
 
 @login_required
-def grant_activity(request, grant_id):
+def grant_activity(request, grant_id=None):
     action = request.POST.get('action')
     metadata = request.POST.get('metadata')
     bulk = request.POST.get('bulk') == 'true'
 
-    grant = get_object_or_404(Grant, pk=grant_id)
+    if grant_id == None:
+        grant = None
+    else:
+        grant = get_object_or_404(Grant, pk=grant_id)
 
     CartActivity.objects.create(grant=grant, profile=request.user.profile, action=action,
                                 metadata=json.loads(metadata), bulk=bulk)

From d58b13d012c6c46f3d36277a5d7b5c2d178474f8 Mon Sep 17 00:00:00 2001
From: Miguel Angel G <miguel@gordian.dev>
Date: Tue, 16 Jun 2020 21:53:52 -0500
Subject: [PATCH 4/6] Unify migrations

---
 ...{0058_auto_20200617_0028.py => 0058_auto_20200617_0253.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename app/grants/migrations/{0058_auto_20200617_0028.py => 0058_auto_20200617_0253.py} (91%)

diff --git a/app/grants/migrations/0058_auto_20200617_0028.py b/app/grants/migrations/0058_auto_20200617_0253.py
similarity index 91%
rename from app/grants/migrations/0058_auto_20200617_0028.py
rename to app/grants/migrations/0058_auto_20200617_0253.py
index 1b4444e538c..928722cba74 100644
--- a/app/grants/migrations/0058_auto_20200617_0028.py
+++ b/app/grants/migrations/0058_auto_20200617_0253.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.4 on 2020-06-17 00:28
+# Generated by Django 2.2.4 on 2020-06-17 02:53
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
                 ('action', models.CharField(choices=[('ADD_ITEM', 'Add item to cart'), ('REMOVE_ITEM', 'Remove item to cart')], help_text='Type of activity', max_length=20)),
                 ('metadata', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, help_text='Related data to the action')),
                 ('bulk', models.BooleanField(default=False)),
-                ('grant', models.ForeignKey(help_text='Related Grant Activity ', on_delete=django.db.models.deletion.CASCADE, related_name='cart_actions', to='grants.Grant')),
+                ('grant', models.ForeignKey(help_text='Related Grant Activity ', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cart_actions', to='grants.Grant')),
                 ('profile', models.ForeignKey(help_text='User Cart Activity', on_delete=django.db.models.deletion.CASCADE, related_name='cart_activity', to='dashboard.Profile')),
             ],
             options={

From 60e8a5087cea1bd217e66a01dbabc269a295c010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Angel=20Gordi=C3=A1n?= <miguel@gordian.dev>
Date: Wed, 17 Jun 2020 10:04:40 -0500
Subject: [PATCH 5/6] Update cart-data.js

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

diff --git a/app/assets/v2/js/cart-data.js b/app/assets/v2/js/cart-data.js
index 1ad04758af9..c017bff66ca 100644
--- a/app/assets/v2/js/cart-data.js
+++ b/app/assets/v2/js/cart-data.js
@@ -58,7 +58,7 @@ class CartData {
 
     grantData.uuid = get_UUID();
 
-    if (acceptsAllTokens || 'DAI' == acceptedTokenName) {
+    if (acceptsAllTokens || 'DAI' == accptedTokenName) {
       grantData.grant_donation_amount = 5;
       grantData.grant_donation_currency = 'DAI';
     } else {

From a253e1c46ee27c6456f85fa6e66c1a8fe6e59781 Mon Sep 17 00:00:00 2001
From: Miguel Angel G <miguel@gordian.dev>
Date: Wed, 17 Jun 2020 10:12:55 -0500
Subject: [PATCH 6/6] Update migrations

---
 ...0617_0253.py => 0059_auto_20200617_1508.py} | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
 rename app/grants/migrations/{0058_auto_20200617_0253.py => 0059_auto_20200617_1508.py} (66%)

diff --git a/app/grants/migrations/0058_auto_20200617_0253.py b/app/grants/migrations/0059_auto_20200617_1508.py
similarity index 66%
rename from app/grants/migrations/0058_auto_20200617_0253.py
rename to app/grants/migrations/0059_auto_20200617_1508.py
index 928722cba74..3fefba4a745 100644
--- a/app/grants/migrations/0058_auto_20200617_0253.py
+++ b/app/grants/migrations/0059_auto_20200617_1508.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.4 on 2020-06-17 02:53
+# Generated by Django 2.2.4 on 2020-06-17 15:08
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -9,15 +9,25 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dashboard', '0122_merge_20200612_2059'),
-        ('grants', '0057_auto_20200527_1413'),
+        ('dashboard', '0122_auto_20200615_1510'),
+        ('grants', '0058_auto_20200615_1226'),
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='contribution',
+            name='tx_id',
+            field=models.CharField(blank=True, default='0x0', help_text='The transaction ID of the Contribution.', max_length=255),
+        ),
         migrations.AlterField(
             model_name='grant',
             name='grant_type',
-            field=models.CharField(choices=[('tech', 'tech'), ('health', 'health'), ('Community', 'media'), ('Crypto for Black Lives', 'change'), ('matic', 'matic')], default='tech', help_text='Grant CLR category', max_length=15),
+            field=models.CharField(choices=[('tech', 'tech'), ('health', 'health'), ('Community', 'media'), ('change', 'change'), ('matic', 'matic')], default='tech', help_text='Grant CLR category', max_length=15),
+        ),
+        migrations.AlterField(
+            model_name='matchpledge',
+            name='pledge_type',
+            field=models.CharField(choices=[('tech', 'tech'), ('media', 'media'), ('health', 'health'), ('change', 'change')], default='tech', help_text='CLR pledge type', max_length=15),
         ),
         migrations.CreateModel(
             name='CartActivity',