@orderly.network/hooks 0.0.38 → 0.0.40

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import useSWR, { SWRConfiguration, SWRResponse } from 'swr';
 export { SWRConfig, SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
-import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter } from '@orderly.network/core';
+import { Account, AccountState, ConfigStore, OrderlyKeyStore, getWalletAdapterFunc, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';
 import react__default, { FC, PropsWithChildren } from 'react';
 export { default as useConstant } from 'use-constant';
@@ -71,11 +71,10 @@ interface OrderlyContextState extends OrderlyAppConfig {
     klineDataUrl: string;
     configStore: ConfigStore;
     keyStore: OrderlyKeyStore;
-    walletAdapter: {
-        new (options: any): WalletAdapter;
-    };
+    getWalletAdapter: getWalletAdapterFunc;
     contractManager: IContract;
     networkId: string;
+    brokerId: string;
     onWalletConnect?: () => Promise<any>;
     onWalletDisconnect?: () => Promise<any>;
     onSetChain?: (chainId: number) => Promise<any>;

package/dist/index.mjs

@@ -6,7 +6,7 @@ import useSWRMutation from 'swr/mutation';
 import useConstant from 'use-constant';
 export { default as useConstant } from 'use-constant';
 import { SimpleDI, Account, EventEmitter } from '@orderly.network/core';
-import { AccountStatusEnum, OrderSide, OrderType } from '@orderly.network/types';
+import { AccountStatusEnum, OrderSide, OrderStatus as OrderStatus$1, OrderType } from '@orderly.network/types';
 import useSWRSubscription from 'swr/subscription';
 import { Decimal, zero, getPrecisionByNumber, timeConvertString } from '@orderly.network/utils';
 import { pathOr, propOr, compose, head, prop } from 'ramda';
@@ -89,7 +89,7 @@ var useQuery = (query, options) => {
   );
 };
 var useAccountInstance = () => {
-  const { configStore, keyStore, contractManager, walletAdapter } = useContext(OrderlyContext);
+  const { configStore, keyStore, contractManager, getWalletAdapter } = useContext(OrderlyContext);
   if (!configStore)
     throw new Error("configStore is not defined, please use OrderlyProvider");
   if (!keyStore) {
@@ -104,7 +104,8 @@ var useAccountInstance = () => {
         configStore,
         keyStore,
         contractManager,
-        walletAdapter
+        getWalletAdapter
+        // walletAdapter
       );
       SimpleDI.registerByName("account", account6);
     }
@@ -204,8 +205,6 @@ var useAccount = () => {
   const {
     configStore,
     keyStore,
-    walletAdapter,
-    contractManager,
     onWalletConnect,
     onWalletDisconnect,
     onSetChain
@@ -1195,7 +1194,9 @@ var unsettledPnL = pathOr(0, [0, "aggregated", "unsettledPnL"]);
 var useCollateral = (options = { dp: 6 }) => {
   const { dp } = options;
   const positions2 = usePositionStream();
-  const { data: orders } = usePrivateQuery(`/v1/orders`);
+  const { data: orders } = usePrivateQuery(
+    `/v1/orders?status=NEW`
+  );
   const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const symbolInfo = useSymbolsInfo();
   const { data: markPrices } = useMarkPricesStream();
@@ -1708,13 +1709,13 @@ var usePrivateInfiniteQuery = (getKey, options) => {
   );
   return result;
 };
-var OrderStatus = /* @__PURE__ */ ((OrderStatus2) => {
-  OrderStatus2["FILLED"] = "FILLED";
-  OrderStatus2["PARTIAL_FILLED"] = "PARTIAL_FILLED";
-  OrderStatus2["CANCELED"] = "CANCELED";
-  OrderStatus2["NEW"] = "NEW";
-  OrderStatus2["COMPLETED"] = "COMPLETED";
-  return OrderStatus2;
+var OrderStatus = /* @__PURE__ */ ((OrderStatus3) => {
+  OrderStatus3["FILLED"] = "FILLED";
+  OrderStatus3["PARTIAL_FILLED"] = "PARTIAL_FILLED";
+  OrderStatus3["CANCELED"] = "CANCELED";
+  OrderStatus3["NEW"] = "NEW";
+  OrderStatus3["COMPLETED"] = "COMPLETED";
+  return OrderStatus3;
 })(OrderStatus || {});
 var useOrderStream = ({
   status,
@@ -1940,14 +1941,40 @@ var usePrivateDataObserver = () => {
   const ee = useEventEmitter();
   const { state } = useAccount();
   useEffect(() => {
-    console.log("subscribe: executionreport");
     const unsubscribe = ws.privateSubscribe("executionreport", {
       onMessage: (data) => {
+        const key = ["/v1/orders?status=NEW", state.accountId];
+        mutate2(key, (orders) => {
+          return Promise.resolve().then(() => {
+            if (!orders) {
+              return orders;
+            }
+            if (data.status === OrderStatus$1.NEW) {
+              return [
+                __spreadProps(__spreadValues({}, data), {
+                  // average_executed_price:data.ava
+                  created_time: data.timestamp,
+                  order_id: data.orderId
+                  // reduce_only
+                }),
+                ...orders
+              ];
+            }
+            if (data.status === OrderStatus$1.CANCELLED) {
+              return orders.filter(
+                (order2) => order2.order_id !== data.orderId
+              );
+            }
+            return orders;
+          }).catch((error) => {
+            console.log("error", error, error.stack);
+          });
+        });
         ee.emit("orders:changed");
       }
     });
     return () => unsubscribe == null ? void 0 : unsubscribe();
-  }, []);
+  }, [state.accountId]);
   useEffect(() => {
     console.log("subscribe: position: %s", state.accountId);
     if (!state.accountId)
@@ -1956,9 +1983,7 @@ var usePrivateDataObserver = () => {
     const unsubscribe = ws.privateSubscribe("position", {
       onMessage: (data) => {
         const { positions: nextPostions } = data;
-        console.info("refresh positions:", nextPostions, state.accountId);
         mutate2(key, (prevPositions) => {
-          console.log("prevPositions:::::", prevPositions);
           if (!!prevPositions) {
             return __spreadProps(__spreadValues({}, prevPositions), {
               rows: prevPositions.rows.map((row) => {