diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 9f0e15c74..3e37210ea 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -3,6 +3,7 @@
angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory) {
var self = this;
+ var runningBalance;
$scope.dateRange = { value: 'last30Days'};
$scope.network = bitpayCardService.getEnvironment();
@@ -68,10 +69,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
self.getStarted = getStarted;
var txs = lodash.clone(history.txs);
+ runningBalance = parseFloat(history.endingBalance);
for (var i = 0; i < txs.length; i++) {
txs[i] = _getMerchantInfo(txs[i]);
txs[i].icon = _getIconName(txs[i]);
txs[i].desc = _processDescription(txs[i]);
+ txs[i].price = _price(txs[i]);
+ txs[i].runningBalance = runningBalance;
+ _runningBalance(txs[i]);
}
self.bitpayCardTransactionHistory = txs;
self.bitpayCardCurrentBalance = history.currentCardBalance;
@@ -117,6 +122,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
return tx.description;
};
+ var _price = function(tx) {
+ return parseFloat(tx.amount) + parseFloat(tx.fee)
+ };
+
+ var _runningBalance = function(tx) {
+ runningBalance -= parseFloat(tx.amount);
+ };
+
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.cardId = data.stateParams.id;
if (!$scope.cardId) {
diff --git a/src/sass/shame.scss b/src/sass/shame.scss
index b2fa628e2..50c888ce6 100644
--- a/src/sass/shame.scss
+++ b/src/sass/shame.scss
@@ -401,6 +401,14 @@ input[type=number] {
font-weight: 700;
}
+.text-gray {
+ color: gray;
+}
+
+.text-italic {
+ font-style: italic;
+}
+
.no-border {
border-style: none;
background-color: transparent !important;
diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index e1714eaad..70bd2d762 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -34,4 +34,7 @@
padding: 0;
width: 100%;
}
+ .item-select select {
+ color: #667;
+ }
}
diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html
index b187f2412..10b958a6f 100644
--- a/www/views/bitpayCard.html
+++ b/www/views/bitpayCard.html
@@ -4,8 +4,8 @@