bug: fix grant owner address etherscan link (#4854)

gitcoinco · Jul 24, 2019 · 35cd543 · 35cd543
1 parent ce2e23f
commit 35cd543
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 16 deletions.
diff --git a/app/assets/v2/js/abi.js b/app/assets/v2/js/abi.js
diff --git a/app/assets/v2/js/grants/cancel_subscription.js b/app/assets/v2/js/grants/cancel_subscription.js
@@ -40,7 +40,7 @@ $(document).ready(() => {
           deployedToken.methods.approve(data.contract_address, web3.utils.toTwosComplement(0)).send({from: accounts[0], gasPrice: realGasPrice})
             .on('transactionHash', function(transactionHash) {
               $('#sub_end_approve_tx_id').val(transactionHash);
-              const linkURL = etherscan_tx_url(transactionHash);
+              const linkURL = get_etherscan_url(transactionHash);
 
               document.issueURL = linkURL;
               $('#transaction_url').attr('href', linkURL);

diff --git a/app/assets/v2/js/grants/detail.js b/app/assets/v2/js/grants/detail.js
@@ -143,7 +143,7 @@ $(document).ready(function() {
             gasPrice: web3.utils.toHex($('#gasPrice').val() * Math.pow(10, 9))
           }).on('transactionHash', function(transactionHash) {
             grant_cancel_tx_id = $('#grant_cancel_tx_id').val();
-            const linkURL = etherscan_tx_url(transactionHash);
+            const linkURL = get_etherscan_url(transactionHash);
 
             document.issueURL = linkURL;
             $('#transaction_url').attr('href', linkURL);
@@ -182,7 +182,7 @@ $(document).ready(function() {
         from: accounts[0],
         gasPrice: 8000000000
       }).on('transactionHash', function(transactionHash) {
-        const linkURL = etherscan_tx_url(transactionHash);
+        const linkURL = get_etherscan_url(transactionHash);
 
         document.issueURL = linkURL;
         $('#transaction_url').attr('href', linkURL);

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
@@ -262,7 +262,7 @@ const donationPayment = (token, account, donationAmountString) => {
 const subscribeToGrant = (transactionHash) => {
   web3.eth.getAccounts(function(err, accounts) {
     deployedToken.methods.decimals().call(function(err, decimals) {
-      const linkURL = etherscan_tx_url(transactionHash);
+      const linkURL = get_etherscan_url(transactionHash);
       let token_address = $('#js-token').length ? $('#js-token').val() : $('#sub_token_address').val();
       let data = {
         'contributor_address': $('#contributor_address').val(),
@@ -393,7 +393,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
       window.location = redirectURL;
     });
 
-    const linkURL = etherscan_tx_url(transactionHash);
+    const linkURL = get_etherscan_url(transactionHash);
 
     document.issueURL = linkURL;
 

diff --git a/app/assets/v2/js/grants/index.js b/app/assets/v2/js/grants/index.js
@@ -39,7 +39,7 @@ $(document).ready(() => {
 
 const etherscanUrlConvert = (elem, network) => {
   elem.each(function() {
-    $(this).attr('href', etherscan_tx_url($(this).attr('href'), network));
+    $(this).attr('href', get_etherscan_url($(this).attr('href'), network));
   });
 };
 

diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
@@ -149,7 +149,7 @@ const init = () => {
           }).on('transactionHash', function(transactionHash) {
             console.log('2', transactionHash);
             $('#transaction_hash').val(transactionHash);
-            const linkURL = etherscan_tx_url(transactionHash);
+            const linkURL = get_etherscan_url(transactionHash);
             let file = $('#img-project')[0].files[0];
             let formData = new FormData();
 

diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
@@ -512,7 +512,7 @@ var showWarningMessage = function(txid) {
   if (typeof txid != 'undefined' && txid.indexOf('0x') != -1) {
     waitforWeb3(function() {
       clearInterval(interval);
-      var link_url = etherscan_tx_url(txid);
+      var link_url = get_etherscan_url(txid);
 
       $('#transaction_url').attr('href', link_url);
     });

diff --git a/app/grants/templates/grants/detail/index.html b/app/grants/templates/grants/detail/index.html
@@ -87,7 +87,12 @@
   <script src="{% static "v2/js/waiting_room_entertainment.js" %}"></script>
   <script>
     $('#wallet-address').attr(
-      'href', etherscan_tx_url($('#wallet-address').text().trim(), '{{ grant.network }}')
+      'href',
+      get_etherscan_url(
+        $('#wallet-address').text().trim(),
+        '{{ grant.network }}',
+        'address'
+      )
     );
 
     {% if change_ownership == 'Y' %}