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

Replace parseBitcoinURI with bitcore implementation

Browse source
This commit is contained in:
Yemel Jardi 2014-08-13 15:10:37 -03:00
commit b19a0daa64
6 changed files with 19 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/controllers/home.js
View file

@ -6,8 +6,5 @@ angular.module('copayApp.controllers').controller('HomeController',
controllerUtils.redirIfLogged();
$scope.loading = false;
if ($rootScope.pendingPayment) {
notification.info('Login Required', 'Please open wallet to complete payment');
}
$scope.hasWallets = (walletFactory.getWallets() && walletFactory.getWallets().length > 0) ? true : false;
});

4
js/controllers/open.js
View file

@ -3,6 +3,10 @@
angular.module('copayApp.controllers').controller('OpenController', function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
controllerUtils.redirIfLogged();
if ($rootScope.pendingPayment) {
notification.info('Login Required', 'Please open wallet to complete payment');
}
var cmp = function(o1, o2) {
var v1 = o1.show.toLowerCase(),
v2 = o2.show.toLowerCase();

14
js/controllers/send.js
View file

@ -38,9 +38,9 @@ angular.module('copayApp.controllers').controller('SendController',
if ($rootScope.pendingPayment) {
var pp = $rootScope.pendingPayment;
$scope.address = pp.address;
var amount = pp.amount / config.unitToSatoshi * 100000000;
var amount = pp.data.amount / config.unitToSatoshi * 100000000;
$scope.amount = amount;
$scope.commentText = pp.message;
$scope.commentText = pp.data.message;
}
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
@ -261,12 +261,12 @@ angular.module('copayApp.controllers').controller('SendController',
function onSuccess(result) {
if (result.cancelled) return;
debugger;
var bip21 = copay.HDPath.parseBitcoinURI(result.text);
$scope.address = bip21.address;
var bip21 = new bitcore.BIP21(result.text);
$scope.address = bip21.address + '';
$scope.commentText = bip21.data.message;
if (bip21.amount) {
$scope.amount = bip21.amount * bitcore.util.COIN * satToUnit;
if (bip21.data.amount) {
$scope.amount = bip21.data.amount * bitcore.util.COIN * satToUnit;
}
$rootScope.$digest();

11
js/controllers/uriPayment.js
View file

@ -1,16 +1,13 @@
'use strict';
var bitcore = require('bitcore');
angular.module('copayApp.controllers').controller('UriPaymentController', function($rootScope, $scope, $routeParams, $timeout, $location) {
var data = decodeURIComponent($routeParams.data);
$rootScope.pendingPayment = copay.HDPath.parseBitcoinURI($routeParams.data);
$scope.protocol = $rootScope.pendingPayment.protocol;
$scope.address = $rootScope.pendingPayment.address;
$scope.amount = $rootScope.pendingPayment.amount;
$scope.message = $rootScope.pendingPayment.message;
$rootScope.pendingPayment = new bitcore.BIP21($routeParams.data);
$timeout(function() {
$location.path('/');
$location.path('/open');
}, 1000);