Merge pull request #592 from gre/countervalues-disabled-if-no-currencies

No countervalues to load if there is no accounts

src/components/TopBar/ActivityIndicator.js

@@ -1,6 +1,6 @@
 // @flow
 
-import React, { Component, Fragment } from 'react'
+import React, { PureComponent, Fragment } from 'react'
 import { compose } from 'redux'
 import { connect } from 'react-redux'
 import { createStructuredSelector } from 'reselect'
@@ -10,6 +10,7 @@ import type { T } from 'types/common'
 import type { AsyncState } from 'reducers/bridgeSync'
 
 import { globalSyncStateSelector } from 'reducers/bridgeSync'
+import { hasAccountsSelector } from 'reducers/accounts'
 import { BridgeSyncConsumer } from 'bridge/BridgeSyncContext'
 import CounterValues from 'helpers/countervalues'
 
@@ -20,7 +21,10 @@ import IconExclamationCircle from 'icons/ExclamationCircle'
 import IconCheckCircle from 'icons/CheckCircle'
 import ItemContainer from './ItemContainer'
 
-const mapStateToProps = createStructuredSelector({ globalSyncState: globalSyncStateSelector })
+const mapStateToProps = createStructuredSelector({
+  globalSyncState: globalSyncStateSelector,
+  hasAccounts: hasAccountsSelector,
+})
 
 type Props = {
   // FIXME: eslint should see that it is used in static method
@@ -28,8 +32,9 @@ type Props = {
 
   isPending: boolean,
   isError: boolean,
-  onClick: void => void,
   t: T,
+  cvPoll: *,
+  setSyncBehavior: *,
 }
 
 type State = {
@@ -38,7 +43,7 @@ type State = {
   isFirstSync: boolean,
 }
 
-class ActivityIndicatorInner extends Component<Props, State> {
+class ActivityIndicatorInner extends PureComponent<Props, State> {
   state = {
     hasClicked: false,
     isFirstSync: true,
@@ -61,10 +66,14 @@ class ActivityIndicatorInner extends Component<Props, State> {
     return nextState
   }
 
+  onClick = () => {
+    this.props.cvPoll()
+    this.props.setSyncBehavior({ type: 'SYNC_ALL_ACCOUNTS', priority: 5 })
+  }
+
   handleRefresh = () => {
-    const { onClick } = this.props
     this.setState({ hasClicked: true })
-    onClick()
+    this.onClick()
   }
 
   render() {
@@ -119,30 +128,37 @@ class ActivityIndicatorInner extends Component<Props, State> {
   }
 }
 
-const ActivityIndicator = ({ globalSyncState, t }: { globalSyncState: AsyncState, t: T }) => (
+const ActivityIndicator = ({
-  <BridgeSyncConsumer>
+  globalSyncState,
-    {setSyncBehavior => (
+  hasAccounts,
-      <CounterValues.PollingConsumer>
+  t,
-        {cvPolling => {
+}: {
-          const isPending = cvPolling.pending || globalSyncState.pending
+  globalSyncState: AsyncState,
-          const isError = cvPolling.error || globalSyncState.error
+  hasAccounts: boolean,
-          return (
+  t: T,
-            <ActivityIndicatorInner
+}) =>
-              t={t}
+  !hasAccounts ? null : (
-              isPending={isPending}
+    <BridgeSyncConsumer>
-              isGlobalSyncStatePending={globalSyncState.pending}
+      {setSyncBehavior => (
-              isError={!!isError && !isPending}
+        <CounterValues.PollingConsumer>
-              onClick={() => {
+          {cvPolling => {
-                cvPolling.poll()
+            const isPending = cvPolling.pending || globalSyncState.pending
-                setSyncBehavior({ type: 'SYNC_ALL_ACCOUNTS', priority: 5 })
+            const isError = cvPolling.error || globalSyncState.error
-              }}
+            return (
-            />
+              <ActivityIndicatorInner
-          )
+                t={t}
-        }}
+                isPending={isPending}
-      </CounterValues.PollingConsumer>
+                isGlobalSyncStatePending={globalSyncState.pending}
-    )}
+                isError={!!isError && !isPending}
-  </BridgeSyncConsumer>
+                cvPoll={cvPolling.poll}
-)
+                setSyncBehavior={setSyncBehavior}
+              />
+            )
+          }}
+        </CounterValues.PollingConsumer>
+      )}
+    </BridgeSyncConsumer>
+  )
 
 export default compose(
   translate(),

src/helpers/countervalues.js

@@ -18,15 +18,17 @@ const pairsSelector = createSelector(
   counterValueExchangeSelector,
   state => state,
   (currencies, counterValueCurrency, counterValueExchange, state) =>
-    [
+    currencies.length === 0
-      { from: intermediaryCurrency, to: counterValueCurrency, exchange: counterValueExchange },
+      ? []
-    ].concat(
+      : [
-      currencies.filter(c => c.ticker !== intermediaryCurrency.ticker).map(currency => ({
+          { from: intermediaryCurrency, to: counterValueCurrency, exchange: counterValueExchange },
-        from: currency,
+        ].concat(
-        to: intermediaryCurrency,
+          currencies.filter(c => c.ticker !== intermediaryCurrency.ticker).map(currency => ({
-        exchange: currencySettingsSelector(state, { currency }).exchange,
+            from: currency,
-      })),
+            to: intermediaryCurrency,
-    ),
+            exchange: currencySettingsSelector(state, { currency }).exchange,
+          })),
+        ),
 )
 
 const addExtraPollingHooks = (schedulePoll, cancelPoll) => {

src/reducers/accounts.js

@@ -62,6 +62,8 @@ const handlers: Object = {
 
 export const accountsSelector = (state: { accounts: AccountsState }): Account[] => state.accounts
 
+export const hasAccountsSelector = createSelector(accountsSelector, accounts => accounts.length > 0)
+
 export const currenciesSelector = createSelector(accountsSelector, accounts =>
   [...new Set(accounts.map(a => a.currency))].sort((a, b) => a.name.localeCompare(b.name)),
 )