Merge pull request #1126 from brave/fix-2273

Fixes tipping report inconsistencies
brave · Jan 14, 2019 · 0d739b9 · 0d739b9
1 parent e97cf10
commit 0d739b9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -607,6 +607,7 @@ void RewardsServiceImpl::OnGrantFinish(ledger::Result result,
                                   grant.probi);
   }
 
+  GetCurrentBalanceReport();
   TriggerOnGrantFinish(result, grant);
 }
 
@@ -625,6 +626,7 @@ void RewardsServiceImpl::OnReconcileComplete(ledger::Result result,
         GetCurrentTimestamp());
   }
 
+  GetCurrentBalanceReport();
   for (auto& observer : observers_)
     observer.OnReconcileComplete(this,
                                  result,

diff --git a/components/brave_rewards/resources/ui/actions/rewards_actions.ts b/components/brave_rewards/resources/ui/actions/rewards_actions.ts
@@ -93,6 +93,8 @@ export const onBalanceReports = (reports: Record<string, Rewards.Report>) => act
   reports
 })
 
+export const getCurrentReport = () => action(types.GET_CURRENT_REPORT, {})
+
 export const excludePublisher = (publisherKey: string) => action(types.ON_EXCLUDE_PUBLISHER, {
   publisherKey
 })

diff --git a/components/brave_rewards/resources/ui/components/settingsPage.tsx b/components/brave_rewards/resources/ui/components/settingsPage.tsx
@@ -53,6 +53,7 @@ class SettingsPage extends React.Component<Props, {}> {
     this.actions.checkImported()
     this.actions.getAdsData()
     this.actions.getPendingContributionsTotal()
+    this.actions.getCurrentReport()
   }
 
   componentWillUnmount () {

diff --git a/components/brave_rewards/resources/ui/constants/rewards_types.ts b/components/brave_rewards/resources/ui/constants/rewards_types.ts
@@ -48,5 +48,6 @@ export const enum types {
   ON_ADS_DATA = '@@rewards/ON_ADS_DATA',
   ON_ADS_SETTING_SAVE = '@@rewards/ON_ADS_SETTING_SAVE',
   GET_PENDING_CONTRIBUTION_TOTAL = '@@rewards/GET_PENDING_CONTRIBUTION_TOTAL',
-  ON_PENDING_CONTRIBUTION_TOTAL = '@@rewards/ON_PENDING_CONTRIBUTION_TOTAL'
+  ON_PENDING_CONTRIBUTION_TOTAL = '@@rewards/ON_PENDING_CONTRIBUTION_TOTAL',
+  GET_CURRENT_REPORT = '@@rewards/GET_CURRENT_REPORT'
 }
diff --git a/components/brave_rewards/resources/ui/reducers/wallet_reducer.ts b/components/brave_rewards/resources/ui/reducers/wallet_reducer.ts
@@ -170,6 +170,11 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
         }
         break
       }
+    case types.GET_CURRENT_REPORT:
+      {
+        chrome.send('brave_rewards.getBalanceReports')
+        break
+      }
     case types.ON_BALANCE_REPORTS:
       {
         state = { ...state }