diff --git a/src/js/controllers/modals/search.js b/src/js/controllers/modals/search.js index 55d51bfcc..439df891d 100644 --- a/src/js/controllers/modals/search.js +++ b/src/js/controllers/modals/search.js @@ -104,12 +104,12 @@ angular.module('copayApp.controllers').controller('searchController', function($ }; $scope.searchOnBlockchain = function(searchTerm) { - const url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm; - const optIn = true; - const title = null; - const message = gettextCatalog.getString('Search on Explorer.Bitcoin.com'); - const okText = gettextCatalog.getString('Open Explorer'); - const cancelText = gettextCatalog.getString('Go Back'); + var url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm; + var optIn = true; + var title = null; + var message = gettextCatalog.getString('Search on Explorer.Bitcoin.com'); + var okText = gettextCatalog.getString('Open Explorer'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 641e7e612..e8c636d79 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -1179,17 +1179,21 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (signedTxp.status == 'accepted') { ongoingProcess.set('broadcastingTx', true, customStatusHandler); - function handleBroadcastTx(err, broadcastedTxp) { - ongoingProcess.set('broadcastingTx', false, customStatusHandler); - if (err) return cb(bwcError.msg(err)); - $rootScope.$emit('Local/TxAction', wallet.id); - return cb(null, broadcastedTxp); - } if (signedTxp.payProUrl && signedTxp.coin == 'bch') { - payproService.broadcastBchTx(signedTxp, handleBroadcastTx); + payproService.broadcastBchTx(signedTxp, function(err, broadcastedTxp) { + ongoingProcess.set('broadcastingTx', false, customStatusHandler); + if (err) return cb(bwcError.msg(err)); + $rootScope.$emit('Local/TxAction', wallet.id); + return cb(null, broadcastedTxp); + }); } else { - root.broadcastTx(wallet, signedTxp, handleBroadcastTx); + root.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) { + ongoingProcess.set('broadcastingTx', false, customStatusHandler); + if (err) return cb(bwcError.msg(err)); + $rootScope.$emit('Local/TxAction', wallet.id); + return cb(null, broadcastedTxp); + }); } } else { $rootScope.$emit('Local/TxAction', wallet.id);