prelim bitcoin address support for incoming data menu

This commit is contained in:
Marty Alcala 2016-10-18 15:45:09 -04:00
commit e9aaec3c68
3 changed files with 53 additions and 22 deletions

View file

@ -1,15 +1,18 @@
'use strict';
angular.module('copayApp.directives')
.directive('incomingDataMenu', function($timeout, $rootScope) {
.directive('incomingDataMenu', function($timeout, $rootScope, bitcore) {
return {
restrict: 'E',
templateUrl: 'views/includes/incomingDataMenu.html',
link: function(scope, element, attrs) {
$rootScope.$on('incomingDataMenu.showMenu', function(event, data) {
$timeout(function() {
scope.data = data;
scope.data = data.data;
scope.type = data.type;
scope.showMenu = true;
console.log('data', data);
});
});
scope.hide = function() {

View file

@ -8,10 +8,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
$rootScope.$broadcast('incomingDataMenu.showMenu', data);
};
$timeout(function() {
var data = 'https://bitpay.com';
root.redir(data);
}, 2000);
// $timeout(function() {
// var data = 'https://bitpay.com';
// root.redir(data);
// }, 2000);
root.redir = function(data) {
$log.debug('Processing incoming data:' +data);
@ -44,6 +44,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
data = sanitizeUri(data);
data = '1F1tAaz5x1HUXrCNLbtMDqcw6o5GNn4xqX';
// BIP21
if (bitcore.URI.isValid(data)) {
@ -74,7 +75,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
getPayProDetails(data, function(err, details) {
if(err) {
console.log('getPayProDetails err', err);
root.showMenu(data);
root.showMenu({data: data, type: 'url'});
return;
}
console.log('paypro details', details);
@ -90,12 +91,14 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
});
// Plain Address
} else if (bitcore.Address.isValid(data, 'livenet')) {
return root.showMenu({data: data, type: 'bitcoinAddress'});
$state.go('tabs.send');
$timeout(function() {
$state.transitionTo('tabs.send.amount', {toAddress: data});
}, 100);
return true;
} else if (bitcore.Address.isValid(data, 'testnet')) {
return root.showMenu({data: data, type: 'bitcoinAddress'});
$state.go('tabs.send');
$timeout(function() {
$state.transitionTo('tabs.send.amount', {toAddress: data});