{isTestNetwork ? 'Test ether' : 'Ether'}
@@ -266,7 +269,7 @@ export class TokenBalances extends React.ComponentAllowance
-
Action
+ {isTestNetwork &&
Action}
{this.props.screenWidth !== ScreenWidths.Sm &&
Send}
@@ -371,17 +374,17 @@ export class TokenBalances extends React.Component
-
- {isMintable && (
- Minting...}
- labelComplete="Minted!"
- onClickAsyncFn={this._onMintTestTokensAsync.bind(this, token)}
- />
- )}
- {token.symbol === ZRX_TOKEN_SYMBOL &&
- utils.isTestNetwork(this.props.networkId) && (
+ {utils.isTestNetwork(this.props.networkId) && (
+
+ {isMintable && (
+ Minting...}
+ labelComplete="Minted!"
+ onClickAsyncFn={this._onMintTestTokensAsync.bind(this, token)}
+ />
+ )}
+ {token.symbol === ZRX_TOKEN_SYMBOL && (
)}
-
+
+ )}
{this.props.screenWidth !== ScreenWidths.Sm && (
{
+ public static defaultProps: Partial = {
+ isFullWidth: false,
+ shouldHideHeader: false,
+ isScrollable: true,
+ };
private _fillPollingIntervalId: number;
public constructor(props: TradeHistoryProps) {
super(props);
@@ -38,13 +46,22 @@ export class TradeHistory extends React.Component
- Trade history
-
-
- {this._renderTrades()}
-
+
+ {!this.props.shouldHideHeader && (
+
+ )}
+ {this.props.isScrollable ? (
+
+ {this._renderTrades()}
+
+ ) : (
+ this._renderTrades()
+ )}
);
}
diff --git a/packages/website/ts/containers/generate_order_form.ts b/packages/website/ts/containers/generate_order_form.ts
index b4c6cc0d45..44979b1048 100644
--- a/packages/website/ts/containers/generate_order_form.ts
+++ b/packages/website/ts/containers/generate_order_form.ts
@@ -12,6 +12,8 @@ interface GenerateOrderFormProps {
blockchain: Blockchain;
hashData: HashData;
dispatcher: Dispatcher;
+ isFullWidth?: boolean;
+ shouldHideHeader?: boolean;
}
interface ConnectedState {