diff --git a/app/app/fixtures/dashboard.json b/app/app/fixtures/dashboard.json index 40777fa8bfb..5087f911834 100644 --- a/app/app/fixtures/dashboard.json +++ b/app/app/fixtures/dashboard.json @@ -7768,7 +7768,6 @@ "grant_url": "/grants/3/my-test-grant-x3", "grant_logo": null, "token_name": "Any Token", - "amount_goal": "100000.00", "value_in_token": "0.00" }, "needs_review": false diff --git a/app/app/fixtures/grants.json b/app/app/fixtures/grants.json index a1a71d80346..5c2b81bf454 100644 --- a/app/app/fixtures/grants.json +++ b/app/app/fixtures/grants.json @@ -15,7 +15,6 @@ "logo_svg": "", "admin_address": "0xBcAfdD642118e5536024675e776d32413728dd08", "contract_owner_address": "0xBcAfdD642118e5536024675e776d32413728dd08", - "amount_goal": "50.0000", "monthly_amount_subscribed": "0.0000", "amount_received": "5.0000", "token_address": "0x8f2e097e79b1c51be9cba42658862f0192c3e487", @@ -53,7 +52,6 @@ "logo_svg": "", "admin_address": "0xE643cD48A9A902F6cE947324abE245b3Fe4106dc", "contract_owner_address": "0xBcAfdD642118e5536024675e776d32413728dd08", - "amount_goal": "100000.0000", "monthly_amount_subscribed": "47.5000", "amount_received": "0.0000", "token_address": "0x0000000000000000000000000000000000000000", @@ -91,7 +89,6 @@ "logo_svg": "", "admin_address": "0xCC4b3DE30576E161C8632786560Fa7DD3Fb33f77", "contract_owner_address": "", - "amount_goal": "100000.0000", "monthly_amount_subscribed": "0.0000", "amount_received": "5.0000", "token_address": "0x0000000000000000000000000000000000000000", diff --git a/app/assets/v2/js/grants/detail.js b/app/assets/v2/js/grants/detail.js index e3f9b86f0e5..8e690101310 100644 --- a/app/assets/v2/js/grants/detail.js +++ b/app/assets/v2/js/grants/detail.js @@ -3,7 +3,6 @@ const editableFields = [ '#form--input__reference-url', '#contract_owner_address', '#grant-members', - '#amount_goal', '#grant-categories' ]; @@ -117,7 +116,6 @@ $(document).ready(function() { $('#edit-details').addClass('hidden'); $('#save-details').removeClass('hidden'); $('#cancel-details').removeClass('hidden'); - $('#edit-amount_goal').removeClass('hidden'); $('.grant__progress').addClass('hidden'); $('#section-nav-description .ql-toolbar').css('display', 'inherit'); @@ -134,7 +132,6 @@ $(document).ready(function() { $('#edit-details').removeClass('hidden'); $('#save-details').addClass('hidden'); $('#cancel-details').addClass('hidden'); - $('#edit-amount_goal').addClass('hidden'); $('.grant__progress').removeClass('hidden'); $('#section-nav-description .ql-toolbar').css('display', 'none'); @@ -142,14 +139,12 @@ $(document).ready(function() { let edit_title = $('#form--input__title').val(); let edit_reference_url = $('#form--input__reference-url').val(); - let edit_amount_goal = $('#amount_goal').val(); let edit_grant_members = $('#grant-members').val(); let edit_categories = $('#grant-categories').val(); let data = { 'edit-title': edit_title, 'edit-reference_url': edit_reference_url, - 'edit-amount_goal': edit_amount_goal, 'edit-grant_members[]': edit_grant_members, 'edit-categories[]': edit_categories }; diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js index 851037caf83..ab5df13e0f1 100644 --- a/app/assets/v2/js/grants/new.js +++ b/app/assets/v2/js/grants/new.js @@ -204,7 +204,6 @@ const init = () => { formData.append('contract_owner_address', $('#contract_owner_address').val()); formData.append('token_address', $('#token_address').val()); formData.append('token_symbol', $('#token_symbol').val()); - formData.append('amount_goal', $('#amount_goal').val()); formData.append('contract_version', $('#contract_version').val()); formData.append('transaction_hash', $('#transaction_hash').val()); formData.append('network', $('#network').val()); diff --git a/app/dashboard/export.py b/app/dashboard/export.py index d2fdaff69cf..9d777ace4f8 100644 --- a/app/dashboard/export.py +++ b/app/dashboard/export.py @@ -104,7 +104,7 @@ class Meta: model = Grant fields = ('id', 'active', 'grant_type', 'title', 'slug', 'description', 'description_rich', 'reference_url', 'logo', - 'admin_address', 'contract_owner_address', 'amount_goal', + 'admin_address', 'contract_owner_address', 'monthly_amount_subscribed', 'amount_received', 'token_address', 'token_symbol', 'contract_address', 'network', 'org', 'created_at', 'url', 'contribution_count', 'contributor_count' diff --git a/app/dashboard/migrations/0034_data_for_old_grants.py b/app/dashboard/migrations/0034_data_for_old_grants.py index 389babb91ec..0212f268f73 100644 --- a/app/dashboard/migrations/0034_data_for_old_grants.py +++ b/app/dashboard/migrations/0034_data_for_old_grants.py @@ -22,7 +22,6 @@ def record_grant_activity_helper(activity_type, grant, profile, date): metadata = { 'id': grant.id, 'value_in_token': '{0:.2f}'.format(grant.amount_received), - 'amount_goal': '{0:.2f}'.format(grant.amount_goal), 'token_name': grant.token_symbol, 'title': grant.title, 'grant_logo': grant_logo, diff --git a/app/dashboard/templates/profiles/tab_grant_contribs.html b/app/dashboard/templates/profiles/tab_grant_contribs.html index cbc02aa7790..9964ec096cd 100644 --- a/app/dashboard/templates/profiles/tab_grant_contribs.html +++ b/app/dashboard/templates/profiles/tab_grant_contribs.html @@ -48,7 +48,6 @@

- Goal: {{ transaction.amount_goal}}
Received: {{ transaction.amount_received }}
diff --git a/app/dashboard/tests/test_dashboard_migrations.py b/app/dashboard/tests/test_dashboard_migrations.py index e1859e012c1..6d67edd74f2 100644 --- a/app/dashboard/tests/test_dashboard_migrations.py +++ b/app/dashboard/tests/test_dashboard_migrations.py @@ -57,7 +57,6 @@ def new_grant(profile): 'contract_owner_address': '0x8B04e71007A783B4965BaFE068EC062D935E93b5', 'token_address': '0xFc1079D41D56D78e9FA2a857991F41D777104c74', 'token_symbol': 'E18R', - 'amount_goal': Decimal('100.0000'), 'contract_version': Decimal('0'), 'deploy_tx_id': '0xa95d30415427f76c778207e789c78d436b5c4ca4339797cff52ed21de8419554', 'network': 'rinkeby', diff --git a/app/grants/admin.py b/app/grants/admin.py index d7af061c5bb..3320f3e15d2 100644 --- a/app/grants/admin.py +++ b/app/grants/admin.py @@ -73,7 +73,7 @@ class GrantAdmin(GeneralAdmin): fields = [ 'migrated_to', 'title', 'description', 'reference_url', 'admin_address', 'active', - 'amount_goal', 'amount_received', 'monthly_amount_subscribed', + 'amount_received', 'monthly_amount_subscribed', 'deploy_tx_id', 'cancel_tx_id', 'admin_profile', 'token_symbol', 'token_address', 'contract_address', 'contract_version', 'network', 'required_gas_price', 'logo_svg_asset', 'logo_asset', 'created_on', 'modified_on', 'team_member_list', @@ -89,7 +89,7 @@ class GrantAdmin(GeneralAdmin): ] list_display =['pk', 'title', 'active','grant_type', 'link', 'hidden', 'migrated_to'] raw_id_fields = ['admin_profile'] - search_fields = ['amount_goal', 'description', 'admin_profile__handle'] + search_fields = ['description', 'admin_profile__handle'] # Custom Avatars diff --git a/app/grants/forms.py b/app/grants/forms.py index 2dacaf6b5d3..533138bd5a2 100644 --- a/app/grants/forms.py +++ b/app/grants/forms.py @@ -31,7 +31,7 @@ class Meta: model = Grant fields = ( - 'title', 'description', 'reference_url', 'logo', 'logo_svg', 'amount_goal', 'admin_address', 'deploy_tx_id', + 'title', 'description', 'reference_url', 'logo', 'logo_svg', 'admin_address', 'deploy_tx_id', 'cancel_tx_id', 'amount_received', 'token_address', 'contract_address', 'metadata', 'network', 'required_gas_price', 'admin_profile', 'team_members' ) diff --git a/app/grants/migrations/0055_remove_grant_amount_goal.py b/app/grants/migrations/0055_remove_grant_amount_goal.py new file mode 100644 index 00000000000..206fe7fb0d8 --- /dev/null +++ b/app/grants/migrations/0055_remove_grant_amount_goal.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.4 on 2020-04-17 03:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('grants', '0054_auto_20200414_1141'), + ] + + operations = [ + migrations.RemoveField( + model_name='grant', + name='amount_goal', + ), + ] diff --git a/app/grants/models.py b/app/grants/models.py index cd4db7d9f94..b443984e7ed 100644 --- a/app/grants/models.py +++ b/app/grants/models.py @@ -169,12 +169,6 @@ class Meta: default='0x0', help_text=_('The wallet address that owns the subscription contract and is able to call endContract()'), ) - amount_goal = models.DecimalField( - default=1, - decimal_places=4, - max_digits=50, - help_text=_('The monthly contribution goal amount for the Grant in DAI.'), - ) amount_received_in_round = models.DecimalField( default=0, decimal_places=4, @@ -314,12 +308,6 @@ def __str__(self): """Return the string representation of a Grant.""" return f"id: {self.pk}, active: {self.active}, title: {self.title}, type: {self.grant_type}" - def percentage_done(self): - """Return the percentage of token received based on the token goal.""" - if not self.amount_goal: - return 0 - return ((float(self.amount_received_with_phantom_funds) / float(self.amount_goal)) * 100) - def updateActiveSubscriptions(self): """updates the active subscriptions list""" @@ -328,6 +316,7 @@ def updateActiveSubscriptions(self): handles.append(handle) self.activeSubscriptions = handles + @property def contributions(self): pks = [] diff --git a/app/grants/serializers.py b/app/grants/serializers.py index caacfaa8dca..3de7e1a1893 100644 --- a/app/grants/serializers.py +++ b/app/grants/serializers.py @@ -15,9 +15,9 @@ class Meta: model = Grant fields = ( - 'active', 'title', 'slug', 'description', 'reference_url', 'logo', 'admin_address', 'amount_goal', + 'active', 'title', 'slug', 'description', 'reference_url', 'logo', 'admin_address', 'amount_received', 'token_address', 'token_symbol', 'contract_address', 'metadata', - 'network', 'required_gas_price', 'admin_profile', 'team_members', 'percentage_done', + 'network', 'required_gas_price', 'admin_profile', 'team_members', ) diff --git a/app/grants/templates/grants/detail/info.html b/app/grants/templates/grants/detail/info.html index 639d982611a..c37d596d7ae 100644 --- a/app/grants/templates/grants/detail/info.html +++ b/app/grants/templates/grants/detail/info.html @@ -178,13 +178,6 @@

- {% if is_team_member %} - - {% endif %} -
@@ -195,7 +188,6 @@

{{ grant.monthly_amount_subscribed|floatformat:0|intcomma }} DAI

-

of {{ grant.amount_goal|floatformat:0|intcomma }} DAI goal

{% endif %}

diff --git a/app/grants/templates/grants/new.html b/app/grants/templates/grants/new.html index 86a27ce72e2..5b6369a66e4 100644 --- a/app/grants/templates/grants/new.html +++ b/app/grants/templates/grants/new.html @@ -136,7 +136,6 @@
Funding Information
-
diff --git a/app/grants/templates/grants/newv0.html b/app/grants/templates/grants/newv0.html index ebd696c14c0..640a0edbdca 100644 --- a/app/grants/templates/grants/newv0.html +++ b/app/grants/templates/grants/newv0.html @@ -88,18 +88,10 @@

{% trans "Create a Grant" %}

-
-
- - + +
+
-
- -
- -
-
-
diff --git a/app/grants/views.py b/app/grants/views.py index 1b7be4304dd..ad4366ae52d 100644 --- a/app/grants/views.py +++ b/app/grants/views.py @@ -471,7 +471,6 @@ def grant_details(request, grant_id, grant_slug): elif 'edit-title' in request.POST: grant.title = request.POST.get('edit-title') grant.reference_url = request.POST.get('edit-reference_url') - grant.amount_goal = Decimal(request.POST.get('edit-amount_goal')) team_members = request.POST.getlist('edit-grant_members[]') team_members.append(str(grant.admin_profile.id)) grant.team_members.set(team_members) @@ -598,7 +597,6 @@ def grant_new(request): 'contract_owner_address': request.POST.get('contract_owner_address', ''), 'token_address': request.POST.get('token_address', ''), 'token_symbol': request.POST.get('token_symbol', ''), - 'amount_goal': request.POST.get('amount_goal', 1), 'contract_version': request.POST.get('contract_version', ''), 'deploy_tx_id': request.POST.get('transaction_hash', ''), 'network': request.POST.get('network', 'mainnet'), @@ -695,7 +693,6 @@ def grant_new_v0(request): 'contract_owner_address': request.POST.get('contract_owner_address', ''), 'token_address': request.POST.get('token_address', ''), 'token_symbol': request.POST.get('token_symbol', ''), - 'amount_goal': request.POST.get('amount_goal', 1), 'contract_version': request.POST.get('contract_version', ''), 'deploy_tx_id': request.POST.get('transaction_hash', ''), 'network': request.POST.get('network', 'mainnet'), @@ -1125,7 +1122,6 @@ def record_grant_activity_helper(activity_type, grant, profile, amount=None, tok metadata = { 'id': grant.id, 'value_in_token': '{0:.2f}'.format(grant.amount_received) if not amount else amount, - 'amount_goal': '{0:.2f}'.format(grant.amount_goal) if not amount else amount, 'token_name': grant.token_symbol if not token else token, 'title': grant.title, 'grant_logo': grant_logo, diff --git a/app/retail/templates/emails/grants/new_grant.html b/app/retail/templates/emails/grants/new_grant.html index 98b36405c68..0a44c29bc63 100644 --- a/app/retail/templates/emails/grants/new_grant.html +++ b/app/retail/templates/emails/grants/new_grant.html @@ -85,9 +85,6 @@

{% trans "New Grant Created" %}

{{ grant.title }}

{{ grant.description }}

-
-

{% trans "You are seeking " %}{{ grant.amount_goal }} {% trans "DAI monthly" %}

-

{% trans "To view or edit your grant click the button below." %}

{% trans "View Grant" %} diff --git a/app/retail/templates/emails/grants/new_grant.txt b/app/retail/templates/emails/grants/new_grant.txt index 3df32cdcea4..fd0d8815d0c 100644 --- a/app/retail/templates/emails/grants/new_grant.txt +++ b/app/retail/templates/emails/grants/new_grant.txt @@ -9,6 +9,4 @@ {% trans "Description" %} : {{ grant.description }} -{% trans "Goal" %} : {{ grant.amount_goal }} - {% trans "The details of your grant can be seen here:" %} {{ grant.reference_url }} diff --git a/app/retail/templates/emails/grants/subscription_terminated.html b/app/retail/templates/emails/grants/subscription_terminated.html index a8059a31694..14b14135a63 100644 --- a/app/retail/templates/emails/grants/subscription_terminated.html +++ b/app/retail/templates/emails/grants/subscription_terminated.html @@ -64,99 +64,6 @@ margin-bottom: 2rem; } - .progress { - width: 60%; - margin-left: 20%; - margin-top: 50px; - padding-bottom: 75px; - } - - .progress > h3 { - font-size: 26px; - color: #5B3AF0; - } - - .progressbar { - height: 15px; - background-color: #D8D8D8; - border-radius: 2.7px; - } - - .progress-completed { - height: 100%; - background-color: #0FCE7C; - border-radius: 2.7px; - float: left; - } - - .progress-removed { - height: 100%; - background-color: #CF0E0E; - border-top-right-radius: 2.7px; - border-bottom-right-radius: 2.7px; - float: left; - } - - .funding { - float: left; - text-align: left; - } - - .funding > h4 { - line-height: 0px; - text-align: left; - color: #0D0764; - padding-top: -20px; - } - - .progressbar-line { - width: 1px; - height: 50px; - background-color: #979797; - float: left; - margin-right: 20px; - } - - .progressbar-position-margin { - padding-left: 20%; - padding-right: 20%; - margin-top: 4rem; - } - - .progressbar-position { - transform: translateY(160%); - } - - .progressbar-position > p { - line-height: 0px; - color: #BBBDBF; - text-align: left; - } - - .progressbar-position > h4 { - line-height: 0px; - color: #0D0764; - padding-top: -20px; - } - - .funding > p { - line-height: 0px; - color: #BBBDBF; - } - - #currentFunding { - width: 57.5%; - } - - #goalFunding { - width: 42.5%; - text-align: right; - } - - #goalFunding h4 { - text-align: right; - } - #grant-logo { max-width: 25rem; width: 100%; @@ -186,43 +93,27 @@

{% trans "Grant" %} '{{ grant.title }}' {% trans "has been cancelled by its +
+ {{ grant.title }} +

{{ grant.description }}

-
-
-
-

{% trans "Your Contribution" %}

-

- {{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} -

-
-
-
-
-
-
- -
-
-
-
-

- {{ grant.amount_received }} {% trans "DAI" %} -

-

{% trans "Current" %}

-
-
-

- {{ grant.amount_goal }} {% trans "DAI" %} -

-

{% trans "Goal" %}

-
-
+ +

+ Subscription Amount cancelled + {{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} +

+ +

+ Total Grant received + {{ grant.amount_received }} {% trans "DAI" %} +

+


diff --git a/app/retail/templates/emails/grants/subscription_terminated.txt b/app/retail/templates/emails/grants/subscription_terminated.txt index 553d6a1122a..14a999578d0 100644 --- a/app/retail/templates/emails/grants/subscription_terminated.txt +++ b/app/retail/templates/emails/grants/subscription_terminated.txt @@ -10,10 +10,6 @@ {% trans "Status" %} : {{ grant.status }} -{% trans "Goal" %} : {{ grant.amount_goal }} {% trans "DAI" %} - -{% trans "Percentage done" %}: {{ grant.percentage_done }} - {% trans "You can see the cancelled subscription on Etherscan" %} at {% if subscription.network == 'mainnet' %} http://etherscan.io/tx/{{ subscription.cancel_tx_id }} diff --git a/app/retail/templates/emails/grants/support_cancellation.html b/app/retail/templates/emails/grants/support_cancellation.html index 6733bbbb04d..0e62a327c9e 100644 --- a/app/retail/templates/emails/grants/support_cancellation.html +++ b/app/retail/templates/emails/grants/support_cancellation.html @@ -64,95 +64,6 @@ margin-bottom: 2rem; } - .progress { - width: 60%; - margin-left: 20%; - margin-top: 50px; - padding-bottom: 75px; - } - - .progressbar { - height: 15px; - background-color: #D8D8D8; - border-radius: 2.7px; - } - - .progress-completed { - height: 100%; - background-color: #0FCE7C; - border-radius: 2.7px; - float: left; - } - - .progress-removed { - height: 100%; - background-color: #CF0E0E; - border-top-right-radius: 2.7px; - border-bottom-right-radius: 2.7px; - float: left; - } - - .funding { - float: left; - text-align: left; - } - - .funding > h4 { - line-height: 0px; - text-align: left; - color: #0D0764; - padding-top: -20px; - } - - .progressbar-line { - width: 1px; - height: 45px; - background-color: #979797; - float: left; - transform: translateY(-20%); - margin-right: 20px; - } - - .progressbar-position-margin { - padding-left: 20%; - padding-right: 20%; - margin-top: 4rem; - } - - .progressbar-position { - transform: translateY(160%); - } - - .progressbar-position > p { - line-height: 0px; - color: #BBBDBF; - text-align: left; - } - - .progressbar-position > h4 { - line-height: 0px; - color: #0D0764; - padding-top: -20px; - } - - .funding > p { - line-height: 0px; - color: #BBBDBF; - } - - #currentFunding { - width: 57.5%; - } - - #goalFunding { - width: 42.5%; - text-align: right; - } - - #goalFunding h4 { - text-align: right; - } - #grant-logo { max-width: 25rem; width: 100%; @@ -189,36 +100,16 @@

{% trans "Your Subscription for" %} {{ grant.title }} {% trans "has been can

{{ grant.description }}

-
-
-
-

{% trans "Your Contribution" %}

-

- {{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} -

-
-
-
-
-
-
- -
-
-
-
-

- {{ grant.amount_received }} {% trans "DAI" %} -

-

{% trans "Current" %}

-
-
-

- {{ grant.amount_goal }} {% trans "DAI" %} -

-

{% trans "Goal" %}

-
-
+ +

+ Subscription Amount cancelled + {{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} +

+ +

+ Total Grant received + {{ grant.amount_received }} {% trans "DAI" %} +


diff --git a/app/retail/templates/emails/grants/support_cancellation.txt b/app/retail/templates/emails/grants/support_cancellation.txt index a4197941aba..bd4b3bc1bed 100644 --- a/app/retail/templates/emails/grants/support_cancellation.txt +++ b/app/retail/templates/emails/grants/support_cancellation.txt @@ -12,10 +12,7 @@ {{ subscription.amount_per_period|floatformat:4|intcomma }} {{ subscription.token_symbol }} -{% trans "Grant % done" %} : {{ grant.percentage_done }} - {% trans "Grant Received" %} : {{ grant.amount_received }} -{% trans "Grant Goal" %} : {{ grant.amount_goal }} {% trans "Goal" %} diff --git a/app/retail/templates/emails/grants/transaction_summary.html b/app/retail/templates/emails/grants/transaction_summary.html index 8607f785364..46e00b19e8d 100644 --- a/app/retail/templates/emails/grants/transaction_summary.html +++ b/app/retail/templates/emails/grants/transaction_summary.html @@ -72,82 +72,10 @@ margin-bottom: 2rem; } - .progress { - width: 60%; - margin-left: 20%; - margin-top: 50px; - padding-bottom: 75px; - } - #tablePadding { padding-bottom: 25px; } - .progressbar { - height: 15px; - background-color: #D8D8D8; - border-radius: 2.7px; - } - - .progress-completed { - height: 100%; - background-color: #0FCE7C; - border-radius: 2.7px; - float: left; - } - - .progress-removed { - height: 100%; - background-color: #CF0E0E; - border-top-right-radius: 2.7px; - border-bottom-right-radius: 2.7px; - float: left; - } - - .funding { - width: 100%; - } - - .left-funding { - width: 50%; - float: left; - text-align: left; - } - - .right-funding { - width: 50%; - float: left; - text-align: right; - } - - .funding > div > h4 { - line-height: 0px; - color: #0D0764; - padding-top: -50px; - } - - .left-funding > h4 { - text-align: left; - } - - .right-funding > h4 { - text-align: right; - } - - .progressbar-line { - width: 1px; - height: 45px; - background-color: #979797; - float: left; - transform: translateY(-20%); - margin-right: 20px; - } - - .funding > div > p { - line-height: 0px; - color: #BBBDBF; - } - table { width: 100%; } @@ -207,29 +135,10 @@

-
-

- {% trans "Total Funds" %} -

-
-
-
-
-
-
-

- {{ grant.amount_received }} {% trans "DAI" %} -

-

{% trans "Current" %}

-
-
-

- {{ grant.amount_goal }} {% trans "DAI" %} -

-

{% trans "Goal" %}

-
-
-
+

+ Total Grant received + {{ grant.amount_received }} {% trans "DAI" %} +



diff --git a/app/retail/templates/emails/grants/transaction_summary.txt b/app/retail/templates/emails/grants/transaction_summary.txt index c64084af7e6..5c235a0f818 100644 --- a/app/retail/templates/emails/grants/transaction_summary.txt +++ b/app/retail/templates/emails/grants/transaction_summary.txt @@ -22,16 +22,10 @@ {% trans "View Transaction" %} -{% trans "Total Funds" %} -{{ grant.percentage_done }} +{% trans "Amount Received" %} {{ grant.amount_received }} {% trans "DAI" %} -{% trans "Current" %} - -{{ grant.amount_goal }} {% trans "DAI" %} - -{% trans "Goal" %} {% trans "View Grant" %} {{ grant.reference_url }}