From 2c3eb25240b7b3822bc24a3cfbeacf93e2d9b382 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 16 Apr 2015 19:44:12 -0300 Subject: [PATCH] use new bwc global paypro verify flag --- bower.json | 2 +- src/js/controllers/index.js | 3 +-- src/js/services/profileService.js | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 8278395db..d90c214cb 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,7 @@ "foundation-icon-fonts": "*", "ng-lodash": "~0.2.0", "angular-moment": "~0.9.0", - "angular-bitcore-wallet-client": "^0.0.17", + "angular-bitcore-wallet-client": "^0.0.18", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", "angular-ui-switch": "~0.1.0" diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 3e67d7e2c..9118b415c 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, isChromeApp) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -135,7 +135,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setOngoingProcess('updatingPendingTxps', true); $log.debug('Updating PendingTxps'); fc.getTxProposals({ - ignorePayPro: isChromeApp }, function(err, txps) { self.setOngoingProcess('updatingPendingTxps', false); if (err) { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 11bdc4bc1..00924533c 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.services') - .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, pluginManager, balanceService, applicationService, storageService, bwcService, configService, notificationService, notification) { + .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, pluginManager, balanceService, applicationService, storageService, bwcService, configService, notificationService, notification, isChromeApp) { var root = {}; @@ -96,6 +96,8 @@ angular.module('copayApp.services') }); root.walletClients[credentials.walletId].started = true; + root.walletClients[credentials.walletId].doNotVerifyPayPro = isChromeApp; + client.initNotifications(function(err) { if (err) { $log.error('Could not init notifications err:', err);