refactor: altered orderbook denoms to be taken from instantiate message

osmosis-labs · Jul 15, 2024 · 812975c · 812975c
1 parent e3bdd37
commit 812975c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/server/src/queries/complex/orderbooks/pools.ts b/packages/server/src/queries/complex/orderbooks/pools.ts
@@ -10,6 +10,11 @@ const orderbookPoolsCache = new LRUCache<string, CacheEntry>(
 
 const orderBookCodeIds = [865];
 
+interface OrderbookInstantiateMsg {
+  quote_denom: string;
+  base_denom: string;
+}
+
 export interface Orderbook {
   baseDenom: string;
   quoteDenom: string;
@@ -31,9 +36,13 @@ export function getOrderbookPools() {
           })
           .map((pool) => {
             const chainModel = pool.chain_model as ChainCosmwasmPool;
+            const instMsg: OrderbookInstantiateMsg = JSON.parse(
+              atob(chainModel.instantiate_msg)
+            );
+
             return {
-              baseDenom: pool.balances[1].denom,
-              quoteDenom: pool.balances[0].denom,
+              baseDenom: instMsg.base_denom,
+              quoteDenom: instMsg.quote_denom,
               contractAddress: chainModel.contract_address,
               poolId: chainModel.pool_id.toString(),
             };

diff --git a/packages/web/components/place-limit-tool/index.tsx b/packages/web/components/place-limit-tool/index.tsx
@@ -184,8 +184,6 @@ export const PlaceLimitTool: FunctionComponent<PlaceLimitToolProps> = observer(
                         Boolean(swapState.marketState.error) ||
                         Boolean(swapState.marketState.networkFeeError) ||
                         swapState.marketState.isQuoteLoading ||
-                        swapState.marketState.inAmountInput.isTyping ||
-                        swapState.marketState.isQuoteLoading)) ||
                         swapState.marketState.inAmountInput.isTyping)) ||
                     !swapState.isBalancesFetched ||
                     swapState.isMakerFeeLoading ||

diff --git a/packages/web/hooks/limit-orders/use-orderbook.ts b/packages/web/hooks/limit-orders/use-orderbook.ts
@@ -28,6 +28,7 @@ export const useOrderbooks = (): {
 } => {
   const { data: orderbooks, isLoading } =
     api.edge.orderbooks.getPools.useQuery();
+
   const onlyStableOrderbooks = useMemo(
     () =>
       (orderbooks ?? []).filter(({ quoteDenom }) =>