Merge pull request #690 from brave/panel_text

Fixes panel text for rewards
brave · Oct 18, 2018 · ed8864c · ed8864c
1 parent d549184
commit ed8864c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 21 deletions.
diff --git a/components/brave_rewards/ui/reducers/publishers_reducer.ts b/components/brave_rewards/ui/reducers/publishers_reducer.ts
@@ -11,7 +11,11 @@ const publishersReducer: Reducer<Rewards.State | undefined> = (state: Rewards.St
   switch (action.type) {
     case types.ON_CONTRIBUTE_LIST:
       state = { ...state }
-      state.firstLoad = false
+      if (state.contributeLoad) {
+        state.firstLoad = false
+      } else {
+        state.contributeLoad = true
+      }
       state.autoContributeList = action.payload.list
       break
     case types.ON_NUM_EXCLUDED_SITES:
@@ -31,7 +35,11 @@ const publishersReducer: Reducer<Rewards.State | undefined> = (state: Rewards.St
       break
     case types.ON_RECURRING_DONATION_UPDATE:
       state = { ...state }
-      state.firstLoad = false
+      if (state.recurringLoad) {
+        state.firstLoad = false
+      } else {
+        state.recurringLoad = true
+      }
       state.recurringList = action.payload.list
       break
     case types.ON_REMOVE_RECURRING:
@@ -42,7 +50,11 @@ const publishersReducer: Reducer<Rewards.State | undefined> = (state: Rewards.St
       break
     case types.ON_CURRENT_TIPS:
       state = { ...state }
-      state.firstLoad = false
+      if (state.tipsLoad) {
+        state.firstLoad = false
+      } else {
+        state.tipsLoad = true
+      }
       state.tipsList = action.payload.list
       break
   }

diff --git a/components/brave_rewards/ui/storage.ts b/components/brave_rewards/ui/storage.ts
@@ -40,7 +40,10 @@ export const defaultState: Rewards.State = {
   autoContributeList: [],
   reports: {},
   recurringList: [],
-  tipsList: []
+  tipsList: [],
+  contributeLoad: false,
+  recurringLoad: false,
+  tipsLoad: false
 }
 
 const cleanData = (state: Rewards.State) => state

diff --git a/components/definitions/rewards.d.ts b/components/definitions/rewards.d.ts
@@ -18,36 +18,39 @@ declare namespace Rewards {
 
   export interface State {
     addresses?: Record<AddressesType, Address>
-    createdTimestamp: number | null
-    enabledMain: boolean
-    enabledAds: boolean
-    enabledContribute: boolean
-    firstLoad: boolean | null
-    walletCreated: boolean
-    walletCreateFailed: boolean
+    autoContributeList: Publisher[]
+    connectedWallet: boolean
+    contributeLoad: boolean
     contributionMinTime: number
     contributionMinVisits: number
     contributionMonthly: number
     contributionNonVerified: boolean
     contributionVideos: boolean
-    donationAbilityYT: boolean
+    createdTimestamp: number | null
     donationAbilityTwitter: boolean
-    numExcludedSites: number
-    walletInfo: WalletProperties
-    connectedWallet: boolean
-    recoveryKey: string
+    donationAbilityYT: boolean
+    enabledAds: boolean
+    enabledContribute: boolean
+    enabledMain: boolean
+    firstLoad: boolean | null
     grant?: Grant
+    numExcludedSites: number
     reconcileStamp: number
+    recoveryKey: string
+    recurringList: Publisher[]
+    recurringLoad: boolean
     reports: Record<string, Report>
+    tipsList: Publisher[]
+    tipsLoad: boolean
     ui: {
-      walletRecoverySuccess: boolean | null
       emptyWallet: boolean
-      walletServerProblem: boolean
       modalBackup: boolean
+      walletRecoverySuccess: boolean | null
+      walletServerProblem: boolean
     }
-    autoContributeList: Publisher[]
-    recurringList: Publisher[]
-    tipsList: Publisher[]
+    walletCreated: boolean
+    walletCreateFailed: boolean
+    walletInfo: WalletProperties
   }
 
   export interface ComponentProps {