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

Merge pull request #2210 from isocolsky/fix_paypro

Browse source 
Fixed cached amount for paypro uri
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-19 16:50:06 -03:00
commit 877412844c
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/send.js
View file

@ -414,7 +414,7 @@ angular.module('copayApp.controllers').controller('SendController',
} else { } else {
$scope._merchantData = merchantData; $scope._merchantData = merchantData;
$scope._domain = merchantData.domain; $scope._domain = merchantData.domain;
$scope.setForm(null, merchantData.unitTotal); $scope.setForm(null, merchantData.total * satToUnit);
} }
}); });
}; };

2
js/models/Wallet.js
View file

@ -1798,8 +1798,6 @@ Wallet.prototype._addOutputsToMerchantData = function(merchantData) {
if (merchantData.total == "0" && options.amount) { if (merchantData.total == "0" && options.amount) {
merchant.outs[0].amountSatStr = merchantData.total = options.amount; merchant.outs[0].amountSatStr = merchantData.total = options.amount;
} }
merchantData.unitTotal = merchantData.total ? (+merchantData.total / this.settings.unitToSatoshi) + '' : 0;
}; };
/** /**