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

fix payment intent

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-09 15:46:03 -03:00
commit aa43273f8d
5 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/controllers/paymentUri.js
View file

@ -7,11 +7,12 @@ angular.module('copayApp.controllers').controller('paymentUriController', functi
angular.forEach($location.search(), function(value, key) {
query.push(key + "=" + value);
});
var queryString = query ? "?" + query.join("&") : "";
var bitcoinURI = $routeParams.data + queryString;
var queryString = query ? query.join("&") : null;
var bitcoinURI = $routeParams.data + ( queryString ? '?' + queryString : '');
var uri = new bitcore.BIP21(bitcoinURI);
if (uri.isValid()) {
if (uri && uri.address && (_.isString(uri.address) || uri.address.isValid()) ) {
copay.logger.debug('Payment Intent:', bitcoinURI);
$rootScope.pendingPayment = bitcoinURI;
}

9
js/controllers/send.js
View file

@ -29,8 +29,10 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.isMobile = isMobile.any();
if ($rootScope.pendingPayment) {
$scope.setFromUri($rootScope.pendingPayment)
$rootScope.pendingPayment = null;
$timeout(function() {
$scope.setFromUri($rootScope.pendingPayment)
$rootScope.pendingPayment = null;
},100);
}
$scope.setInputs();
@ -154,11 +156,8 @@ angular.module('copayApp.controllers').controller('SendController',
amountSat: amount,
comment: comment,
}, function(err, txid, status) {
console.log('[send.js.156:txid:]', txid); //TODO
console.log('[send.js.156:status:]', status); //TODO
$scope.loading = false;
console.log('[send.js.158]'); //TODO
if (err)
return $scope.setError(err);

44
js/controllers/walletForPayment.js
View file

@ -1,27 +1,9 @@
var bitcore = require('bitcore');
angular.module('copayApp.controllers').controller('walletForPaymentController', function($rootScope, $scope, $modal, go) {
console.log('[walletForPayment.js.4]'); //TODO
if (!$rootScope.pendingPayment) {
go.walletHome();
} else {
console.log('[walletForPayment.js.9]'); //TODO
$scope.selectWallet(function(w) {
if (w) {
identityService.setFocusedWallet(w);
go.send();
} else {
go.walletHome();
}
});
}
angular.module('copayApp.controllers').controller('walletForPaymentController', function($rootScope, $scope, $modal, identityService, go) {
$scope.selectWallet = function(cb) {
console.log('[walletForPayment.js.22]'); //TODO
var ModalInstanceCtrl = function($scope, $modalInstance, $identityService) {
var ModalInstanceCtrl = function($scope, $modalInstance, identityService) {
$scope.loading = true;
preconditions.checkState($rootScope.iden);
@ -31,9 +13,7 @@ console.log('[walletForPayment.js.22]'); //TODO
});
$scope.setWallets = function() {
$scope.wallets = _.filter($rootScope.iden.listWallets(), function(w) {
return w.balanceInfo && w.balanceInfo.totalBalanceBTC;
});
$scope.wallets = $rootScope.iden.listWallets();
};
$scope.ok = function(w) {
@ -47,11 +27,25 @@ console.log('[walletForPayment.js.22]'); //TODO
};
};
console.log('[walletForPayment.js.49]'); //TODO
$modal.open({
templateUrl: 'views/modals/walletSelect.html',
templateUrl: 'views/modals/walletSelection.html',
windowClass: 'tiny',
controller: ModalInstanceCtrl,
});
};
// INIT: (not it a function, since there is no associated html)
if (!$rootScope.pendingPayment) {
go.walletHome();
} else {
$scope.selectWallet(function(w) {
if (w) {
identityService.setFocusedWallet(w);
go.send();
} else {
go.walletHome();
}
});
};
});