diff --git a/src/StockMarket/StockMarket.tsx b/src/StockMarket/StockMarket.tsx index e8b3432ad..43413fe46 100644 --- a/src/StockMarket/StockMarket.tsx +++ b/src/StockMarket/StockMarket.tsx @@ -86,7 +86,7 @@ export interface ICancelOrderParams { stock?: Stock; type?: OrderTypes; } -export function cancelOrder(params: ICancelOrderParams, ctx: NetscriptContext | null = null): boolean { +export function cancelOrder(params: ICancelOrderParams, ctx?: NetscriptContext): boolean { if (StockMarket["Orders"] == null) { return false; } @@ -122,13 +122,13 @@ export function cancelOrder(params: ICancelOrderParams, ctx: NetscriptContext | ) { stockOrders.splice(i, 1); if (ctx) { - helpers.log(ctx, ()=>"Successfully cancelled order: " + orderTxt); + helpers.log(ctx, () => "Successfully cancelled order: " + orderTxt); } return true; } } if (ctx) { - helpers.log(ctx, ()=>"Failed to cancel order: " + orderTxt); + helpers.log(ctx, () => "Failed to cancel order: " + orderTxt); } return false; } diff --git a/src/StockMarket/ui/StockMarketRoot.tsx b/src/StockMarket/ui/StockMarketRoot.tsx index 188129a97..59d348225 100644 --- a/src/StockMarket/ui/StockMarketRoot.tsx +++ b/src/StockMarket/ui/StockMarketRoot.tsx @@ -13,8 +13,6 @@ import { PositionTypes } from "../data/PositionTypes"; import { IPlayer } from "../../PersonObjects/IPlayer"; import { EventEmitter } from "../../utils/EventEmitter"; -import { ICancelOrderParams } from "../StockMarket"; -import { NetscriptContext } from "../../Netscript/APIWrapper"; type txFn = (stock: Stock, shares: number) => boolean; type placeOrderFn = ( @@ -28,7 +26,6 @@ type placeOrderFn = ( type IProps = { buyStockLong: txFn; buyStockShort: txFn; - cancelOrder: (params: ICancelOrderParams, ctx?: NetscriptContext) => void; eventEmitterForReset?: EventEmitter<[]>; initStockMarket: () => void; p: IPlayer; @@ -55,7 +52,6 @@ export function StockMarketRoot(props: IProps): React.ReactElement { void; orders: Order[]; p: IPlayer; placeOrder: placeOrderFn; @@ -327,7 +324,7 @@ export function StockTicker(props: IProps): React.ReactElement { - + void; order: Order; }; export function StockTickerOrder(props: IProps): React.ReactElement { function handleCancelOrderClick(): void { - props.cancelOrder({ order: props.order }); + cancelOrder({ order: props.order }); } const order = props.order; diff --git a/src/StockMarket/ui/StockTickerOrderList.tsx b/src/StockMarket/ui/StockTickerOrderList.tsx index e6daaee79..36b75907c 100644 --- a/src/StockMarket/ui/StockTickerOrderList.tsx +++ b/src/StockMarket/ui/StockTickerOrderList.tsx @@ -10,11 +10,8 @@ import { Order } from "../Order"; import { Stock } from "../Stock"; import { IPlayer } from "../../PersonObjects/IPlayer"; -import { ICancelOrderParams } from "../StockMarket"; -import { NetscriptContext } from "../../Netscript/APIWrapper"; type IProps = { - cancelOrder: (params: ICancelOrderParams, ctx?: NetscriptContext) => void; orders: Order[]; p: IPlayer; stock: Stock; @@ -24,7 +21,7 @@ export function StockTickerOrderList(props: IProps): React.ReactElement { const orders: React.ReactElement[] = []; for (let i = 0; i < props.orders.length; ++i) { const o = props.orders[i]; - orders.push(); + orders.push(); } return <>{orders}; diff --git a/src/StockMarket/ui/StockTickers.tsx b/src/StockMarket/ui/StockTickers.tsx index 2a46b55c4..91c40e316 100644 --- a/src/StockMarket/ui/StockTickers.tsx +++ b/src/StockMarket/ui/StockTickers.tsx @@ -15,8 +15,6 @@ import { PositionTypes } from "../data/PositionTypes"; import { IPlayer } from "../../PersonObjects/IPlayer"; import { EventEmitter } from "../../utils/EventEmitter"; -import { ICancelOrderParams } from "../StockMarket"; -import { NetscriptContext } from "../../Netscript/APIWrapper"; type txFn = (stock: Stock, shares: number) => boolean; type placeOrderFn = ( @@ -30,7 +28,6 @@ type placeOrderFn = ( type IProps = { buyStockLong: txFn; buyStockShort: txFn; - cancelOrder: (params: ICancelOrderParams, ctx?: NetscriptContext) => void; eventEmitterForReset?: EventEmitter<[]>; p: IPlayer; placeOrder: placeOrderFn; @@ -92,7 +89,6 @@ export function StockTickers(props: IProps): React.ReactElement {