aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/components/portal/portal.tsx1
-rw-r--r--packages/website/ts/components/trade_history/trade_history.tsx12
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index f0d26aeb0..009ef06f3 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -442,6 +442,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
networkId={this.props.networkId}
isFullWidth={true}
shouldRenderHeader={false}
+ isScrollable={false}
/>
);
}
diff --git a/packages/website/ts/components/trade_history/trade_history.tsx b/packages/website/ts/components/trade_history/trade_history.tsx
index 1c47d4ecd..1e92cdb90 100644
--- a/packages/website/ts/components/trade_history/trade_history.tsx
+++ b/packages/website/ts/components/trade_history/trade_history.tsx
@@ -15,6 +15,7 @@ interface TradeHistoryProps {
networkId: number;
isFullWidth?: boolean;
shouldRenderHeader?: boolean;
+ isScrollable?: boolean;
}
interface TradeHistoryState {
@@ -25,6 +26,7 @@ export class TradeHistory extends React.Component<TradeHistoryProps, TradeHistor
public static defaultProps: Partial<TradeHistoryProps> = {
isFullWidth: false,
shouldRenderHeader: true,
+ isScrollable: true,
};
private _fillPollingIntervalId: number;
public constructor(props: TradeHistoryProps) {
@@ -53,9 +55,13 @@ export class TradeHistory extends React.Component<TradeHistoryProps, TradeHistor
<Divider />
</div>
)}
- <div className="pt2" style={{ height: 608, overflow: 'scroll' }}>
- {this._renderTrades()}
- </div>
+ {this.props.isScrollable ? (
+ <div className="pt2" style={{ height: 608, overflow: 'scroll' }}>
+ {this._renderTrades()}
+ </div>
+ ) : (
+ this._renderTrades()
+ )}
</div>
);
}