From c5fc4c764b060f10e9ef6308b43df718e2e21b26 Mon Sep 17 00:00:00 2001
From: NejcZdovc <nejc.zdovc@3zsistemi.si>
Date: Fri, 21 Dec 2018 07:58:02 +0100
Subject: [PATCH] Fixes stuck reconile stamp

Resolves https://github.com/brave/brave-browser/issues/2206
---
 .../resources/ui/actions/rewards_actions.ts   |  2 ++
 .../resources/ui/components/settingsPage.tsx  |  7 ++++---
 .../resources/ui/constants/rewards_types.ts   |  3 ++-
 .../resources/ui/reducers/wallet_reducer.ts   | 19 ++++++++++++-------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/brave_rewards/resources/ui/actions/rewards_actions.ts b/components/brave_rewards/resources/ui/actions/rewards_actions.ts
index 8cd14cd7d94e..b330f8016c0a 100644
--- a/components/brave_rewards/resources/ui/actions/rewards_actions.ts
+++ b/components/brave_rewards/resources/ui/actions/rewards_actions.ts
@@ -151,3 +151,5 @@ export const onAdsSettingSave = (key: string, value: any) => action(types.ON_ADS
   key,
   value
 })
+
+export const getReconcileStamp = () => action(types.GET_RECONCILE_STAMP)
diff --git a/components/brave_rewards/resources/ui/components/settingsPage.tsx b/components/brave_rewards/resources/ui/components/settingsPage.tsx
index 16f767d56417..2148cceb630d 100644
--- a/components/brave_rewards/resources/ui/components/settingsPage.tsx
+++ b/components/brave_rewards/resources/ui/components/settingsPage.tsx
@@ -47,12 +47,13 @@ class SettingsPage extends React.Component<Props, {}> {
       this.actions.getWalletProperties()
     }, 60000)
 
-    this.actions.getGrant()
+    this.actions.getCurrentReport()
     this.actions.getDonationTable()
     this.actions.getContributeList()
-    this.actions.checkImported()
     this.actions.getAdsData()
-    this.actions.getCurrentReport()
+    this.actions.checkImported()
+    this.actions.getReconcileStamp()
+    this.actions.getGrant()
   }
 
   componentWillUnmount () {
diff --git a/components/brave_rewards/resources/ui/constants/rewards_types.ts b/components/brave_rewards/resources/ui/constants/rewards_types.ts
index c6f45f1d1107..3a1ee3dbdfa8 100644
--- a/components/brave_rewards/resources/ui/constants/rewards_types.ts
+++ b/components/brave_rewards/resources/ui/constants/rewards_types.ts
@@ -47,5 +47,6 @@ export const enum types {
   GET_ADS_DATA = '@@rewards/GET_ADS_DATA',
   ON_ADS_DATA = '@@rewards/ON_ADS_DATA',
   ON_ADS_SETTING_SAVE = '@@rewards/ON_ADS_SETTING_SAVE',
-  GET_CURRENT_REPORT = '@@rewards/GET_CURRENT_REPORT'
+  GET_CURRENT_REPORT = '@@rewards/GET_CURRENT_REPORT',
+  GET_RECONCILE_STAMP = '@@rewards/GET_RECONCILE_STAMP'
 }
diff --git a/components/brave_rewards/resources/ui/reducers/wallet_reducer.ts b/components/brave_rewards/resources/ui/reducers/wallet_reducer.ts
index 872f45f5c04f..6abba864980b 100644
--- a/components/brave_rewards/resources/ui/reducers/wallet_reducer.ts
+++ b/components/brave_rewards/resources/ui/reducers/wallet_reducer.ts
@@ -15,8 +15,8 @@ const createWallet = (state: Rewards.State) => {
   state.enabledContribute = true
   state.createdTimestamp = new Date().getTime()
 
-  chrome.send('brave_rewards.getReconcileStamp', [])
-  chrome.send('brave_rewards.getAddresses', [])
+  chrome.send('brave_rewards.getReconcileStamp')
+  chrome.send('brave_rewards.getAddresses')
 
   return state
 }
@@ -27,7 +27,7 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
       state = { ...state }
       state.walletCreateFailed = false
       state.walletCreated = false
-      chrome.send('brave_rewards.createWalletRequested', [])
+      chrome.send('brave_rewards.createWalletRequested')
       break
     case types.WALLET_CREATED:
       state = { ...state }
@@ -38,7 +38,7 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
       state.walletCreateFailed = true
       break
     case types.GET_WALLET_PROPERTIES:
-      chrome.send('brave_rewards.getWalletProperties', [])
+      chrome.send('brave_rewards.getWalletProperties')
       break
     case types.ON_WALLET_PROPERTIES:
       {
@@ -68,7 +68,7 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
         break
       }
     case types.GET_WALLLET_PASSPHRASE:
-      chrome.send('brave_rewards.getWalletPassphrase', [])
+      chrome.send('brave_rewards.getWalletPassphrase')
       break
     case types.ON_WALLLET_PASSPHRASE:
       const value = action.payload.pass
@@ -106,8 +106,8 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
         if (result === 0) {
           walletInfo.balance = balance
           walletInfo.grants = grants || []
-          chrome.send('brave_rewards.getWalletPassphrase', [])
-          chrome.send('brave_rewards.getAddresses', [])
+          chrome.send('brave_rewards.getWalletPassphrase')
+          chrome.send('brave_rewards.getAddresses')
           ui.emptyWallet = balance <= 0
           ui.modalBackup = false
           ui.walletCorrupted = false
@@ -202,6 +202,11 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
         state.contributionMonthly = action.payload.amount
         break
       }
+    case types.GET_RECONCILE_STAMP:
+      {
+        chrome.send('brave_rewards.getReconcileStamp')
+        break
+      }
   }
 
   return state