fix powerdown-amount (#2160)

Fix #2159
busyorg · Jan 23, 2019 · c914d0b · c914d0b
1 parent 3162d6e
commit c914d0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/client/helpers/user.js b/src/client/helpers/user.js
@@ -32,7 +32,10 @@ export const getTotalShares = user =>
   parseFloat(user.vesting_shares) +
   parseFloat(user.received_vesting_shares) -
   parseFloat(user.delegated_vesting_shares) -
-  parseFloat(user.vesting_withdraw_rate);
+  Math.min(
+    parseFloat(user.vesting_withdraw_rate),
+    (parseFloat(user.to_withdraw) - parseFloat(user.withdrawn)) / 100000,
+  );
 
 export const getHasDefaultSlider = user => getTotalShares(user) >= 10000000;
 

diff --git a/src/client/vendor/steemitHelpers.js b/src/client/vendor/steemitHelpers.js
@@ -194,7 +194,14 @@ export const calculateTotalDelegatedSP = (user, totalVestingShares, totalVesting
 
 export const calculatePendingWithdrawalSP = (user, totalVestingShares, totalVestingFundSteem) => {
   return parseFloat(
-    formatter.vestToSteem(user.vesting_withdraw_rate, totalVestingShares, totalVestingFundSteem),
+    formatter.vestToSteem(
+      Math.min(
+        parseFloat(user.vesting_withdraw_rate),
+        (parseFloat(user.to_withdraw) - parseFloat(user.withdrawn)) / 100000,
+      ),
+      totalVestingShares,
+      totalVestingFundSteem,
+    ),
   );
 };