Merge pull request #5275 from brave/fixes-9253-9254

Binance widget no longer disconnects when offline.
brave · Apr 21, 2020 · 84a2256 · 84a2256
1 parent 27528d0
commit 84a2256
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/components/brave_new_tab_ui/components/default/binance/index.tsx b/components/brave_new_tab_ui/components/default/binance/index.tsx
@@ -214,9 +214,7 @@ class Binance extends React.PureComponent<Props, State> {
 
     if (this.props.userAuthed) {
       this.props.onUpdateActions()
-      this.refreshInterval = setInterval(() => {
-        this.props.onUpdateActions()
-      }, 30000)
+      this.checkSetRefreshInterval()
     }
 
     if (this.props.authInProgress) {
@@ -246,10 +244,20 @@ class Binance extends React.PureComponent<Props, State> {
   componentDidUpdate (prevProps: Props) {
     if (!prevProps.userAuthed && this.props.userAuthed) {
       this.props.onUpdateActions()
+      this.checkSetRefreshInterval()
     }
 
     if (prevProps.userAuthed && !this.props.userAuthed) {
       this.getClientURL()
+      this.clearIntervals()
+    }
+  }
+
+  checkSetRefreshInterval = () => {
+    if (!this.refreshInterval) {
+      this.refreshInterval = setInterval(() => {
+        this.props.onUpdateActions()
+      }, 30000)
     }
   }
 
@@ -268,6 +276,11 @@ class Binance extends React.PureComponent<Props, State> {
     }
   }
 
+  clearIntervals = () => {
+    clearInterval(this.convertTimer)
+    clearInterval(this.refreshInterval)
+  }
+
   connectBinance = () => {
     const { binanceClientUrl } = this.props
     window.open(binanceClientUrl, '_self')
@@ -313,6 +326,7 @@ class Binance extends React.PureComponent<Props, State> {
   }
 
   finishDisconnect = () => {
+    this.clearIntervals()
     chrome.binance.revokeToken(() => {
       this.props.onDisconnectBinance()
       this.cancelDisconnect()

diff --git a/components/brave_new_tab_ui/containers/newTab/index.tsx b/components/brave_new_tab_ui/containers/newTab/index.tsx
@@ -387,7 +387,11 @@ class NewTabPage extends React.Component<Props, State> {
 
   fetchBalance = () => {
     chrome.binance.getAccountBalances((balances: Record<string, string>, success: boolean) => {
-      if (!success) {
+      const hasBalances = Object.keys(balances).length
+
+      if (!hasBalances) {
+        return
+      } else if (!success) {
         this.setAuthInvalid()
         return
       }