Bug/PM-619: Fix Marketlist Stats (#338) (#356)

* PM-619: fix display of marketlist stats * PM-619: fix another test * PM-619: disable env logging for tests
gnosis · May 22, 2018 · fe942fa · fe942fa
1 parent 022eeb7
commit fe942fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/configuration.setup.js b/configuration.setup.js
@@ -2,7 +2,7 @@ const configLoader = require('./configuration')
 
 const ENV = 'local'
 
-console.info(`[JEST]: using env configuration: '${ENV}'`)
+// console.info(`[JEST]: using env configuration: '${ENV}'`)
 const { config, interfaceConfig } = configLoader(ENV)
 window.GNOSIS_CONFIG = config
 window.GNOSIS_INTERFACE = interfaceConfig

diff --git a/src/routes/MarketList/store/selectors/index.js b/src/routes/MarketList/store/selectors/index.js
@@ -13,43 +13,31 @@ export const marketListSelector = createSelector(
 )
 
 export const marketCounterSelector = state =>
-  List(state.marketList)
+  List(state.marketList.values())
 
 export const newMarketsSelector = createSelector(
   marketCounterSelector,
   (markets) => {
-    if (!markets) {
-      return 0
-    }
-
-    const openMarkets = markets.filter(market => !isMarketClosed(market.stage, market.resolution, market.resolved))
+    const openMarkets = markets.toArray().filter(market => !isMarketClosed(market.stage, market.resolution, market.resolved))
     const newMarkets = openMarkets.filter(market => isNewMarket(market.creation))
 
-    return newMarkets ? newMarkets.size : 0
+    return newMarkets.length
   },
 )
 
 export const endingSoonMarketSelector = createSelector(
   marketCounterSelector,
   (markets) => {
-    if (!markets) {
-      return 0
-    }
-
-    const openMarkets = markets.filter(market => !isMarketClosed(market.stage, market.resolution, market.resolved))
+    const openMarkets = markets.toArray().filter(market => !isMarketClosed(market.stage, market.resolution, market.resolved))
     const endingSoonMarkets = openMarkets.filter(market => isMarketEndingSoon(market.resolution))
-    return endingSoonMarkets ? endingSoonMarkets.size : 0
+    return endingSoonMarkets.length
   },
 )
 
 export const openMarketSelector = createSelector(
   marketCounterSelector,
   (markets) => {
-    if (!markets) {
-      return 0
-    }
-
-    const openMarkets = markets.filter(market => !isMarketClosed(market.stage, market.resolution, market.resolved))
-    return openMarkets ? openMarkets.size : 0
+    const openMarkets = markets.toArray().filter(market => !isMarketClosed(market.stage, market.resolution, market.resolved))
+    return openMarkets.length
   },
 )