fix: price no longer resets when closing review modal

osmosis-labs · Aug 13, 2024 · fa33303 · fa33303
1 parent 7bfc00e
commit fa33303
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/packages/web/components/place-limit-tool/index.tsx b/packages/web/components/place-limit-tool/index.tsx
@@ -44,7 +44,6 @@ import { countDecimals, trimPlaceholderZeros } from "~/utils/number";
 
 export interface PlaceLimitToolProps {
   page: EventPage;
-  refetchOrders: () => Promise<any>;
 }
 
 const fixDecimalCount = (value: string, decimalCount = 18) => {
@@ -80,7 +79,7 @@ const NON_DISPLAY_ERRORS = [
 ];
 
 export const PlaceLimitTool: FunctionComponent<PlaceLimitToolProps> = observer(
-  ({ page, refetchOrders }: PlaceLimitToolProps) => {
+  ({ page }: PlaceLimitToolProps) => {
     const { accountStore } = useStore();
     const { t } = useTranslation();
     const [reviewOpen, setReviewOpen] = useState<boolean>(false);
@@ -142,6 +141,7 @@ export const PlaceLimitTool: FunctionComponent<PlaceLimitToolProps> = observer(
         type === "market" &&
         swapState.priceState.percentAdjusted.abs().gt(new Dec(0))
       ) {
+        console.log("RESETTING");
         swapState.priceState.reset();
       }
     }, [swapState.priceState, type]);
@@ -611,7 +611,6 @@ export const PlaceLimitTool: FunctionComponent<PlaceLimitToolProps> = observer(
           confirmAction={async () => {
             setIsSendingTx(true);
             await swapState.placeLimit();
-            refetchOrders();
             swapState.reset();
             setAmountSafe("fiat", "");
             setReviewOpen(false);

diff --git a/packages/web/components/trade-tool/index.tsx b/packages/web/components/trade-tool/index.tsx
@@ -15,7 +15,6 @@ import {
 } from "~/components/swap-tool/swap-tool-tabs";
 import { EventName, EventPage } from "~/config";
 import { useAmplitudeAnalytics, useTranslation } from "~/hooks";
-import { useOrderbookAllActiveOrders } from "~/hooks/limit-orders/use-orderbook";
 import { useStore } from "~/stores";
 
 export interface TradeToolProps {
@@ -37,12 +36,6 @@ export const TradeTool: FunctionComponent<TradeToolProps> = observer(
     const { accountStore } = useStore();
     const wallet = accountStore.getWallet(accountStore.osmosisChainId);
 
-    const { orders, refetch } = useOrderbookAllActiveOrders({
-      userAddress: wallet?.address ?? "",
-      pageSize: 10,
-      refetchInterval: 4000,
-    });
-
     useEffect(() => {
       switch (tab) {
         case SwapToolTab.BUY:
@@ -74,21 +67,9 @@ export const TradeTool: FunctionComponent<TradeToolProps> = observer(
           {useMemo(() => {
             switch (tab) {
               case SwapToolTab.BUY:
-                return (
-                  <PlaceLimitTool
-                    key="tool-buy"
-                    page={page}
-                    refetchOrders={refetch}
-                  />
-                );
+                return <PlaceLimitTool key="tool-buy" page={page} />;
               case SwapToolTab.SELL:
-                return (
-                  <PlaceLimitTool
-                    key="tool-sell"
-                    page={page}
-                    refetchOrders={refetch}
-                  />
-                );
+                return <PlaceLimitTool key="tool-sell" page={page} />;
               case SwapToolTab.SWAP:
               default:
                 return (
@@ -100,7 +81,7 @@ export const TradeTool: FunctionComponent<TradeToolProps> = observer(
                   />
                 );
             }
-          }, [page, swapToolProps, tab, refetch])}
+          }, [page, swapToolProps, tab])}
         </div>
         {wallet?.isWalletConnected && (
           <Link

diff --git a/packages/web/modals/review-order.tsx b/packages/web/modals/review-order.tsx
@@ -162,7 +162,8 @@ export function ReviewOrder({
   );
 
   useEffect(() => {
-    if (limitSetPriceLock && orderType === "limit") limitSetPriceLock(isOpen);
+    if (limitSetPriceLock && orderType === "limit" && isOpen)
+      limitSetPriceLock(true);
   }, [limitSetPriceLock, isOpen, orderType]);
 
   const gasFeeError = useMemo(() => {