feat(Transaction List): begin partner labels; get shift trades from k…

…vstore
blockchain · Jun 27, 2018 · 65dbf6f · 65dbf6f
1 parent 06612e2
commit 65dbf6f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/index.js b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/index.js
@@ -40,6 +40,7 @@ class ListItemContainer extends React.PureComponent {
       transaction={this.props.transaction}
       handleCoinToggle={this.handleCoinToggle}
       handleEditDescription={this.handleEditDescription}
+      shiftTrades={this.props.shiftTrades}
     />
   }
 }

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js
@@ -112,7 +112,8 @@ const dateHelper = (time) => {
 }
 
 const TransactionListItem = (props) => {
-  const { handleCoinToggle, transaction, handleEditDescription, coin, minConfirmations } = props
+  const { handleCoinToggle, transaction, handleEditDescription, coin, minConfirmations, shiftTrades } = props
+  if (transaction.description === 'sstx') console.log('TX:', transaction, shiftTrades)
 
   return (
     <TransactionRowContainer>

diff --git a/...ages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Pages/index.js b/...ages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Pages/index.js
@@ -6,10 +6,10 @@ import Success from './template.success'
 
 class Pages extends React.PureComponent {
   render () {
-    const { data } = this.props
+    const { data, shiftTrades } = this.props
 
     return data.cata({
-      Success: (value) => <Success transactions={value} />,
+      Success: (value) => <Success transactions={value} shiftTrades={shiftTrades} />,
       Failure: () => <DataError onClick={() => this.props.onRefresh()} />,
       Loading: () => <Loading />,
       NotAsked: () => <Loading />

diff --git a/...hain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Pages/template.success.js b/...hain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Pages/template.success.js
@@ -15,7 +15,13 @@ const Wrapper = styled.div`
 const Success = props => {
   return (
     <Wrapper>
-      {props.transactions.map((transaction, index) => <TransactionListItem key={transaction.hash} transaction={transaction} coin='BTC' minConfirmations={3} />)}
+      {props.transactions.map((transaction, index) => <TransactionListItem
+        key={transaction.hash}
+        transaction={transaction}
+        coin='BTC'
+        minConfirmations={3}
+        shiftTrades={props.shiftTrades}
+      />)}
     </Wrapper>
   )
 }

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/index.js
@@ -22,8 +22,9 @@ class ContentContainer extends React.PureComponent {
   }
 
   render () {
-    const { empty, pages, search } = this.props
-    return <Content empty={empty} search={search} pages={pages} onRefresh={this.handleRefresh} />
+    const { empty, pages, search, shiftTrades } = this.props
+
+    return <Content empty={empty} search={search} pages={pages} onRefresh={this.handleRefresh} shiftTrades={shiftTrades} />
   }
 }
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/selectors.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/selectors.js
@@ -13,9 +13,10 @@ const filterTransactions = curry((status, criteria, transactions) => {
 export const getData = createSelector(
   [
     selectors.form.getFormValues('btcTransactions'),
-    selectors.core.common.btc.getWalletTransactions
+    selectors.core.common.btc.getWalletTransactions,
+    selectors.core.kvStore.shapeShift.getTrades
   ],
-  (formValues, pages) => {
+  (formValues, pages, trades) => {
     const empty = (page) => isEmpty(page.data)
     const search = propOr('', 'search', formValues)
     const status = propOr('', 'status', formValues)
@@ -26,7 +27,8 @@ export const getData = createSelector(
     return {
       pages: filteredPages,
       empty: all(empty)(filteredPages),
-      search: search.length > 0 || status !== ''
+      search: search.length > 0 || status !== '',
+      shiftTrades: trades.getOrElse([])
     }
   }
 )
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/template.js
@@ -17,7 +17,7 @@ const Success = props => {
     <Wrapper>
       {props.empty
         ? props.search ? <EmptyTx /> : <Empty />
-        : props.pages.map((value, index) => <Pages key={index} data={value} onRefresh={props.onRefresh} />)
+        : props.pages.map((value, index) => <Pages key={index} data={value} onRefresh={props.onRefresh} shiftTrades={props.shiftTrades} />)
       }
     </Wrapper>
   )