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

Sending BIP70 payments.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-07 11:59:36 +12:00
commit 38852d32d4
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/amount.js
View file

@ -365,7 +365,8 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
vm.alternativeAmount = txFormatService.formatAmount(amountInSatoshis, true); vm.alternativeAmount = txFormatService.formatAmount(amountInSatoshis, true);
vm.allowSend = lodash.isNumber(a) vm.allowSend = lodash.isNumber(a)
&& a > 0 && a > 0
&& (a >= vm.minAmount && a <= vm.maxAmount) && (!vm.minAmount || a >= vm.minAmount)
&& (!vm.maxAmount || a <= vm.maxAmount)
&& !vm.fundsAreInsufficient; && !vm.fundsAreInsufficient;
} else { } else {
if (result) { if (result) {
@ -385,7 +386,8 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
vm.alternativeAmount = $filter('formatFiatAmount')(toFiat(result)); vm.alternativeAmount = $filter('formatFiatAmount')(toFiat(result));
vm.allowSend = lodash.isNumber(result) vm.allowSend = lodash.isNumber(result)
&& result > 0 && result > 0
&& (result >= vm.minAmount && result <= vm.maxAmount) && (!vm.minAmount || result >= vm.minAmount)
&& (!vm.maxAmount || result <= vm.maxAmount)
&& !vm.fundsAreInsufficient; && !vm.fundsAreInsufficient;
} }

6
src/js/controllers/review.controller.js
View file

@ -110,13 +110,14 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
} }
vm.approve = function() { vm.approve = function() {
if (vm.thirdParty.id === 'shapeshift') if (vm.thirdParty.id === 'shapeshift')
return; return;
if (!tx || !vm.originWallet) return; if (!tx || !vm.originWallet) return;
if ($scope.paymentExpired) { if (vm.paymentExpired) {
popupService.showAlert(null, gettextCatalog.getString('This bitcoin payment request has expired.')); popupService.showAlert(null, gettextCatalog.getString('This bitcoin payment request has expired.'));
$scope.sendStatus = ''; vm.sendStatus = '';
$timeout(function() { $timeout(function() {
$scope.$apply(); $scope.$apply();
}); });
@ -445,6 +446,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
function handleThirdPartyInitIfBip70() { function handleThirdPartyInitIfBip70() {
if (vm.thirdParty.id === 'bip70') { if (vm.thirdParty.id === 'bip70') {
vm.sendingTitle = gettextCatalog.getString('You are paying');
vm.memo = vm.thirdParty.memo; vm.memo = vm.thirdParty.memo;
vm.memoExpanded = !!vm.memo; vm.memoExpanded = !!vm.memo;