Merge branch 'tu/abacus-ts-types' into tu/abacus-ts-2

dydxprotocol · Dec 12, 2024 · a58d832 · a58d832
2 parents 73d52e8 + 2487d1d
commit a58d832
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/src/abacus-ts/lib/createStoreEffect.ts b/src/abacus-ts/lib/createStoreEffect.ts
@@ -18,6 +18,7 @@ export function createStoreEffect<T>(
       lastCleanup = handleChange(thisValue);
     }
   });
+
   return () => {
     lastCleanup?.();
     removeStoreListener();

diff --git a/src/abacus-ts/rest/lib/indexerQueryStoreEffect.ts b/src/abacus-ts/rest/lib/indexerQueryStoreEffect.ts
@@ -41,9 +41,7 @@ export function createIndexerQueryStoreEffect<T, R>(
   config: QuerySetupConfig<T, R>
 ) {
   const fullSelector = createAppSelector(
-    selectWebsocketUrl,
-    selectIndexerUrl,
-    config.selector,
+    [selectWebsocketUrl, selectIndexerUrl, config.selector],
     (wsUrl, indexerUrl, selectorResult) => ({
       infrastructure: { wsUrl, indexerUrl },
       queryData: selectorResult,

diff --git a/src/abacus-ts/socketSelectors.ts b/src/abacus-ts/socketSelectors.ts
@@ -7,18 +7,17 @@ import { getSelectedNetwork } from '@/state/appSelectors';
 import { createAppSelector } from '@/state/appTypes';
 
 const suffix = '/v4/ws';
-export const selectWebsocketUrl = createAppSelector(getSelectedNetwork, (network) => {
+export const selectWebsocketUrl = createAppSelector([getSelectedNetwork], (network) => {
   const endpointsConfig: EndpointsConfig = ENVIRONMENT_CONFIG_MAP[network].endpoints;
   return `${endpointsConfig.indexers[0]!.socket}${suffix}`;
 });
 
-export const selectIndexerUrl = createAppSelector(getSelectedNetwork, (network) => {
+export const selectIndexerUrl = createAppSelector([getSelectedNetwork], (network) => {
   const endpointsConfig: EndpointsConfig = ENVIRONMENT_CONFIG_MAP[network].endpoints;
   return `${endpointsConfig.indexers[0]!.api}`;
 });
 
 export const selectParentSubaccountInfo = createAppSelector(
-  getUserWalletAddress,
-  getUserSubaccountNumber,
+  [getUserWalletAddress, getUserSubaccountNumber],
   (wallet, subaccount) => ({ wallet, subaccount })
 );
diff --git a/src/abacus-ts/websocket/orderbook.ts b/src/abacus-ts/websocket/orderbook.ts
@@ -66,8 +66,7 @@ function orderbookWebsocketValue(
 }
 
 const selectMarketAndWsInfo = createAppSelector(
-  selectWebsocketUrl,
-  (state) => state.perpetuals.currentMarketId,
+  [selectWebsocketUrl, (state) => state.perpetuals.currentMarketId],
   (wsUrl, currentMarketId) => ({ wsUrl, currentMarketId })
 );
 

diff --git a/src/abacus-ts/websocket/parentSubaccount.ts b/src/abacus-ts/websocket/parentSubaccount.ts
@@ -166,8 +166,7 @@ function accountWebsocketValue(
 }
 
 const selectParentSubaccount = createAppSelector(
-  selectWebsocketUrl,
-  selectParentSubaccountInfo,
+  [selectWebsocketUrl, selectParentSubaccountInfo],
   (wsUrl, { wallet, subaccount }) => ({ wsUrl, wallet, subaccount })
 );