CORPORATION: remove TA modals and integrate into sell modal (#796)

bitburner-official · Sep 12, 2023 · b6eafce · b6eafce
1 parent 99e5c5e
commit b6eafce
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 197 deletions.
diff --git a/src/Corporation/ui/MaterialElem.tsx b/src/Corporation/ui/MaterialElem.tsx
@@ -6,7 +6,6 @@ import { CityName, CorpUnlockName } from "@enums";
 import { Material } from "../Material";
 import { Warehouse } from "../Warehouse";
 import { ExportModal } from "./modals/ExportModal";
-import { MaterialMarketTaModal } from "./modals/MaterialMarketTaModal";
 import { SellMaterialModal } from "./modals/SellMaterialModal";
 import { PurchaseMaterialModal } from "./modals/PurchaseMaterialModal";
 import { formatBigNumber, formatCorpStat, formatMoney, formatQuality } from "../../ui/formatNumber";
@@ -29,7 +28,6 @@ export function MaterialElem(props: IMaterialProps): React.ReactElement {
   const [purchaseMaterialOpen, setPurchaseMaterialOpen] = useState(false);
   const [exportOpen, setExportOpen] = useState(false);
   const [sellMaterialOpen, setSellMaterialOpen] = useState(false);
-  const [materialMarketTaOpen, setMaterialMarketTaOpen] = useState(false);
   const [limitProductionOpen, setLimitProductionOpen] = useState(false);
 
   const warehouse = props.warehouse;
@@ -159,18 +157,12 @@ export function MaterialElem(props: IMaterialProps): React.ReactElement {
           >
             {sellButtonText}
           </Button>
-          <SellMaterialModal mat={mat} open={sellMaterialOpen} onClose={() => setSellMaterialOpen(false)} />
-          {division.hasResearch("Market-TA.I") && (
-            <>
-              <Button onClick={() => setMaterialMarketTaOpen(true)}>Market-TA</Button>
-
-              <MaterialMarketTaModal
-                mat={mat}
-                open={materialMarketTaOpen}
-                onClose={() => setMaterialMarketTaOpen(false)}
-              />
-            </>
-          )}
+          <SellMaterialModal
+            mat={mat}
+            div={division}
+            open={sellMaterialOpen}
+            onClose={() => setSellMaterialOpen(false)}
+          />
           <Button color={tutorial ? "error" : "primary"} onClick={() => setLimitProductionOpen(true)}>
             {limitMaterialButtonText}
           </Button>

diff --git a/src/Corporation/ui/ProductElem.tsx b/src/Corporation/ui/ProductElem.tsx
@@ -6,7 +6,6 @@ import { Product } from "../Product";
 import { DiscontinueProductModal } from "./modals/DiscontinueProductModal";
 import { LimitProductProductionModal } from "./modals/LimitProductProductionModal";
 import { SellProductModal } from "./modals/SellProductModal";
-import { ProductMarketTaModal } from "./modals/ProductMarketTaModal";
 import { CancelProductModal } from "./modals/CancelProductModal";
 
 import { formatBigNumber, formatMoney, formatPercent } from "../../ui/formatNumber";
@@ -29,7 +28,6 @@ export function ProductElem(props: IProductProps): React.ReactElement {
   const [limitOpen, setLimitOpen] = useState(false);
   const [discontinueOpen, setDiscontinueOpen] = useState(false);
   const [cancelOpen, setCancelOpen] = useState(false);
-  const [marketTaOpen, setMarketTaOpen] = useState(false);
   const city = props.city;
   const product = props.product;
 
@@ -166,7 +164,13 @@ export function ProductElem(props: IProductProps): React.ReactElement {
       {(hasUpgradeDashboard || product.finished) && (
         <>
           <Button onClick={() => setSellOpen(true)}>{sellButtonText}</Button>
-          <SellProductModal product={product} city={city} open={sellOpen} onClose={() => setSellOpen(false)} />
+          <SellProductModal
+            product={product}
+            div={division}
+            city={city}
+            open={sellOpen}
+            onClose={() => setSellOpen(false)}
+          />
           <br />
           <Button onClick={() => setLimitOpen(true)}>{limitProductionButtonText}</Button>
           <LimitProductProductionModal
@@ -175,12 +179,6 @@ export function ProductElem(props: IProductProps): React.ReactElement {
             open={limitOpen}
             onClose={() => setLimitOpen(false)}
           />
-          {division.hasResearch("Market-TA.I") && (
-            <>
-              <Button onClick={() => setMarketTaOpen(true)}>Market-TA</Button>
-              <ProductMarketTaModal product={product} open={marketTaOpen} onClose={() => setMarketTaOpen(false)} />
-            </>
-          )}
         </>
       )}
     </Paper>

diff --git a/src/Corporation/ui/modals/MaterialMarketTaModal.tsx b/src/Corporation/ui/modals/MaterialMarketTaModal.tsx
diff --git a/src/Corporation/ui/modals/ProductMarketTaModal.tsx b/src/Corporation/ui/modals/ProductMarketTaModal.tsx
diff --git a/src/Corporation/ui/modals/SellMaterialModal.tsx b/src/Corporation/ui/modals/SellMaterialModal.tsx
@@ -3,11 +3,11 @@ import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 import { Material } from "../../Material";
 import { SellMaterial } from "../../Actions";
 import { Modal } from "../../../ui/React/Modal";
-import Typography from "@mui/material/Typography";
 import TextField from "@mui/material/TextField";
 import Button from "@mui/material/Button";
 import { KEY } from "../../../utils/helpers/keyCodes";
-
+import { Typography, FormControlLabel, Switch, Tooltip } from "@mui/material";
+import { Division } from "src/Corporation/Division";
 function initialPrice(mat: Material): string {
   let val = mat.desiredSellPrice ? mat.desiredSellPrice + "" : "";
   if (mat.marketTa2) {
@@ -22,6 +22,7 @@ interface IProps {
   open: boolean;
   onClose: () => void;
   mat: Material;
+  div: Division;
 }
 
 // Create a popup that let the player manage sales of a material
@@ -83,7 +84,51 @@ export function SellMaterialModal(props: IProps): React.ReactElement {
         onKeyDown={onKeyDown}
       />
       <TextField value={price} type="text" placeholder="Sell price" onChange={onPriceChange} onKeyDown={onKeyDown} />
-      <Button onClick={sellMaterial}>Confirm</Button>
+      <Button onClick={sellMaterial} style={{ marginLeft: ".5rem", marginRight: ".5rem" }}>
+        Confirm
+      </Button>
+      {props.div.hasResearch("Market-TA.I") && (
+        <FormControlLabel
+          style={{ marginRight: "1rem" }}
+          control={
+            <Switch checked={props.mat.marketTa1} onChange={(event) => (props.mat.marketTa1 = event.target.checked)} />
+          }
+          label={
+            <Tooltip
+              title={
+                <Typography>
+                  If this is enabled, then this Material will automatically be sold at market price + markup.
+                  <br />
+                  This overrides player set pricing and gets overriden by an active TA2.
+                </Typography>
+              }
+            >
+              <Typography>Market-TA.I</Typography>
+            </Tooltip>
+          }
+        />
+      )}
+      {props.div.hasResearch("Market-TA.II") && (
+        <FormControlLabel
+          control={
+            <Switch checked={props.mat.marketTa2} onChange={(event) => (props.mat.marketTa2 = event.target.checked)} />
+          }
+          label={
+            <Tooltip
+              title={
+                <Typography>
+                  If this is enabled, then this Material will automatically be sold at the optimal price such that the
+                  amount sold matches the amount specified.
+                  <br />
+                  This overrides player set pricing and TA1.
+                </Typography>
+              }
+            >
+              <Typography>Market-TA.II</Typography>
+            </Tooltip>
+          }
+        />
+      )}
     </Modal>
   );
 }