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

use new bwc global paypro verify flag

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-16 19:44:12 -03:00
commit 2c3eb25240
3 changed files with 5 additions and 4 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.17", "angular-bitcore-wallet-client": "^0.0.18",
"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"

3
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, isChromeApp) { angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService) {
var self = this; var self = this;
self.isCordova = isCordova; self.isCordova = isCordova;
self.onGoingProcess = {}; self.onGoingProcess = {};
@ -135,7 +135,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setOngoingProcess('updatingPendingTxps', true); self.setOngoingProcess('updatingPendingTxps', true);
$log.debug('Updating PendingTxps'); $log.debug('Updating PendingTxps');
fc.getTxProposals({ fc.getTxProposals({
ignorePayPro: isChromeApp
}, function(err, txps) { }, function(err, txps) {
self.setOngoingProcess('updatingPendingTxps', false); self.setOngoingProcess('updatingPendingTxps', false);
if (err) { if (err) {

4
src/js/services/profileService.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services') 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 = {}; var root = {};
@ -96,6 +96,8 @@ angular.module('copayApp.services')
}); });
root.walletClients[credentials.walletId].started = true; root.walletClients[credentials.walletId].started = true;
root.walletClients[credentials.walletId].doNotVerifyPayPro = isChromeApp;
client.initNotifications(function(err) { client.initNotifications(function(err) {
if (err) { if (err) {
$log.error('Could not init notifications err:', err); $log.error('Could not init notifications err:', err);