Fixes contribution process

Resolves #14018 Auditors: Test Plan:
brave · May 4, 2018 · 15a4232 · 15a4232
1 parent 8f73858
commit 15a4232
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -1675,12 +1675,6 @@ const getStateInfo = (state, parsedData) => {
     reconcileStamp: parsedData.reconcileStamp
   }
 
-  const oldReconcileStamp = ledgerState.getInfoProp(state, 'reconcileStamp')
-
-  if (oldReconcileStamp && newInfo.reconcileStamp > oldReconcileStamp) {
-    state = ledgerState.setAboutProp(state, 'status', ledgerStatuses.IN_PROGRESS)
-  }
-
   try {
     let passphrase = ledgerClient.prototype.getWalletPassphrase(parsedData)
     if (passphrase) {
@@ -2035,6 +2029,10 @@ const onCallback = (state, result, delayTime) => {
     return state
   }
 
+  if (result.getIn(['currentReconcile', 'timestamp']) === 0) {
+    state = ledgerState.setAboutProp(state, 'status', ledgerStatuses.IN_PROGRESS)
+  }
+
   const newAddress = result.getIn(['properties', 'wallet', 'addresses', 'BAT'])
   const oldAddress = ledgerState.getInfoProps(state).getIn(['addresses', 'BAT'])
 
@@ -2462,8 +2460,8 @@ const run = (state, delayTime) => {
     return
   }
 
-  const publishers = ledgerState.getPublisher(state)
-  if (publishers.isEmpty() && client.isReadyToReconcile(synopsis)) {
+  const publishers = ledgerState.getAboutProp(state, 'synopsis')
+  if (isList(publishers) && publishers.isEmpty() && client.isReadyToReconcile(synopsis)) {
     setNewTimeUntilReconcile()
   }
 

diff --git a/app/common/lib/ledgerUtil.js b/app/common/lib/ledgerUtil.js
@@ -95,7 +95,7 @@ const formattedDateFromTimestamp = (timestamp, dateFormat) => {
   return format(new Date(timestamp), dateFormat, {locale: navigator.language})
 }
 
-const walletStatus = (ledgerData) => {
+const walletStatus = (ledgerData, settings) => {
   let status = {}
 
   if (ledgerData == null) {
@@ -110,7 +110,7 @@ const walletStatus = (ledgerData) => {
     const transactions = ledgerData.get('transactions')
     const pendingFunds = Number(ledgerData.get('unconfirmed') || 0)
     const balance = Number(ledgerData.get('balance') || 0)
-    const minBalance = ledgerState.getContributionAmount(null, ledgerData.get('contributionAmount'))
+    const minBalance = ledgerState.getContributionAmount(null, ledgerData.get('contributionAmount'), settings)
 
     if (pendingFunds + balance < minBalance) {
       status.id = 'insufficientFundsStatus'

diff --git a/app/renderer/components/preferences/payment/enabledContent.js b/app/renderer/components/preferences/payment/enabledContent.js
@@ -373,7 +373,7 @@ class EnabledContent extends ImmutableComponent {
 
   render () {
     const ledgerData = this.props.ledgerData
-    const walletStatusText = walletStatus(ledgerData)
+    const walletStatusText = walletStatus(ledgerData, this.props.settings)
     const contributionAmount = ledgerState.getContributionAmount(null, ledgerData.get('contributionAmount'), this.props.settings)
     const amountList = ledgerData.get('monthlyAmounts') || ledgerUtil.defaultMonthlyAmounts
 

diff --git a/app/renderer/components/preferences/paymentsTab.js b/app/renderer/components/preferences/paymentsTab.js
@@ -371,7 +371,8 @@ class PaymentsTab extends ImmutableComponent {
       </SectionTitleWrapper>
       {
         this.enabled
-        ? <EnabledContent settings={this.props.settings}
+        ? <EnabledContent
+          settings={this.props.settings}
           onChangeSetting={this.props.onChangeSetting}
           ledgerData={this.props.ledgerData}
           showOverlay={this.props.showOverlay}