Skip to content
This repository has been archived by the owner on Sep 2, 2023. It is now read-only.

[FIX] Calculate reserve in client #2351

Merged
merged 1 commit into from
Mar 18, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/js/controllers/app.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ function AppCtrl ($scope, id, net, keychain, txQueue, appManager, rpTracker,
});
}

function calculateReserve(server, ownerCount) {
return Amount.from_json(server._reserve_base + server._reserve_inc * ownerCount)
}

function handleAccountEntry(data)
{
var remote = net.remote;
Expand All @@ -233,11 +237,11 @@ function AppCtrl ($scope, id, net, keychain, txQueue, appManager, rpTracker,
// As per json wire format convention, real ledger entries are CamelCase,
// e.g. OwnerCount, additional convenience fields are lower case, e.g.
// reserve, max_spend.

var ownerCount = $scope.account.OwnerCount || 0;
$scope.account.reserve_base = server._reserve(0);
$scope.account.reserve = server._reserve(ownerCount);
$scope.account.reserve_to_add_trust = server._reserve(ownerCount+1);
$scope.account.reserve_low_balance = $scope.account.reserve.product_human(2);
$scope.account.reserve_base = server._reserve_base;
$scope.account.reserve = calculateReserve(server, ownerCount);
$scope.account.reserve_to_add_trust = calculateReserve(server, ownerCount + 1);

// Maximum amount user can spend
var bal = Amount.from_json(data.Balance);
Expand Down