mark user lending order

BuildOnViction · Jul 24, 2020 · 2e06964 · 2e06964
1 parent d529e3d
commit 2e06964
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/src/components/lending/LendingOrderBook/OrderBookRenderer.jsx b/src/components/lending/LendingOrderBook/OrderBookRenderer.jsx
@@ -176,6 +176,7 @@ const BuyOrder = (props: SingleOrderProps) => {
   const { order, onClick } = props
   return (
     <Row update={order.update}>
+      { order.userOrder && <MarkUserOrder /> }
       <BuyRowBackground amount={order.relativeTotal} />
       <RowContentWrapper>
         <RowContent>
@@ -192,6 +193,7 @@ const SellOrder = (props: SingleOrderProps) => {
   const { order, onClick } = props
   return (
     <Row update={order.update}>
+      { order.userOrder && <MarkUserOrder /> }
       <SellRowBackGround amount={order.relativeTotal} />
       <RowContentWrapper>
         <RowContent>
@@ -457,4 +459,15 @@ const Ellipsis = styled.span`
   text-overflow: ellipsis;
 `
 
+const MarkUserOrder = styled.i.attrs({
+  className: "fa fa-caret-right",
+  ariaHidden: "true"
+})`
+  position: absolute;
+  top: 50%;
+  left: 2px;
+  transform: translateY(-50%);
+  color: ${TmColors.ORANGE};
+`
+
 export default OrderBookRenderer
diff --git a/src/store/domains/lending/lendingOrders.js b/src/store/domains/lending/lendingOrders.js
@@ -111,16 +111,15 @@ export default function ordersDomain(state: OrdersState) {
       const orders: Orders = getOrders(state)
       const history = orders.filter(
         order =>
-          ['CANCELLED', 'FILLED', 'PARTIALLY_FILLED'].indexOf(order.status) ===
-          -1,
+          ['CANCELLED', 'FILLED', 'PARTIALLY_FILLED'].indexOf(order.status) === 1
       )
       return history
     },
 
     current: (): Orders => {
       const orders: Orders = getOrders(state)
       const current = orders.filter(
-        order => ['NEW', 'OPEN'].indexOf(order.status) === -1,
+        order => ['NEW', 'OPEN'].indexOf(order.status) === 1
       )
       return current
     },

diff --git a/src/store/models/lending/lendingOrderBook.js b/src/store/models/lending/lendingOrderBook.js
@@ -1,16 +1,26 @@
 // @flow
+import BigNumber from 'bignumber.js'
+
 import { 
   getLendingOrderBookDomain, 
   getLendingPairsDomain,
+  getLendingOrdersDomain,
 } from '../../domains'
 import type { State } from '../../../types'
 
 export default function lendingOrderBookSelector(state: State) {
-  const { bids, asks } = getLendingOrderBookDomain(state).getOrderBookData(35)
+  let { bids, asks } = getLendingOrderBookDomain(state).getOrderBookData(35)
   const pairDomain = getLendingPairsDomain(state)
 
   const currentPair = pairDomain.getCurrentPair()
   const currentPairData = pairDomain.getCurrentPairData()
+  const userOrderInterests = getLendingOrdersDomain(state).current()
+                            .filter(order => order.term === currentPair.termValue 
+                                            && order.lendingToken.toLowerCase() === currentPair.lendingTokenAddress.toLowerCase())
+                            .map(order => BigNumber(order.interest).toNumber(2, 1))
+
+  bids = markUserOrder(bids, userOrderInterests)
+  asks = markUserOrder(asks, userOrderInterests)
 
   return {
     bids,
@@ -19,3 +29,15 @@ export default function lendingOrderBookSelector(state: State) {
     currentPairData,
   }
 }
+
+function markUserOrder(bidsOrAsks, orderInterests) {
+  return bidsOrAsks.map(item => {
+    if (orderInterests.includes(Number(item.interest))) {
+      item.userOrder = true
+    } else {
+      item.userOrder = false
+    }
+
+    return item
+  })
+}