Remove prop chain for cancelOrder + format

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;
   }

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 {
         <StockTickers
           buyStockLong={props.buyStockLong}
           buyStockShort={props.buyStockShort}
-          cancelOrder={props.cancelOrder}
           eventEmitterForReset={props.eventEmitterForReset}
           p={props.p}
           placeOrder={props.placeOrder}

src/StockMarket/ui/StockTicker.tsx

@@ -31,8 +31,6 @@ import Paper from "@mui/material/Paper";
 import Collapse from "@mui/material/Collapse";
 import ExpandMore from "@mui/icons-material/ExpandMore";
 import ExpandLess from "@mui/icons-material/ExpandLess";
-import { ICancelOrderParams } from "../StockMarket";
-import { NetscriptContext } from "../../Netscript/APIWrapper";
 
 enum SelectorOrderType {
   Market = "Market Order",
@@ -52,7 +50,6 @@ type placeOrderFn = (
 type IProps = {
   buyStockLong: txFn;
   buyStockShort: txFn;
-  cancelOrder: (params: ICancelOrderParams, ctx?: NetscriptContext) => void;
   orders: Order[];
   p: IPlayer;
   placeOrder: placeOrderFn;
@@ -327,7 +324,7 @@ export function StockTicker(props: IProps): React.ReactElement {
             <StockTickerTxButton onClick={handleSellAllButtonClick} text={"Sell ALL"} />
           </Box>
           <StockTickerPositionText p={props.p} stock={props.stock} />
-          <StockTickerOrderList cancelOrder={props.cancelOrder} orders={props.orders} p={props.p} stock={props.stock} />
+          <StockTickerOrderList orders={props.orders} p={props.p} stock={props.stock} />
 
           <PlaceOrderModal
             text={modalProps.text}

src/StockMarket/ui/StockTickerOrder.tsx

@@ -11,17 +11,15 @@ import { Money } from "../../ui/React/Money";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Box from "@mui/material/Box";
-import { ICancelOrderParams } from "../StockMarket";
-import { NetscriptContext } from "../../Netscript/APIWrapper";
+import { cancelOrder } from "../StockMarket";
 
 type IProps = {
-  cancelOrder: (params: ICancelOrderParams, ctx?: NetscriptContext) => 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;

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(<StockTickerOrder cancelOrder={props.cancelOrder} order={o} key={i} />);
+    orders.push(<StockTickerOrder order={o} key={i} />);
   }
 
   return <>{orders}</>;

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 {
         <StockTicker
           buyStockLong={props.buyStockLong}
           buyStockShort={props.buyStockShort}
-          cancelOrder={props.cancelOrder}
           key={val.symbol}
           orders={orders}
           p={props.p}

src/ui/GameRoot.tsx

@@ -18,13 +18,7 @@ import { dialogBoxCreate } from "./React/DialogBox";
 import { GetAllServers } from "../Server/AllServers";
 import { Factions } from "../Faction/Factions";
 import { buyStock, sellStock, shortStock, sellShort } from "../StockMarket/BuyingAndSelling";
-import {
-  cancelOrder,
-  eventEmitterForUiReset,
-  initStockMarketFn,
-  placeOrder,
-  StockMarket,
-} from "../StockMarket/StockMarket";
+import { eventEmitterForUiReset, initStockMarketFn, placeOrder, StockMarket } from "../StockMarket/StockMarket";
 
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
@@ -446,7 +440,6 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
         <StockMarketRoot
           buyStockLong={buyStock}
           buyStockShort={shortStock}
-          cancelOrder={cancelOrder}
           eventEmitterForReset={eventEmitterForUiReset}
           initStockMarket={initStockMarketFn}
           p={player}