BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wire alternative amount

This commit is contained in:
Marty Alcala 2016-10-21 17:20:46 -04:00
parent ade2fb1c80
commit f8f56544ae
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/js/controllers/modals/txDetails.js
View File

@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
updateMemo(); updateMemo();
initActionList(); initActionList();
getAlternativeAmount(); //getAlternativeAmount();
}; };
function getDisplayAmount(amountStr) { function getDisplayAmount(amountStr) {
@ -138,28 +138,28 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
}); });
}; };
var getAlternativeAmount = function() { // var getAlternativeAmount = function() {
var satToBtc = 1 / 100000000; // var satToBtc = 1 / 100000000;
//
wallet.getFiatRate({ // wallet.getFiatRate({
code: $scope.alternativeIsoCode, // code: $scope.alternativeIsoCode,
ts: $scope.btx.time * 1000 // ts: $scope.btx.time * 1000
}, function(err, res) { // }, function(err, res) {
if (err) { // if (err) {
$log.debug('Could not get historic rate'); // $log.debug('Could not get historic rate');
return; // return;
} // }
if (res && res.rate) { // if (res && res.rate) {
var alternativeAmountBtc = ($scope.btx.amount * satToBtc).toFixed(8); // var alternativeAmountBtc = ($scope.btx.amount * satToBtc).toFixed(8);
$scope.rateDate = res.fetchedOn; // $scope.rateDate = res.fetchedOn;
$scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode; // $scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode;
$scope.alternativeAmountStr = $filter('formatFiatAmount')(alternativeAmountBtc * res.rate) + ' ' + $scope.alternativeIsoCode; // $scope.alternativeAmountStr = $filter('formatFiatAmount')(alternativeAmountBtc * res.rate) + ' ' + $scope.alternativeIsoCode;
$timeout(function() { // $timeout(function() {
$scope.$apply(); // $scope.$apply();
}); // });
} // }
}); // });
}; // };
$scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) {
externalLinkService.open(url, optIn, title, message, okText, cancelText); externalLinkService.open(url, optIn, title, message, okText, cancelText);

4
www/views/modals/tx-details.html
View File

@ -7,7 +7,7 @@
</ion-nav-back-button> </ion-nav-back-button>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds}"> <ion-content>
<div class="list"> <div class="list">
<div class="item head"> <div class="item head">
<div class="sending-label"> <div class="sending-label">
@ -16,7 +16,7 @@
</div> </div>
<div class="amount-label"> <div class="amount-label">
<div class="amount">{{displayAmount}} <span class="unit">{{displayUnit}}</span></div> <div class="amount">{{displayAmount}} <span class="unit">{{displayUnit}}</span></div>
<div class="alternative">{{alternativeAmountStr}}</div> <div class="alternative">{{btx.alternativeAmountStr}}</div>
</div> </div>
</div> </div>
<div class="info"> <div class="info">