fix(Txs): empty state

blockchain · May 8, 2018 · aa7ba2e · aa7ba2e
1 parent 8185414
commit aa7ba2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/index.js
@@ -12,7 +12,8 @@ class ContentContainer extends React.PureComponent {
   }
 
   render () {
-    return <Content pages={this.props.pages} />
+    const { empty, pages, search } = this.props
+    return <Content empty={empty} search={search} pages={pages} />
   }
 }
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/selectors.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/selectors.js
@@ -1,6 +1,6 @@
 import { createSelector } from 'reselect'
 import { selectors } from 'data'
-import { curry, isEmpty, propSatisfies, toUpper, prop, allPass, anyPass, compose, contains, map, filter } from 'ramda'
+import { all, curry, isEmpty, propSatisfies, toUpper, prop, allPass, anyPass, compose, contains, map, filter } from 'ramda'
 
 const filterTransactions = curry((status, criteria, transactions) => {
   const isOfType = curry((filter, tx) => propSatisfies(x => filter === '' || toUpper(x) === toUpper(filter), 'type', tx))
@@ -16,14 +16,17 @@ export const getData = createSelector(
     selectors.core.common.bch.getWalletTransactions
   ],
   (formValues, pages) => {
+    const empty = (page) => isEmpty(page.data)
     const search = prop('search', formValues) || ''
     const status = prop('status', formValues) || ''
     const filteredPages = !isEmpty(pages)
       ? pages.map(map(filterTransactions(status, search)))
       : []
 
     return {
-      pages: filteredPages
+      pages: filteredPages,
+      search: search.length > 0,
+      empty: all(empty)(filteredPages)
     }
   }
 )
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/template.js
@@ -1,8 +1,5 @@
 import React from 'react'
 import styled from 'styled-components'
-import { equals, isEmpty, length } from 'ramda'
-
-import { Remote } from 'blockchain-wallet-v4/src'
 import EmptyTx from 'components/EmptyTx'
 import Empty from './Empty'
 import Pages from './Pages'
@@ -16,11 +13,9 @@ const Wrapper = styled.div`
 `
 
 const Success = props => {
-  const hasNoTransactions = equals(length(props.pages), 1) && Remote.Success.is(props.pages[0]) && isEmpty(props.pages[0].getOrElse([]))
-
   return (
     <Wrapper>
-      {hasNoTransactions
+      {props.empty
         ? props.search ? <EmptyTx /> : <Empty />
         : props.pages.map((value, index) => <Pages key={index} data={value} />)
       }