Merge pull request #12154 from NejcZdovc/hotfix/#12078-funds

Fixes add funds dialog
brave · Dec 5, 2017 · 893bfa4 · 893bfa4
1 parent 7ccb2a4
commit 893bfa4
Show file tree

Hide file tree

Showing 6 changed files with 572 additions and 348 deletions.
diff --git a/app/browser/api/ledgerNotifications.js b/app/browser/api/ledgerNotifications.js
@@ -42,8 +42,8 @@ const nextAddFundsTime = 3 * ledgerUtil.milliseconds.day
 const sufficientBalanceToReconcile = (state) => {
   const balance = Number(ledgerState.getInfoProp(state, 'balance') || 0)
   const unconfirmed = Number(ledgerState.getInfoProp(state, 'unconfirmed') || 0)
-  const bat = ledgerState.getInfoProp(state, 'bat')
-  return bat && (balance + unconfirmed > 0.9 * Number(bat))
+  const budget = parseInt(getSetting(settings.PAYMENTS_CONTRIBUTION_AMOUNT), 10) || 25
+  return balance + unconfirmed >= budget
 }
 const hasFunds = (state) => {
   const balance = getSetting(settings.PAYMENTS_ENABLED)
@@ -435,7 +435,8 @@ const getMethods = () => {
       getPollingInterval: () => {
         return pollingInterval
       },
-      onDynamicResponse
+      onDynamicResponse,
+      sufficientBalanceToReconcile
     }
   }
 

diff --git a/app/common/lib/ledgerUtil.js b/app/common/lib/ledgerUtil.js
@@ -90,18 +90,28 @@ const formattedDateFromTimestamp = (timestamp, format) => {
 const walletStatus = (ledgerData) => {
   let status = {}
 
+  if (ledgerData == null) {
+    return {
+      id: 'createWalletStatus'
+    }
+  }
+
   if (ledgerData.get('error')) {
     status.id = 'statusOnError'
   } else if (ledgerData.get('created')) {
     const transactions = ledgerData.get('transactions')
-    const pendingFunds = Number(ledgerData.get('unconfirmed') || 0).toFixed(2)
+    const pendingFunds = Number(ledgerData.get('unconfirmed') || 0)
+    const balance = Number(ledgerData.get('balance') || 0)
+    const minBalance = parseInt(getSetting(settings.PAYMENTS_CONTRIBUTION_AMOUNT), 10) || 25
 
-    if (pendingFunds + Number(ledgerData.get('balance') || 0) <
-      0.9 * Number(ledgerData.get('bat') || 0)) {
+    if (pendingFunds + balance < minBalance) {
       status.id = 'insufficientFundsStatus'
     } else if (pendingFunds > 0) {
+      const converted = batToCurrencyString(pendingFunds, ledgerData)
       status.id = 'pendingFundsStatus'
-      status.args = {funds: `${pendingFunds} BAT (${batToCurrencyString(pendingFunds, ledgerData)})`}
+      status.args = {
+        funds: `${pendingFunds.toFixed(2)} BAT${converted ? ` (${converted})` : ''}`
+      }
     } else if (transactions && transactions.size > 0) {
       status.id = 'defaultWalletStatus'
     } else {
@@ -112,6 +122,7 @@ const walletStatus = (ledgerData) => {
   } else {
     status.id = 'createWalletStatus'
   }
+
   return status
 }