minor fix

gitcoinco · May 14, 2020 · 982b952 · 982b952
1 parent 35eead3
commit 982b952
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
@@ -288,7 +288,6 @@ $(document).ready(function() {
             set_form_disabled(false);
             return;
           }
-          $('#gas_price').val(1);
           $('#sub_new_approve_tx_id').val(txid);
 
           var data = {};
@@ -368,14 +367,6 @@ $(document).ready(function() {
         realApproval = Number(((grant_amount * data.num_periods)) * Math.pow(10, decimals) + approve_buffer);
       }
 
-      let realGasPrice = Number(gitcoin_grant_amount * Math.pow(10, decimals)); // optional grants fee
-
-      if (contractVersion == 0) {
-        realGasPrice = 1;
-      }
-
-      $('#gas_price').val(realGasPrice);
-
       let approvalSTR = realApproval.toLocaleString('fullwide', { useGrouping: false });
 
       web3.eth.getAccounts(function(err, accounts) {
@@ -506,7 +497,8 @@ const subscribeToGrant = (transactionHash) => {
         'network': $('#network').val(),
         'match_direction': $('input[name=match_direction]:checked').val(),
         'is_postive_vote': ($('input[name=match_direction]:checked').val() == '-') ? 0 : 1,
-        'csrfmiddlewaretoken': $("#js-fundGrant input[name='csrfmiddlewaretoken']").val()
+        'csrfmiddlewaretoken': $("#js-fundGrant input[name='csrfmiddlewaretoken']").val(),
+        'gas_price': 1
       };
 
       $.ajax({
@@ -535,7 +527,7 @@ const subscribeToGrant = (transactionHash) => {
           web3.utils.toChecksumAddress(selected_token), // token denomination / address
           web3.utils.toTwosComplement(Number(grant_amount * Math.pow(10, decimals)).toLocaleString('fullwide', {useGrouping: false})),
           web3.utils.toTwosComplement(realPeriodSeconds),
-          web3.utils.toTwosComplement(data.gas_price),
+          web3.utils.toTwosComplement(1),
           web3.utils.toTwosComplement(nonce)
         ];
 
@@ -641,8 +633,6 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
 
   let deployedSplitter = new web3.eth.Contract(compiledSplitter.abiDefinition, splitterAddress);
 
-  let token_address = $('#js-token').length ? $('#js-token').val() : $('#sub_token_address').val();
-
   indicateMetamaskPopup();
   deployedSplitter.methods.splitTransfer(toFirst, toSecond, valueFirst, valueSecond, tokenAddress).send({
     from: account,

diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
@@ -348,7 +348,6 @@ <h2 class="font-title-lg my-4">{% if direction == '-' %} Negative {%endif%}  {%
                 <input type="hidden" id="grant_id" name="grant_id" value="{{ grant.id }}">
                 <input type="hidden" id="admin_address" name="admin_address" value="{{ grant.admin_address }}">
                 <input type="hidden" id="token_address" name="token_address" value="{{ grant.token_address }}">
-                <input type="hidden" id="gas_price" name="gas_price" value="">
                 <input type="hidden" id="contract_address" name="contract_address" value="{{ grant.contract_address }}">
                 <input type="hidden" id="contract_version" name="contract_version" value="{{ grant.contract_version }}">
                 <input type="hidden" id="splitter_contract_address" name="splitter_contract_address" value="{{ splitter_contract_address }}">