#29 Mark user's open orders in order book

tinybike · Aug 1, 2016 · 67dc72c · 67dc72c
1 parent 1b8b9f3
commit 67dc72c
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 26 deletions.
diff --git a/build/components.jsx b/build/components.jsx
diff --git a/build/styles.css b/build/styles.css
diff --git a/src/modules/market/components/market-page.jsx b/src/modules/market/components/market-page.jsx
@@ -57,6 +57,7 @@ export default class MarketPage extends Component {
 						outcomes={p.market.outcomes}
 						selectedOutcome={p.selectedOutcome}
 						tradeSummary={p.market.tradeSummary}
+						userOpenOrdersSummary={p.market.userOpenOrdersSummary}
 						onSubmitPlaceTrade={p.market.onSubmitPlaceTrade}
 					/>
 				);

diff --git a/src/modules/trade/components/trade-builder-bid-ask.jsx b/src/modules/trade/components/trade-builder-bid-ask.jsx
@@ -4,7 +4,7 @@ import classnames from 'classnames';
 import ValueDenomination from '../../../modules/common/components/value-denomination';
 
 const TradeBuilderBidAsk = (p) => (
-	<div className={classnames('trade-builder-bid-ask', p.className)}>
+	<div className={classnames('trade-builder-bid-ask', { 'is-of-current-user': p.bidAsk.isOfCurrentUser }, p.className)}>
 		<ValueDenomination
 			className={classnames('shares')}
 			{...p.bidAsk.shares}

diff --git a/src/modules/trade/components/trade-builder.jsx b/src/modules/trade/components/trade-builder.jsx
@@ -28,12 +28,22 @@ const TradePanel = (p) => (
 				/>
 			))}
 		</tbody>
+		{p.userOpenOrdersSummary != null && p.userOpenOrdersSummary.openOrdersCount != null && p.userOpenOrdersSummary.openOrdersCount.value > 0 &&
+			(<tbody>
+				<tr>
+					<td colSpan="9">
+						Prices at which you have open orders are underlined
+					</td>
+				</tr>
+			</tbody>)
+		}
 	</table>
 );
 
 TradePanel.propTypes = {
 	outcomes: React.PropTypes.array,
-	selectedOutcome: React.PropTypes.object
+	selectedOutcome: React.PropTypes.object,
+	userOpenOrdersSummary: React.PropTypes.object
 };
 
 export default TradePanel;
diff --git a/src/modules/trade/components/trade-panel.jsx b/src/modules/trade/components/trade-panel.jsx
@@ -6,6 +6,7 @@ const TradePanel = (p) => (
 	<div className="trade-panel">
 		<TradeBuilder
 			outcomes={p.outcomes}
+			userOpenOrdersSummary={p.userOpenOrdersSummary}
 			selectedOutcome={p.selectedOutcome}
 		/>
 
@@ -32,6 +33,7 @@ TradePanel.propTypes = {
 	outcomes: React.PropTypes.array,
 	selectedOutcome: React.PropTypes.object,
 	tradeSummary: React.PropTypes.object,
+	userOpenOrdersSummary: React.PropTypes.object,
 	onSubmitPlaceTrade: React.PropTypes.func
 };
 

diff --git a/src/modules/trade/less/trade-builder.less b/src/modules/trade/less/trade-builder.less
@@ -74,6 +74,11 @@
 
     .trade-builder-bid-ask {
         display: flex;
+        &.is-of-current-user {
+            .price .value {
+                text-decoration: underline;
+            }
+        }
         .shares {
             flex: 1.6;
             text-align: right;
@@ -111,4 +116,4 @@
             color: @color-warning-normal;
         }
     }
-}
+}
diff --git a/src/selectors/bids-asks/select-bids-asks.js b/src/selectors/bids-asks/select-bids-asks.js
@@ -5,7 +5,8 @@ export default function selectOrderBook() {
 		bids: [
 			{
 				shares: makeNumber(776, 'Shares'),
-				price: makeNumber(0.5, 'eth')
+				price: makeNumber(0.5, 'eth'),
+				isOfCurrentUser: true
 			},
 			{
 				shares: makeNumber(87, 'Shares'),
@@ -27,7 +28,8 @@ export default function selectOrderBook() {
 			},
 			{
 				shares: makeNumber(2000, 'Shares'),
-				price: makeNumber(0.72, 'eth')
+				price: makeNumber(0.72, 'eth'),
+				isOfCurrentUser: Math.random() > 0.3
 			},
 			{
 				shares: makeNumber(5, 'Shares'),