Optimizes react queries

Resolves brave/brave-browser#6335
brave · Nov 18, 2019 · 379fd37 · 379fd37
1 parent cd6e4e8
commit 379fd37
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/app.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/app.tsx
@@ -46,28 +46,20 @@ export class RewardsPanel extends React.Component<Props, State> {
     })
 
     chrome.windows.getCurrent({}, this.onWindowCallback)
+
     chrome.braveRewards.getRewardsMainEnabled(((enabled: boolean) => {
       this.props.actions.onEnabledMain(enabled)
     }))
 
-    chrome.braveRewards.getACEnabled(((enabled: boolean) => {
-      this.props.actions.onEnabledAC(enabled)
-    }))
-
-    chrome.braveRewards.getRecurringTips((tips: RewardsExtension.RecurringTips) => {
-      this.props.actions.onRecurringTips(tips)
-    })
-
     chrome.braveRewards.getAllNotifications((list: RewardsExtension.Notification[]) => {
       this.props.actions.onAllNotifications(list)
     })
 
-    if (!this.props.rewardsPanelData.enabledMain) {
-      const { externalWallet } = this.props.rewardsPanelData
-      utils.getExternalWallet(this.actions, externalWallet)
-    }
+    const { externalWallet } = this.props.rewardsPanelData
+    utils.getExternalWallet(this.actions, externalWallet)
 
     this.handleGrantNotification()
+    this.getBalance()
   }
 
   componentDidUpdate (prevProps: Props, prevState: State) {
@@ -79,9 +71,16 @@ export class RewardsPanel extends React.Component<Props, State> {
     }
     if (!prevProps.rewardsPanelData.enabledMain && this.props.rewardsPanelData.enabledMain) {
       chrome.windows.getCurrent({}, this.onWindowCallback)
+      this.getBalance()
     }
   }
 
+  getBalance () {
+    chrome.braveRewards.fetchBalance((balance: RewardsExtension.Balance) => {
+      this.actions.onBalance(balance)
+    })
+  }
+
   handleGrantNotification = () => {
     const hash = window && window.location && window.location.hash
 

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx
@@ -62,7 +62,10 @@ export class Panel extends React.Component<Props, State> {
       })
     }
 
-    this.getBalance()
+    chrome.braveRewards.getACEnabled((enabled: boolean) => {
+      this.props.actions.onEnabledAC(enabled)
+    })
+
     this.actions.getGrants()
     this.actions.getWalletProperties()
     this.actions.getCurrentReport()
@@ -71,8 +74,9 @@ export class Panel extends React.Component<Props, State> {
       this.actions.OnPendingContributionsTotal(amount)
     }))
 
-    const { externalWallet } = this.props.rewardsPanelData
-    utils.getExternalWallet(this.actions, externalWallet)
+    chrome.braveRewards.getRecurringTips((tips: RewardsExtension.RecurringTips) => {
+      this.props.actions.onRecurringTips(tips)
+    })
   }
 
   componentDidUpdate (prevProps: Props, prevState: State) {
@@ -92,17 +96,10 @@ export class Panel extends React.Component<Props, State> {
     }
 
     if (!prevProps.rewardsPanelData.enabledMain && this.props.rewardsPanelData.enabledMain) {
-      this.getBalance()
       this.actions.getGrants()
     }
   }
 
-  getBalance () {
-    chrome.braveRewards.fetchBalance((balance: RewardsExtension.Balance) => {
-      this.actions.onBalance(balance)
-    })
-  }
-
   componentWillUnmount () {
     clearTimeout(this.delayTimer)
   }