anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

ignorePayPro verification in chrome

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-16 17:44:12 -03:00
commit 1a68e348c4
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/index.js
View file

@ -1,6 +1,6 @@
'use strict'; '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; var self = this;
self.isCordova = isCordova; self.isCordova = isCordova;
self.onGoingProcess = {}; self.onGoingProcess = {};
@ -134,7 +134,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$timeout(function() { $timeout(function() {
self.setOngoingProcess('updatingPendingTxps', true); self.setOngoingProcess('updatingPendingTxps', true);
$log.debug('Updating PendingTxps'); $log.debug('Updating PendingTxps');
fc.getTxProposals({}, function(err, txps) { fc.getTxProposals({
ignorePayPro: isChromeApp
}, function(err, txps) {
self.setOngoingProcess('updatingPendingTxps', false); self.setOngoingProcess('updatingPendingTxps', false);
if (err) { if (err) {
$log.debug('Wallet PendingTxps ERROR:', err); $log.debug('Wallet PendingTxps ERROR:', err);

5
src/js/controllers/send.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('sendController', 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 fc = profileService.focusedClient;
var self = this; var self = this;
@ -325,9 +325,8 @@ angular.module('copayApp.controllers').controller('sendController',
}; };
this.setFromPayPro = function(uri, form) { this.setFromPayPro = function(uri, form) {
var isChromeApp = window.chrome && chrome.runtime && chrome.runtime.id;
if (isChromeApp) { if (isChromeApp) {
this.error = 'Payment Protocol not yet supported on ChromeApp'; this.error = 'Payment Protocol not supported on Chrome App';
return; return;
} }

2
src/js/controllers/walletHome.js
View file

@ -1,7 +1,5 @@
'use strict'; 'use strict';
// TODO rateService
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, notification, txStatus, isCordova, profileService, lodash) { angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, notification, txStatus, isCordova, profileService, lodash) {