Merge pull request bitpay#780 from Gamboster/fix/insightUrlForBCH

Fix: insight url for emails of BCH

Author: matiu

config.js

@@ -62,7 +62,7 @@ var config = {
         url: 'https://test-bch-insight.bitpay.com:443',
         addressFormat: 'cashaddr',  // copay, cashaddr, or legacy
       },
- 
+
     },
   },
   pushNotificationsOpts: {
@@ -88,11 +88,16 @@ var config = {
   //  defaultLanguage: 'en',
   //  defaultUnit: 'btc',
   //  publicTxUrlTemplate: {
-  //    livenet: 'https://insight.bitpay.com/tx/{{txid}}',
-  //    testnet: 'https://test-insight.bitpay.com/tx/{{txid}}',
+  //    btc: {
+  //      livenet: 'https://insight.bitpay.com/tx/{{txid}}',
+  //      testnet: 'https://test-insight.bitpay.com/tx/{{txid}}',
+  //    },
+  //    bch: {
+  //      livenet: 'https://bch-insight.bitpay.com/tx/{{txid}}',
+  //      testnet: 'https://test-bch-insight.bitpay.com/tx/{{txid}}',
+  //    }
   //  },
-  //},
-  //
+  // },
   // To use sendgrid:
   // var sgTransport = require('nodemail-sendgrid-transport');
   // mailer:sgTransport({

lib/emailservice.js

@@ -216,7 +216,7 @@ EmailService.prototype._getRecipientsList = function(notification, emailType, cb
 };
 
 EmailService.prototype._getDataForTemplate = function(notification, recipient, cb) {
-  var self = this;
+  var self = this;  
 
   // TODO: Declare these in BWU
   var UNIT_LABELS = {
@@ -259,7 +259,7 @@ EmailService.prototype._getDataForTemplate = function(notification, recipient, c
     }
 
     if (_.contains(['NewIncomingTx', 'NewOutgoingTx'], notification.type) && data.txid) {
-      var urlTemplate = self.publicTxUrlTemplate[wallet.network];
+      var urlTemplate = self.publicTxUrlTemplate[wallet.coin][wallet.network];
       if (urlTemplate) {
         try {
           data.urlForTx = Mustache.render(urlTemplate, data);

test/integration/emailnotifications.js

@@ -57,8 +57,14 @@ describe('Email notifications', function() {
                 from: 'bws@dummy.net',
                 subjectPrefix: '[test wallet]',
                 publicTxUrlTemplate: {
-                  livenet: 'https://insight.bitpay.com/tx/{{txid}}',
-                  testnet: 'https://test-insight.bitpay.com/tx/{{txid}}',
+                  btc: {
+                    livenet: 'https://insight.bitpay.com/tx/{{txid}}',
+                    testnet: 'https://test-insight.bitpay.com/tx/{{txid}}',
+                  },
+                  bch: {
+                    livenet: 'https://bch-insight.bitpay.com/tx/{{txid}}',
+                    testnet: 'https://test-bch-insight.bitpay.com/tx/{{txid}}',
+                  }
                 },
               },
             }, function(err) {
@@ -472,8 +478,14 @@ describe('Email notifications', function() {
                 from: 'bws@dummy.net',
                 subjectPrefix: '[test wallet]',
                 publicTxUrlTemplate: {
-                  livenet: 'https://insight.bitpay.com/tx/{{txid}}',
-                  testnet: 'https://test-insight.bitpay.com/tx/{{txid}}',
+                  btc: {
+                    livenet: 'https://insight.bitpay.com/tx/{{txid}}',
+                    testnet: 'https://test-insight.bitpay.com/tx/{{txid}}',
+                  },
+                  bch: {
+                    livenet: 'https://bch-insight.bitpay.com/tx/{{txid}}',
+                    testnet: 'https://test-bch-insight.bitpay.com/tx/{{txid}}',
+                  }
                 },
               },
             }, function(err) {