checking for value before accessing networkName to display connection… (#10597)

* checking for value before accessing networkName to display connection status and giving a more descriptive network error for matching claims

* return token amount from matching endpoint and display on claim

Co-authored-by: Tim Schultz <timschultz@Computer.local>

Author: Tim Schultz

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;
       }
 

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';
 

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
     )
 

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>

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>