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

Merge pull request #2530 from matiu/feat/paypro-chrome

Browse source 
ignorePayPro verification in chrome
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-16 18:41:39 -03:00
commit dcb80d1b89
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -18,7 +18,7 @@
"foundation-icon-fonts": "*", "foundation-icon-fonts": "*",
"ng-lodash": "~0.2.0", "ng-lodash": "~0.2.0",
"angular-moment": "~0.9.0", "angular-moment": "~0.9.0",
"angular-bitcore-wallet-client": "^0.0.16", "angular-bitcore-wallet-client": "^0.0.17",
"angular-ui-router": "~0.2.13", "angular-ui-router": "~0.2.13",
"qrcode-decoder-js": "*", "qrcode-decoder-js": "*",
"angular-ui-switch": "~0.1.0" "angular-ui-switch": "~0.1.0"

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) {

4
src/js/services/isChromeApp.js Normal file
View file

@ -0,0 +1,4 @@
'use strict';
angular.module('copayApp.services').value('isChromeApp', window.chrome && chrome.runtime && chrome.runtime.id);