From e744e4cd989bd3ae1070c59f7baa8097f18b8b06 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 22 Dec 2017 15:05:32 +0100 Subject: Apply prettier config --- .../ts/components/trade_history/trade_history.tsx | 12 ++-- .../trade_history/trade_history_item.tsx | 65 +++++++++------------- 2 files changed, 33 insertions(+), 44 deletions(-) (limited to 'packages/website/ts/components/trade_history') diff --git a/packages/website/ts/components/trade_history/trade_history.tsx b/packages/website/ts/components/trade_history/trade_history.tsx index aa41b9392..635358627 100644 --- a/packages/website/ts/components/trade_history/trade_history.tsx +++ b/packages/website/ts/components/trade_history/trade_history.tsx @@ -2,10 +2,10 @@ import * as _ from 'lodash'; import Divider from 'material-ui/Divider'; import Paper from 'material-ui/Paper'; import * as React from 'react'; -import {TradeHistoryItem} from 'ts/components/trade_history/trade_history_item'; -import {tradeHistoryStorage} from 'ts/local_storage/trade_history_storage'; -import {Fill, TokenByAddress} from 'ts/types'; -import {utils} from 'ts/utils/utils'; +import { TradeHistoryItem } from 'ts/components/trade_history/trade_history_item'; +import { tradeHistoryStorage } from 'ts/local_storage/trade_history_storage'; +import { Fill, TokenByAddress } from 'ts/types'; +import { utils } from 'ts/utils/utils'; const FILL_POLLING_INTERVAL = 1000; @@ -42,7 +42,7 @@ export class TradeHistory extends React.Component

Trade history

-
+
{this._renderTrades()}
@@ -68,7 +68,7 @@ export class TradeHistory extends React.Component + No filled orders yet. ); diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx index 3586a96a5..03f9862f2 100644 --- a/packages/website/ts/components/trade_history/trade_history_item.tsx +++ b/packages/website/ts/components/trade_history/trade_history_item.tsx @@ -1,14 +1,14 @@ -import {ZeroEx} from '0x.js'; +import { ZeroEx } from '0x.js'; import BigNumber from 'bignumber.js'; import * as _ from 'lodash'; import Paper from 'material-ui/Paper'; import * as moment from 'moment'; import * as React from 'react'; import * as ReactTooltip from 'react-tooltip'; -import {EtherScanIcon} from 'ts/components/ui/etherscan_icon'; -import {Party} from 'ts/components/ui/party'; -import {EtherscanLinkSuffixes, Fill, Token, TokenByAddress} from 'ts/types'; -import {colors} from 'ts/utils/colors'; +import { EtherScanIcon } from 'ts/components/ui/etherscan_icon'; +import { Party } from 'ts/components/ui/party'; +import { EtherscanLinkSuffixes, Fill, Token, TokenByAddress } from 'ts/types'; +import { colors } from 'ts/utils/colors'; const PRECISION = 5; const IDENTICON_DIAMETER = 40; @@ -44,30 +44,26 @@ export class TradeHistoryItem extends React.Component +
-
- {this._renderDate()} -
+
{this._renderDate()}
-
+
- +
-
+
{this._renderAmounts(makerToken, takerToken)}
-
+
-
- +{' '} +
+ + {this._renderAmount(receiveAmount, receiveToken.symbol, receiveToken.decimals)}
-
- -{' '} +
+ - {this._renderAmount(givenAmount, givenToken.symbol, givenToken.decimals)}
-
+
{exchangeRate.toFixed(PRECISION)} {givenToken.symbol}/{receiveToken.symbol}
@@ -160,12 +148,13 @@ export class TradeHistoryItem extends React.Component -
{monthAbreviation}
-
{dayOfMonth}
+
+
+ {monthAbreviation} +
+
+ {dayOfMonth} +
{formattedBlockDate}
); -- cgit