Merge remote-tracking branch 'upstream/master' into stable

thelostone-mc · thelostone-mc · commit 84a55e170e5f · 2022-05-10T09:08:48.000+05:30
diff --git a/app/assets/v2/js/grants/matching_funds.js b/app/assets/v2/js/grants/matching_funds.js
@@ -145,9 +145,10 @@ Vue.mixin({
 
       const chainId = Number(web3.eth.currentProvider.chainId);
 
-      if (chainId < 1 || chainId > 5) {
+      // At this moment claims can only be completed on mainnet
+      if (chainId !== 1) {
         waitingState(false);
-        _alert('Please connect to a valid Ethereum network', 'danger');
+        _alert('Please connect to Ethereum mainnet.', 'danger');
         return;
       }
 
diff --git a/app/assets/v2/js/wallet.js b/app/assets/v2/js/wallet.js
@@ -112,9 +112,11 @@ async function fetchAccountData(provider) {
   // Load chain information over an HTTP API
   // const chainData = await EvmChains.getChain(chainId);
 
-  document.querySelector('.network-name').textContent = networkName;
-  document.querySelector('.wallet-network').classList.remove('rinkeby', 'mainnet');
-  document.querySelector('.wallet-network').classList.add(networkName.split(' ').join('-'));
+  if (networkName) {
+    document.querySelector('.network-name').textContent = networkName;
+    document.querySelector('.wallet-network').classList.remove('rinkeby', 'mainnet');
+    document.querySelector('.wallet-network').classList.add(networkName.split(' ').join('-'));
+  }
 
   document.querySelector('#wallet-btn').innerText = 'Change Wallet';
 
diff --git a/app/dashboard/migrations/0202_hackathonevent_discord_server.py b/app/dashboard/migrations/0202_hackathonevent_discord_server.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2022-05-06 18:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0201_merge_20220427_1416'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hackathonevent',
+            name='discord_server',
+            field=models.URLField(blank=True, help_text='Link to Discord server for Hackathon', null=True),
+        ),
+    ]
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
@@ -5071,6 +5071,7 @@ class HackathonEvent(SuperModel):
     use_circle = models.BooleanField(help_text=_('Use circle for the Hackathon'), default=False)
     visible = models.BooleanField(help_text=_('Can this HackathonEvent be seeing on /hackathons ?'), default=True)
     total_prize = models.CharField(max_length=255, null=True, blank=True, help_text='extra text to display next the event dates on the hackathon list page')
+    discord_server = models.URLField(blank=True, null=True, help_text=_('Link to Discord server for Hackathon'))
 
     default_channels = ArrayField(models.CharField(max_length=255), blank=True, default=list)
     objects = HackathonEventQuerySet.as_manager()
@@ -5095,6 +5096,15 @@ def relative_url(self):
     def town_square_link(self):
         return f'townsquare/?tab=hackathon:{self.pk}'
 
+    def is_expired(self):
+        """Check if Hackathon is active
+
+        Returns:
+            boolean: Whether or not hackathon is expired
+        """
+        now = timezone.now()
+        return self.end_date < now
+
     def get_absolute_url(self):
         """Get the absolute URL for the HackathonEvent.
 
diff --git a/app/dashboard/templates/dashboard/hackathon/onboard.html b/app/dashboard/templates/dashboard/hackathon/onboard.html
@@ -133,6 +133,16 @@ <h1 class="text-uppercase gc-letter-spacing font-weight-bold">
                       {% elif is_registered and hackathon.start_date|timesince >= "1 min"%}
                           <a class="btn btn-primary col-12"  href="{% url 'hackathon' hackathon.slug %}">See Prizes</a>
                       {% endif %}
+                      {% if hackathon.discord_server is not None %}
+                          <a
+                            type="button"
+                            class="btn btn-outline-primary col-12 mt-2"
+                            href="{{ hackathon.discord_server }}"
+                            target="_blank"
+                          >
+                            <i class="fab fa-discord mr-1"></i>Join Discord
+                          </a>
+                      {% endif %}        
                   {% endif %}
                   </div>
                 </div>
diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
@@ -732,7 +732,20 @@ <h4 class="font-bigger-1 font-weight-bold mb-3">[[hackathon.name]] Wall of Fame<
             </div>
             <div class="d-none d-xl-block col-xl-2">
               <div id="sponsor_sidebar" class="font-body">
-                <div class="sponsor-top"></div>
+                <div class="sponsor-top">
+                  {% if hackathon.discord_server is not None %}
+                    <div class="d-flex align-items-center justify-content-center col-12">
+                      <a
+                        type="button"
+                        class="btn btn-primary"
+                        href="{{ hackathon.discord_server }}"
+                        target="_blank"
+                      >
+                        <i class="fab fa-discord mr-1"></i>Join Discord
+                      </a>
+                    </div>
+                  {% endif %}  
+                </div>
                 <sponsor-tribes-widget v-if="hackathonSponsors.length > 0" inline-template>
                   <div class="p-xl-2 p-4">
                     <div class="offset-1 subheading left-ribbon">
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
@@ -4311,6 +4311,9 @@ def new_hackathon_bounty(request, hackathon=''):
     except HackathonEvent.DoesNotExist:
         return redirect(reverse('get_hackathons'))
 
+    if hackathon_event.is_expired():
+        return redirect(reverse('hackathon_onboard', args=(hackathon_event.slug,)))
+    
     bounty_params = {
         'newsletter_headline': _('Be the first to know about new funded issues.'),
         'issueURL': clean_bounty_url(request.GET.get('source') or request.GET.get('url', '')),
diff --git a/app/grants/serializers.py b/app/grants/serializers.py
@@ -53,7 +53,7 @@ class CLRMatchSerializer(FlexFieldsModelSerializer):
     class Meta:
         model = CLRMatch
         fields = (
-            'pk', 'amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'
+            'pk', 'amount', 'token_amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'
         )
 
 
@@ -65,7 +65,7 @@ class GrantSerializer(FlexFieldsModelSerializer):
     admin_profile = ProfileSerializer()
     team_members = ProfileSerializer(many=True)
     clr_matches = CLRMatchSerializer(
-        fields=['pk', 'amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'],
+        fields=['pk', 'amount', 'token_amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'],
         many=True
     )
 
diff --git a/app/grants/templates/grants/_new.html b/app/grants/templates/grants/_new.html
@@ -279,14 +279,14 @@
                   <div class="mb-3">
                     <template v-if="chainId == 'eth'">
                       <label class="font-subheader font-weight-light letter-spacing" for="eth_payout_address">
-                        Add ETH Recipient Wallet Address
+                        Add ETH Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
                         IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
-                        DO NOT use an exchange address — use a self-custody wallet address such as Metamask.<br>
-                        Adding an incorrect wallet address could mean that you don’t receive your funds.
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="eth_payout_address" v-model="form.eth_payout_address" name="eth_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -315,12 +315,14 @@
 
                     <template v-if="chainId == 'celo'">
                       <label class="font-subheader font-weight-light letter-spacing" for="celo_payout_address">
-                        Add CELO Recipient Wallet Address
+                        Add CELO Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="celo_payout_address" v-model="form.celo_payout_address" name="celo_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -332,12 +334,14 @@
 
                     <template v-if="chainId == 'zilliqa'">
                       <label class="font-subheader font-weight-light letter-spacing" for="zil_payout_address">
-                        Add Zilliqa Recipient Wallet Address
+                        Add Zilliqa Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="zil_payout_address" v-model="form.zil_payout_address" name="zil_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -349,12 +353,14 @@
 
                     <template v-if="chainId == 'harmony'">
                       <label class="font-subheader font-weight-light letter-spacing" for="harmony_payout_address">
-                        Add Harmony Recipient Wallet Address
+                        Add Harmony Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="harmony_payout_address" v-model="form.harmony_payout_address" name="harmony_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -366,12 +372,14 @@
 
                     <template v-if="chainId == 'binance'">
                       <label class="font-subheader font-weight-light letter-spacing" for="binance_payout_address">
-                        Add Binance Recipient Wallet Address
+                        Add Binance Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="binance_payout_address" v-model="form.binance_payout_address" name="binance_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -383,12 +391,14 @@
 
                     <template v-if="chainId == 'polkadot'">
                       <label class="font-subheader font-weight-light letter-spacing" for="polkadot_payout_address">
-                        Add Polkadot Recipient Wallet Address
+                        Add Polkadot Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="polkadot_payout_address" v-model="form.polkadot_payout_address" name="polkadot_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -400,12 +410,14 @@
 
                     <template v-if="chainId == 'kusama'">
                       <label class="font-subheader font-weight-light letter-spacing" for="kusama_payout_address">
-                        Add Kusama Recipient Wallet Address
+                        Add Kusama Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="kusama_payout_address" v-model="form.kusama_payout_address" name="kusama_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -417,12 +429,14 @@
 
                     <template v-if="chainId == 'rsk'">
                       <label class="font-subheader font-weight-light letter-spacing" for="rsk_payout_address">
-                        Add RSK Recipient Wallet Address
+                        Add RSK Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="rsk_payout_address" v-model="form.rsk_payout_address" name="rsk_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
@@ -434,12 +448,14 @@
 
                     <template v-if="chainId == 'algorand'">
                       <label class="font-subheader font-weight-light letter-spacing" for="algorand_payout_address">
-                        Add Algorand Recipient Wallet Address
+                        Add Algorand Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-6 badge badge-greylight text-capitalize ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="algorand_payout_address" v-model="form.algorand_payout_address" name="algorand_payout_address" class="form__input form__input-lg" maxlength="58" placeholder="0x0" required/>
@@ -451,12 +467,14 @@
 
                     <template v-if="chainId == 'cosmos'">
                       <label class="font-subheader font-weight-light letter-spacing" for="cosmos_payout_address">
-                        Add Cosmos Recipient Wallet Address
+                        Add Cosmos Recipient's Wallet Address
                       </label>
                       <span class="font-smaller-2 py-1 font-weight-normal badge badge-greylight ml-2">required</span>
 
                       <p class="text-black-60 font-caption mb-2">
-                        This is where funds from contributors to this grant will be sent
+                        IMPORTANT: This is the wallet address where contributions to this grant will be sent.<br>
+                        DO NOT use an exchange address — use a self-custody wallet address such as MetaMask.<br>
+                        Adding an incorrect wallet address could mean that you don't receive your funds.
                       </p>
 
                       <input id="cosmos_payout_address" v-model="form.cosmos_payout_address" name="cosmos_payout_address" class="form__input form__input-lg" maxlength="50" placeholder="0x0" required/>
diff --git a/app/grants/templates/grants/components/historical_claim.html b/app/grants/templates/grants/components/historical_claim.html
@@ -4,7 +4,7 @@
       <span class="font-bigger-1 text-grey-500">[[ stringifyClrs(match.grant_payout.grant_clrs) ]] (GR[[ match.round_number ]])</span>
     </b-col>
     <b-col lg="2" sm="12" class="pt-2 pt-lg-0">
-      <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 gc-font-base">[[ match.amount | decimals | formatNumber ]] [[ payoutToken ]]</h4>
+      <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 gc-font-base">[[ match.token_amount | decimals | formatNumber ]] [[ payoutToken ]]</h4>
       <span class="d-lg-none d-inline font-weight-bold font-subheader">[[ match.amount | decimals | formatNumber ]] [[ payoutToken ]]</span>
       <span class="font-body text-grey-500 ml-2 ml-lg-0">$[[ match.amount | decimals | formatNumber ]]</span>
     </b-col>
diff --git a/app/grants/templates/grants/components/ready_claim.html b/app/grants/templates/grants/components/ready_claim.html
@@ -4,7 +4,7 @@
         <span class="font-bigger-1 text-grey-500" id="grant-clrs">[[ stringifyClrs(match.grant_payout.grant_clrs) ]] (GR[[ match.round_number ]])</span>
       </b-col>
       <b-col lg="2" sm="12" class="pt-2 pt-lg-0">
-        <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 gc-font-base">[[ match.amount | decimals | formatNumber ]] [[ match.grant_payout.token.symbol ]]</h4>
+        <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 gc-font-base">[[ match.token_amount | decimals | formatNumber ]] [[ match.grant_payout.token.symbol ]]</h4>
         <span class="d-lg-none d-inline font-weight-bold font-subheader">[[ match.amount | decimals | formatNumber ]] [[ match.grant_payout.token.symbol ]]</span>
         <span class="font-body text-grey-500 ml-2 ml-lg-0">$[[ match.amount | decimals | formatNumber ]]</span>
         <span v-if="match.grant_payout.status === 'pending'">(pending review)</span>
diff --git a/app/retail/templates/home/index2021.html b/app/retail/templates/home/index2021.html

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class CLRMatchSerializer(FlexFieldsModelSerializer):`
`53`	`53`	`class Meta:`
`54`	`54`	`model = CLRMatch`
`55`	`55`	`fields = (`
`56`		`- 'pk', 'amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'`
	`56`	`+ 'pk', 'amount', 'token_amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'`
`57`	`57`	`)`
`58`	`58`
`59`	`59`
`@@ -65,7 +65,7 @@ class GrantSerializer(FlexFieldsModelSerializer):`
`65`	`65`	`admin_profile = ProfileSerializer()`
`66`	`66`	`team_members = ProfileSerializer(many=True)`
`67`	`67`	`clr_matches = CLRMatchSerializer(`
`68`		`- fields=['pk', 'amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'],`
	`68`	`+ fields=['pk', 'amount', 'token_amount', 'round_number', 'claim_tx', 'grant_payout', 'ready_for_payout', 'merkle_claim'],`
`69`	`69`	`many=True`
`70`	`70`	`)`
`71`	`71`