From 1a68e348c42a17fa8164c4cb601d68ddf4179f3f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 16 Apr 2015 17:44:12 -0300 Subject: [PATCH] ignorePayPro verification in chrome --- src/js/controllers/index.js | 6 ++++-- src/js/controllers/send.js | 5 ++--- src/js/controllers/walletHome.js | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index dd9fd6a71..3e67d7e2c 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) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, isChromeApp) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -134,7 +134,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r $timeout(function() { self.setOngoingProcess('updatingPendingTxps', true); $log.debug('Updating PendingTxps'); - fc.getTxProposals({}, function(err, txps) { + fc.getTxProposals({ + ignorePayPro: isChromeApp + }, function(err, txps) { self.setOngoingProcess('updatingPendingTxps', false); if (err) { $log.debug('Wallet PendingTxps ERROR:', err); diff --git a/src/js/controllers/send.js b/src/js/controllers/send.js index 7737b6f00..283c8d40f 100644 --- a/src/js/controllers/send.js +++ b/src/js/controllers/send.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sendController', - function($rootScope, $scope, $window, $timeout, $modal, $filter, $log, notification, isMobile, txStatus, isCordova, bitcore, profileService, configService, rateService) { + function($rootScope, $scope, $window, $timeout, $modal, $filter, $log, notification, isMobile, txStatus, isCordova, bitcore, profileService, configService, rateService, isChromeApp) { var fc = profileService.focusedClient; var self = this; @@ -325,9 +325,8 @@ angular.module('copayApp.controllers').controller('sendController', }; this.setFromPayPro = function(uri, form) { - var isChromeApp = window.chrome && chrome.runtime && chrome.runtime.id; if (isChromeApp) { - this.error = 'Payment Protocol not yet supported on ChromeApp'; + this.error = 'Payment Protocol not supported on Chrome App'; return; } diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 40ac16dd3..ac089aa87 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,7 +1,5 @@ 'use strict'; - -// TODO rateService angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, notification, txStatus, isCordova, profileService, lodash) {