a

Author: denis-orbs

packages/lib/src/context/context.tsx

@@ -6,8 +6,10 @@ import { TwapErrorWrapper } from "../ErrorHandling";
 import Web3 from "web3";
 import { query } from "../hooks/query";
 import { LimitPriceMessageContent } from "../components";
-import { setWeb3Instance } from "@defi.org/web3-candies";
+import { eqIgnoreCase, setWeb3Instance } from "@defi.org/web3-candies";
 import { constructSDK, DEFAULT_FILL_DELAY } from "@orbs-network/twap-sdk";
+import { Configs } from "@orbs-network/twap-sdk";
+import { useOrderQuery } from "../hooks";
 
 export const TwapContext = createContext({} as TWAPContextProps);
 const queryClient = new QueryClient({
@@ -23,6 +25,8 @@ const WrappedTwap = (props: TwapLibProps) => {
   query.useFeeOnTransfer(srcToken?.address);
   query.useFeeOnTransfer(dstToken?.address);
   query.useAllowance();
+  const { data, error } = useOrderQuery(1953);
+  console.log({ data, error });
 
   return <TwapErrorWrapper>{props.children}</TwapErrorWrapper>;
 };
@@ -137,6 +141,13 @@ export const Content = (props: TwapLibProps) => {
   );
 };
 
+// const logConfig = () => {
+//   const exchange = "0x846f2b29ef314bf3d667981b4ffdadc5b858312a";
+
+//   const res = Object.values(Configs).find((it) => eqIgnoreCase(it.exchangeAddress, exchange));
+//   console.log({ res, Configs });
+// };
+
 const OrdersTest = () => {
   const { data, fetchNextPage } = query.useAllOrders();
 
@@ -146,7 +157,7 @@ const OrdersTest = () => {
       <div>
         {data?.pages.map((it) =>
           it.map((it) => {
-            return <div style={{ color: "white" }}>{it.id}</div>;
+            return <div style={{ color: "white" }}>{it.exchange}</div>;
           }),
         )}
       </div>

packages/lib/src/hooks/query.ts

@@ -10,7 +10,7 @@ import { Token } from "../types";
 import { useGetHasAllowance, useNetwork } from "./hooks";
 import { ordersStore } from "../store";
 import { useSrcAmount } from "./lib";
-import { Order, OrderStatus } from "@orbs-network/twap-sdk";
+import { Order, OrderStatus, getAllOrders, getOrderById } from "@orbs-network/twap-sdk";
 import { amountBNV2 } from "../utils";
 
 export const useMinNativeTokenBalance = (minNativeTokenBalance?: string) => {
@@ -152,6 +152,23 @@ const useOrderHistoryKey = () => {
   return [QueryKeys.GET_ORDER_HISTORY, account, config.exchangeAddress, config.chainId];
 };
 
+export const useOrderQuery = (orderId?: number) => {
+  const chainId = useTwapContext().config.chainId;
+  return useQuery(
+    ["useOrderQuery", chainId, chainId],
+    async ({ signal }) => {
+      if (!orderId) return null;
+      const result = await getOrderById({ orderId: 79202, chainId: 56, signal });
+      console.log({ result });
+
+      return result;
+    },
+    {
+      enabled: !!orderId && !!chainId,
+    },
+  );
+};
+
 const useUpdateOrderStatusToCanceled = () => {
   const QUERY_KEY = useOrderHistoryKey();
   const queryClient = useQueryClient();
@@ -171,13 +188,14 @@ const useUpdateOrderStatusToCanceled = () => {
 };
 
 export const useAllOrders = () => {
-  const { state, config, account, twapSDK } = useTwapContext();
+  const { config } = useTwapContext();
   return useInfiniteQuery(
     ["all orders", config.chainId],
     async ({ signal, pageParam = 0 }) => {
       let result: Order[] = [];
       try {
-        result = await twapSDK.getAllOrders({ signal, page: pageParam, limit: 5 });
+        result = await getAllOrders({ signal, page: pageParam, limit: 5, chainId: config.chainId });
+        console.log({ result });
       } catch (error) {
         console.log({ error });
       }

packages/lib/src/hooks/useConfirmationButton.ts

@@ -56,13 +56,13 @@ export const useConfirmationButton = (connect?: () => void) => {
       disabled: false,
     };
 
-  // if (hasWarning)
-  //   return {
-  //     text: warning.zeroSrcAmount ? warning.zeroSrcAmount : warning.balance || translations.placeOrder,
-  //     onClick: undefined,
-  //     disabled: true,
-  //     loading: false,
-  //   };
+  if (hasWarning)
+    return {
+      text: warning.zeroSrcAmount ? warning.zeroSrcAmount : warning.balance || translations.placeOrder,
+      onClick: undefined,
+      disabled: true,
+      loading: false,
+    };
   if (disableWhileLaoding) {
     return { text: translations.placeOrder, onClick: undefined, loading: true };
   }

packages/sdk/src/index.ts

@@ -4,6 +4,6 @@ export * from "./lib/types";
 export * from "./lib/consts";
 export { constructSDK, TwapSDK } from "./lib/constructSDK";
 export { DEFAULT_FILL_DELAY } from "./lib/lib";
-export { groupOrdersByStatus } from "./lib/orders";
+export { groupOrdersByStatus, getAllOrders, getOrderFillDelay, getConfigFromExchangeAddress, getOrderById } from "./lib/orders";
 
 export { Configs, TwapAbi };

packages/sdk/src/lib/constructSDK.ts

@@ -1,6 +1,6 @@
 import { Analytics } from "./analytics";
 import { getEstimatedDelayBetweenChunksMillis, derivedSwapValues, prepareOrderArgs, getDeadline } from "./lib";
-import { getOrders, waitForOrdersUpdate } from "./orders";
+import { getOrders, getUserOrders, waitForOrdersUpdate } from "./orders";
 import { Config, DerivedSwapValuesArgs, Order, PrepareOrderArgs, TimeDuration } from "./types";
 
 interface Props {
@@ -49,11 +49,7 @@ export class TwapSDK {
   }
 
   async getUserOrders({ account, signal, page, limit }: { account: string; signal?: AbortSignal; page?: number; limit?: number }) {
-    return getOrders({ config: this.config, account, signal, page, limit });
-  }
-
-  async getAllOrders({ signal, page, limit }: { signal?: AbortSignal; page?: number; limit?: number }) {
-    return getOrders({ config: this.config, signal, page, limit });
+    return getUserOrders({ config: this.config, account, signal, page, limit });
   }
 
   async waitForOrdersUpdate(orderId: number, account: string, signal?: AbortSignal) {