mirror of https://github.com/BTCPrivate/copay.git
commit
cf5290d3e5
|
@ -61,11 +61,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
$scope.notAvailable = true;
|
$scope.notAvailable = true;
|
||||||
$log.warn('No wallet available to make the payment');
|
$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) {
|
txFormatService.formatAlternativeStr(amount, function(v) {
|
||||||
$scope.alternativeAmountStr = v;
|
$scope.alternativeAmountStr = v;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$timeout(function() {
|
||||||
|
$scope.$apply();
|
||||||
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on('accepted', function(event) {
|
$scope.$on('accepted', function(event) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'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 = {};
|
var root = {};
|
||||||
|
|
||||||
|
@ -87,13 +87,13 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Protocol
|
// 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});
|
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});
|
return $state.go('uricoinbase', {url: data});
|
||||||
|
|
||||||
// Join
|
// 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();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
@ -102,7 +102,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Old join
|
// 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();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
|
Loading…
Reference in New Issue