Merge branch 'master' into develop

Merge master into develop
mangrovedao · Oct 2, 2024 · d8772f5 · d8772f5
2 parents dfa3c43 + 4ba3af8
commit d8772f5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 33 deletions.
diff --git a/app/trade/_components/forms/components/market-details.tsx b/app/trade/_components/forms/components/market-details.tsx
@@ -1,22 +1,13 @@
 import { Accordion } from "./accordion"
 type MarketDetailsProps = {
   takerFee?: string
-  tickSize?: string
-  spotPrice?: string
   minVolume?: string
 }
 
-export function MarketDetails({
-  takerFee,
-  tickSize,
-  spotPrice,
-  minVolume,
-}: MarketDetailsProps) {
+export function MarketDetails({ takerFee, minVolume }: MarketDetailsProps) {
   return (
     <Accordion title="Market details">
-      <MarketDetailsLine title="Taker fee" value={takerFee} />
-      <MarketDetailsLine title="Tick size" value={tickSize} />
-      <MarketDetailsLine title="Current spot price" value={spotPrice} />
+      <MarketDetailsLine title="Fee" value={takerFee} />
 
       {minVolume ? (
         <MarketDetailsLine title={`Minimum volume`} value={`${minVolume}`} />

diff --git a/app/trade/_components/forms/limit/components/from-wallet-order-dialog.tsx b/app/trade/_components/forms/limit/components/from-wallet-order-dialog.tsx
@@ -40,7 +40,6 @@ export default function FromWalletLimitOrderDialog({ form, onClose }: Props) {
     receiveToken,
     spender,
     feeInPercentageAsString,
-    tickSize,
     spotPrice,
   } = useTradeInfos("limit", form.bs)
 
@@ -242,9 +241,7 @@ export default function FromWalletLimitOrderDialog({ form, onClose }: Props) {
           {stepInfos[currentStep - 1]?.body ?? undefined}
           <div className="bg-[#041010] rounded-lg p-4 flex items-center">
             <MarketDetails
-              spotPrice={spotPrice}
               takerFee={feeInPercentageAsString}
-              tickSize={tickSize}
               minVolume={form.minVolume}
             />
           </div>

diff --git a/app/trade/_components/forms/limit/hooks/use-limit.ts b/app/trade/_components/forms/limit/hooks/use-limit.ts
@@ -109,8 +109,13 @@ export function useLimit(props: Props) {
         !isNaN(Number(state.values.receive)) &&
         isFinite(Number(state.values.receive))
 
+      console.log({
+        sendIsValid,
+        values: state.values,
+        send: state.values.send,
+      })
       const sendAmount = parseUnits(
-        sendIsValid ? state.values.send : "0",
+        sendIsValid ? state.values.send ?? 0 : "0",
         sendToken?.decimals || 18,
       )
       const receiveAmount = parseUnits(
@@ -176,6 +181,7 @@ export function useLimit(props: Props) {
     if (!currentMarket) return
     const limit = Number(form?.getFieldValue("limitPrice") ?? 0)
     const receive = Number(form?.getFieldValue("receive") ?? 0)
+    console.log({ limit, receive })
     form.setFieldValue(
       "send",
       (bs === BS.buy ? receive * limit : receive / limit).toString(),

diff --git a/app/trade/_components/forms/market/components/from-wallet-order-dialog.tsx b/app/trade/_components/forms/market/components/from-wallet-order-dialog.tsx
@@ -36,7 +36,6 @@ export default function FromWalletMarketOrderDialog({ form, onClose }: Props) {
     receiveToken,
     spender,
     feeInPercentageAsString,
-    tickSize,
     spotPrice,
   } = useTradeInfos("market", form.bs)
 
@@ -188,11 +187,7 @@ export default function FromWalletMarketOrderDialog({ form, onClose }: Props) {
         <div className="space-y-2">
           {stepInfos[currentStep - 1]?.body ?? undefined}
           <div className="bg-[#041010] rounded-lg p-4 flex items-center">
-            <MarketDetails
-              spotPrice={spotPrice}
-              takerFee={feeInPercentageAsString}
-              tickSize={tickSize}
-            />
+            <MarketDetails takerFee={feeInPercentageAsString} />
           </div>
         </div>
       </Dialog.Description>

diff --git a/app/trade/_components/forms/market/market.tsx b/app/trade/_components/forms/market/market.tsx
@@ -42,7 +42,6 @@ export function Market() {
     send,
     quote,
     avgPrice,
-    tickSize,
     feeInPercentageAsString,
     spotPrice,
   } = useMarketForm({ onSubmit: (formData) => setFormData(formData) })
@@ -275,11 +274,7 @@ export function Market() {
             </form.Field>
             <Separator className="!my-6" />
 
-            <MarketDetails
-              takerFee={feeInPercentageAsString}
-              tickSize={tickSize}
-              spotPrice={spotPrice}
-            />
+            <MarketDetails takerFee={feeInPercentageAsString} />
 
             <form.Subscribe
               selector={(state) => [

diff --git a/app/trade/_components/prices-bar/prices-bar.tsx b/app/trade/_components/prices-bar/prices-bar.tsx
@@ -90,10 +90,6 @@ export function PricesBar() {
   const { book } = useBook({})
   const lowestAskPrice = book?.asks[0]?.price
   const highestBidPrice = book?.bids[0]?.price
-  const priceDecimals = determineDecimals(
-    lowestAskPrice,
-    quote?.priceDisplayDecimals,
-  )
 
   let spotPrice =
     lowestAskPrice && highestBidPrice

diff --git a/app/trade/_components/tables/tables.tsx b/app/trade/_components/tables/tables.tsx
@@ -17,8 +17,8 @@ import { useOrders } from "./orders/hooks/use-orders"
 import { Orders } from "./orders/orders"
 
 export enum TradeTables {
-  ORDERS = "orders",
-  FILLS = "fills",
+  ORDERS = "Open Orders",
+  FILLS = "Orders History",
 }
 
 const TABS_CONTENT = {