Skip to content

Commit

Permalink
cosmos we outside (#10575)
Browse files Browse the repository at this point in the history
* we outside

* lint

* allow pending state
  • Loading branch information
chibie authored May 5, 2022
1 parent 5ae24e0 commit fdc5ae8
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 23 deletions.
6 changes: 3 additions & 3 deletions app/assets/v2/js/grants/_new.js
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,13 @@ const grant_chains = [
{ 'name': 'binance', 'label': 'Binance'},
{ 'name': 'polkadot', 'label': 'Polkadot'},
{ 'name': 'kusama', 'label': 'Kusama'},
{ 'name': 'algorand', 'label': 'Algorand'}
{ 'name': 'algorand', 'label': 'Algorand'},
{ 'name': 'rsk', 'label': 'RSK'},
{ 'name': 'cosmos', 'label': 'Cosmos'}
];

if (document.contxt.is_staff) {
const staff_chains = [
{ 'name': 'rsk', 'label': 'RSK'},
{ 'name': 'cosmos', 'label': 'Cosmos'}
];

grant_chains.push(...staff_chains);
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/ethelo.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from grants.models import Grant, GrantQuerySet, Flag, FlagQuerySet
from grants.models import Flag, FlagQuerySet, Grant, GrantQuerySet

EXPORT_FILENAME = "grants_export_for_ethelo.json"

Expand Down Expand Up @@ -101,4 +101,4 @@ def _format_flag(flag: Flag) -> dict:
"on": str(flag_vals[2]),
"processed": flag_vals[3],
"admin comments": flag_vals[4]
}
}
5 changes: 1 addition & 4 deletions app/dashboard/sync/cosmos.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,4 @@ def sync_cosmos_payout(fulfillment):
fulfillment.accepted_on = timezone.now()
fulfillment.accepted = True
record_payout_activity(fulfillment)
elif txn_status == 'expired':
fulfillment.payout_status = 'expired'

fulfillment.save()
fulfillment.save()
8 changes: 4 additions & 4 deletions app/dashboard/templates/bounty/new_bounty.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ <h1 class="text-center">Fund Issue</h1>
<input type="radio" name="bounty_chain" id="270895_chain" value="270895" v-model="chainId"><img class="mr-2" src="{% static 'v2/images/chains/casper.svg' %}" alt="" width="16"> Casper
</label>

{% if is_staff %}
<label class="btn btn-radio chain-btn d-flex align-items-center mr-2 mb-2 font-weight-bold py-2 px-4" :class="{'active': chainId === '1155'}">
<input type="radio" name="bounty_chain" id="1155_chain" value="1155" v-model="chainId"><img class="mr-2" src="{% static 'v2/images/chains/cosmos.svg' %}" alt="" width="16"> Cosmos
</label>
<label class="btn btn-radio chain-btn d-flex align-items-center mr-2 mb-2 font-weight-bold py-2 px-4" :class="{'active': chainId === '1155'}">
<input type="radio" name="bounty_chain" id="1155_chain" value="1155" v-model="chainId"><img class="mr-2" src="{% static 'v2/images/chains/cosmos.svg' %}" alt="" width="16"> Cosmos
</label>

{% if is_staff %}
<label class="btn btn-radio chain-btn d-flex align-items-center mr-2 mb-2 font-weight-bold py-2 px-4" :class="{'active': chainId === '717171'}">
<input type="radio" name="bounty_chain" id="717171_chain" value="717171" v-model="chainId"> Other
</label>
Expand Down
2 changes: 1 addition & 1 deletion app/grants/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from django.utils import timezone
from django.utils.html import format_html
from django.utils.safestring import mark_safe
from web3 import Web3

import twitter
from django_svg_image_form_field import SvgAndImageFormField
Expand All @@ -37,6 +36,7 @@
)
from grants.views import record_grant_activity_helper
from marketing.mails import grant_more_info_required, new_grant_approved
from web3 import Web3


class GeneralAdmin(admin.ModelAdmin):
Expand Down
1 change: 1 addition & 0 deletions app/grants/models/flag.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from economy.models import SuperModel


class FlagQuerySet(models.QuerySet):
def range(self, range):
"""Filter results to only flags within range of Grants being queried"""
Expand Down
17 changes: 8 additions & 9 deletions app/grants/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@
cancel_grant_v1, cart_thumbnail, clr_grants, clr_matches, collage, collection_thumbnail, contribute_to_grants_v1,
contribution_addr_from_all_as_json, contribution_addr_from_grant_as_json,
contribution_addr_from_grant_during_round_as_json, contribution_addr_from_round_as_json,
contribution_info_from_grant_during_round_as_json, delete_collection, flag,
get_clr_sybil_input, get_collection, get_collections_list, get_ethereum_cart_data, get_grant_payload,
get_grant_tags, get_grants, get_interrupted_contributions, get_replaced_tx, get_trust_bonus, grant_activity,
grant_details, grant_details_api, grant_details_contributions, grant_details_contributors, grant_edit, grant_fund,
grants, grants_addr_as_json, grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_info, grants_landing,
grants_type_redirect, hall_of_fame, ingest_contributions, ingest_contributions_view,
ingest_merkle_claim_to_clr_match, invoice, leaderboard, manage_ethereum_cart_data, matching_funds,
profile, remove_grant_from_collection, save_collection, toggle_grant_favorite,
upload_sybil_csv, verify_grant,
contribution_info_from_grant_during_round_as_json, delete_collection, flag, get_clr_sybil_input, get_collection,
get_collections_list, get_ethereum_cart_data, get_grant_payload, get_grant_tags, get_grants,
get_interrupted_contributions, get_replaced_tx, get_trust_bonus, grant_activity, grant_details, grant_details_api,
grant_details_contributions, grant_details_contributors, grant_edit, grant_fund, grants, grants_addr_as_json,
grants_bulk_add, grants_by_grant_type, grants_cart_view, grants_info, grants_landing, grants_type_redirect,
hall_of_fame, ingest_contributions, ingest_contributions_view, ingest_merkle_claim_to_clr_match, invoice,
leaderboard, manage_ethereum_cart_data, matching_funds, profile, remove_grant_from_collection, save_collection,
toggle_grant_favorite, upload_sybil_csv, verify_grant,
)

app_name = 'grants/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from grants.models import Grant
from search.models import SearchResult


class Command(BaseCommand):
help = 'uploads latest search results into elasticsearch'

Expand Down

0 comments on commit fdc5ae8

Please sign in to comment.