BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #170 from cmgustavo/ref/design-46 

Fix paypro
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-22 19:28:48 -03:00 committed by GitHub
parent fbe14be31a d023f9b2b5
commit cf5290d3e5
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/controllers/confirm.js
View File

@ -61,11 +61,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.notAvailable = true;
$log.warn('No wallet available to make the payment');
}
$timeout(function() {
$scope.$apply();
});
return;
}
});
});
@ -73,6 +68,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txFormatService.formatAlternativeStr(amount, function(v) {
$scope.alternativeAmountStr = v;
});
$timeout(function() {
$scope.$apply();
}, 100);
};
$scope.$on('accepted', function(event) {

10
src/js/services/incomingData.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore) {
angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $ionicHistory, $state, $window, $timeout, bitcore) {
var root = {};
@ -87,13 +87,13 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
return true;
// Protocol
} else if (data.indexOf($window.appConfig.name + '://glidera')==0) {
} else if (data && data.indexOf($window.appConfig.name + '://glidera')==0) {
return $state.go('uriglidera', {url: data});
} else if (data.indexOf($window.appConfig.name + '://coinbase')==0) {
} else if (data && data.indexOf($window.appConfig.name + '://coinbase')==0) {
return $state.go('uricoinbase', {url: data});
// Join
} else if (data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
} else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
$ionicHistory.removeBackView();
$state.go('tabs.home');
$timeout(function() {
@ -102,7 +102,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
return true;
// Old join
} else if (data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
} else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
$ionicHistory.removeBackView();
$state.go('tabs.home');
$timeout(function() {