From 6c6d90ebfef5c24079a355601ccbee004ada2e50 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Tue, 5 Jun 2018 11:15:33 +0200 Subject: [PATCH] Cleaner way without redundant code --- src/js/services/walletService.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index e8c636d79..774fa0906 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -1180,20 +1180,17 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (signedTxp.status == 'accepted') { ongoingProcess.set('broadcastingTx', true, customStatusHandler); + var handleBroadcastTx = 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); + }; + if (signedTxp.payProUrl && signedTxp.coin == 'bch') { - 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); - }); + payproService.broadcastBchTx(signedTxp, handleBroadcastTx); } else { - 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); - }); + root.broadcastTx(wallet, signedTxp, handleBroadcastTx); } } else { $rootScope.$emit('Local/TxAction', wallet.id);