diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index ce69f5903..4fb045216 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesController', - function($scope, $rootScope, $timeout, $log, configService, profileService, txSignService) { + function($scope, $rootScope, $timeout, $log, configService, profileService, txService) { var fc = profileService.focusedClient; $scope.deleted = false; @@ -75,7 +75,7 @@ angular.module('copayApp.controllers').controller('preferencesController', }; opts.touchIdFor[walletId] = newVal; - txSignService.setTouchId(function(err) { + txService.setTouchId(function(err) { if (err) { $log.debug(err); $timeout(function() { diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index a3bc09b62..3f4f9f612 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sellGlideraController', - function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp, animationService, txSignService) { + function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp, animationService, txService) { var self = this; var config = configService.getSync(); @@ -130,7 +130,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', self.error = null; - txSignService.prepare(function(err) { + txService.prepare(function(err) { if (err) { self.error = err; return; @@ -174,7 +174,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', return; } - txSignService.sign(txp, function(err, txp) { + txService.sign(txp, function(err, txp) { if (err) { self.loading = null; self.error = err; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 0a08a00f7..2fddf78c4 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, txSignService) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, txService) { var self = this; window.ignoreMobilePause = false; @@ -324,7 +324,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.error = null; $scope.loading = true; - txSignService.prepareAndSignAndBroadcast(txp, { + txService.prepareAndSignAndBroadcast(txp, { reporterFn: self.setOngoingProcess.bind(self) }, function(err, txp) { $scope.loading = false; @@ -818,7 +818,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; self.setOngoingProcess(gettextCatalog.getString('Creating transaction')); - txSignService.createTx(opts, function(err, txp) { + txService.createTx(opts, function(err, txp) { self.setOngoingProcess(); if (err) { return self.setSendError(err); @@ -845,12 +845,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.acceptTx = function(txp) { var self = this; - txSignService.prepare(function(err) { + txService.prepare(function(err) { if (err) { return self.setSendError(err); } self.setOngoingProcess(gettextCatalog.getString('Sending transaction')); - txSignService.publishTx(txp, function(err, txpPublished) { + txService.publishTx(txp, function(err, txpPublished) { if (err) { self.setOngoingProcess(); self.setSendError(err); @@ -864,7 +864,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.prepareSignAndBroadcastTx = function(txp) { var fc = profileService.focusedClient; var self = this; - txSignService.prepareAndSignAndBroadcast(txp, { + txService.prepareAndSignAndBroadcast(txp, { reporterFn: self.setOngoingProcess.bind(self) }, function(err, txp) { self.resetForm(); diff --git a/src/js/services/txSignService.js b/src/js/services/txService.js similarity index 97% rename from src/js/services/txSignService.js rename to src/js/services/txService.js index af54aca70..97cb78089 100644 --- a/src/js/services/txSignService.js +++ b/src/js/services/txService.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('txSignService', function($rootScope, profileService, gettextCatalog, lodash, trezor, ledger, configService, bwsError, $log, feeService) { +angular.module('copayApp.services').factory('txService', function($rootScope, profileService, gettextCatalog, lodash, trezor, ledger, configService, bwsError, $log, feeService) { var root = {}; var reportSigningStatus = function(opts) {