diff --git a/packages/e2e/tests/monitoring.limit.wallet.spec.ts b/packages/e2e/tests/monitoring.limit.wallet.spec.ts
index 2ba0c1c705..09597c65f6 100644
--- a/packages/e2e/tests/monitoring.limit.wallet.spec.ts
+++ b/packages/e2e/tests/monitoring.limit.wallet.spec.ts
@@ -1,99 +1,97 @@
-import { type BrowserContext, chromium, expect, test } from "@playwright/test";
+import { type BrowserContext, chromium, expect, test } from '@playwright/test'
+import { TestConfig } from '../test-config'
+import { UnzipExtension } from '../unzip-extension'
 
-import { TransactionsPage } from "../pages/transactions-page";
-import { TestConfig } from "../test-config";
-import { UnzipExtension } from "../unzip-extension";
+import { WalletPage } from '../pages/keplr-page'
+import { TradePage } from '../pages/trade-page'
 
-import { WalletPage } from "../pages/keplr-page";
-import { TradePage } from "../pages/trade-page";
-
-test.describe("Test Filled Limit Order feature", () => {
-  let context: BrowserContext;
-  const privateKey = process.env.PRIVATE_KEY ?? "private_key";
-  let tradePage: TradePage;
+test.describe('Test Filled Limit Order feature', () => {
+  let context: BrowserContext
+  const privateKey = process.env.PRIVATE_KEY ?? 'private_key'
+  let tradePage: TradePage
 
   test.beforeAll(async () => {
-    const pathToExtension = new UnzipExtension().getPathToExtension();
-    console.log("\nSetup Wallet Extension before tests.");
+    const pathToExtension = new UnzipExtension().getPathToExtension()
+    console.log('\nSetup Wallet Extension before tests.')
     // Launch Chrome with a Keplr wallet extension
     context = await chromium.launchPersistentContext(
-      "",
-      new TestConfig().getBrowserExtensionConfig(false, pathToExtension)
-    );
+      '',
+      new TestConfig().getBrowserExtensionConfig(false, pathToExtension),
+    )
     // Get all new pages (including Extension) in the context and wait
-    const emptyPage = context.pages()[0];
-    await emptyPage.waitForTimeout(2000);
-    const page = context.pages()[1];
-    const walletPage = new WalletPage(page);
+    const emptyPage = context.pages()[0]
+    await emptyPage.waitForTimeout(2000)
+    const page = context.pages()[1]
+    const walletPage = new WalletPage(page)
     // Import existing Wallet (could be aggregated in one function).
-    await walletPage.importWalletWithPrivateKey(privateKey);
-    await walletPage.setWalletNameAndPassword("Monitoring E2E Tests");
-    await walletPage.selectChainsAndSave();
-    await walletPage.finish();
+    await walletPage.importWalletWithPrivateKey(privateKey)
+    await walletPage.setWalletNameAndPassword('Monitoring E2E Tests')
+    await walletPage.selectChainsAndSave()
+    await walletPage.finish()
     // Switch to Application
-    tradePage = new TradePage(context.pages()[0]);
-    await tradePage.goto();
-    await tradePage.connectWallet();
-    expect(await tradePage.isError(), "Swap is not available!").toBeFalsy();
-  });
+    tradePage = new TradePage(context.pages()[0])
+    await tradePage.goto()
+    await tradePage.connectWallet()
+    expect(await tradePage.isError(), 'Swap is not available!').toBeFalsy()
+  })
 
   test.afterAll(async () => {
-    await context.close();
-  });
+    await context.close()
+  })
 
   // biome-ignore lint/correctness/noEmptyPattern: <explanation>
   test.afterEach(async ({}, testInfo) => {
-    console.log(`Test [${testInfo.title}] status: ${testInfo.status}`);
-    if (testInfo.status === "failed") {
-      const name = testInfo.title;
-      process.env.GITHUB_STEP_SUMMARY = `Test ${name} failed.`;
+    console.log(`Test [${testInfo.title}] status: ${testInfo.status}`)
+    if (testInfo.status === 'failed') {
+      const name = testInfo.title
+      process.env.GITHUB_STEP_SUMMARY = `Test ${name} failed.`
     }
-  });
+  })
 
-  test("User should be able to limit sell OSMO", async () => {
-    await tradePage.goto();
-    await tradePage.openSellTab();
-    await tradePage.openLimit();
-    await tradePage.selectAsset("OSMO");
-    await tradePage.enterAmount("1.08");
-    await tradePage.setLimitPriceChange("Market");
+  test('User should be able to limit sell OSMO', async () => {
+    await tradePage.goto()
+    await tradePage.openSellTab()
+    await tradePage.openLimit()
+    await tradePage.selectAsset('OSMO')
+    await tradePage.enterAmount('1.08')
+    await tradePage.setLimitPriceChange('Market')
     const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(
       context,
-      true
-    );
-    expect(msgContentAmount, "No msg from the wallet!").toBeTruthy();
+      true,
+    )
+    expect(msgContentAmount, 'No msg from the wallet!').toBeTruthy()
     // now this is converted from USDC
-    expect(msgContentAmount).toContain("place_limit");
-    expect(msgContentAmount).toContain('"order_direction": "ask"');
-    await tradePage.isTransactionSuccesful();
-    await tradePage.getTransactionUrl();
-  });
+    expect(msgContentAmount).toContain('place_limit')
+    expect(msgContentAmount).toContain('"order_direction": "ask"')
+    await tradePage.isTransactionSuccesful()
+    await tradePage.getTransactionUrl()
+  })
 
-  test("User should be able to limit buy OSMO", async () => {
-    const PRICE_INCREASE_FACTOR = 1.07; // 7% increase for limit price
-    const ORDER_HISTORY_TIMEOUT = 30; // Seconds to wait for order history
-    await tradePage.goto();
-    await tradePage.openBuyTab();
-    await tradePage.openLimit();
-    await tradePage.selectAsset("OSMO");
-    await tradePage.enterAmount("1.04");
-    await tradePage.setLimitPriceChange("Market");
-    const limitPrice = Number(await tradePage.getLimitPrice());
-    const highLimitPrice = (limitPrice * PRICE_INCREASE_FACTOR).toFixed(4);
-    await tradePage.setLimitPrice(String(highLimitPrice));
+  test('User should be able to limit buy OSMO', async () => {
+    const PRICE_INCREASE_FACTOR = 1.07 // 7% increase for limit price
+    const ORDER_HISTORY_TIMEOUT = 30 // Seconds to wait for order history
+    await tradePage.goto()
+    await tradePage.openBuyTab()
+    await tradePage.openLimit()
+    await tradePage.selectAsset('OSMO')
+    await tradePage.enterAmount('1.04')
+    await tradePage.setLimitPriceChange('Market')
+    const limitPrice = Number(await tradePage.getLimitPrice())
+    const highLimitPrice = (limitPrice * PRICE_INCREASE_FACTOR).toFixed(4)
+    await tradePage.setLimitPrice(String(highLimitPrice))
     const { msgContentAmount } = await tradePage.buyAndGetWalletMsg(
       context,
-      true
-    );
-    expect(msgContentAmount, "No msg from the wallet!").toBeTruthy();
-    expect(msgContentAmount).toContain('"quantity": "1040000"');
-    expect(msgContentAmount).toContain("place_limit");
-    expect(msgContentAmount).toContain('"order_direction": "bid"');
-    await tradePage.isTransactionSuccesful();
-    await tradePage.getTransactionUrl();
-    await tradePage.gotoOrdersHistory(ORDER_HISTORY_TIMEOUT);
+      true,
+    )
+    expect(msgContentAmount, 'No msg from the wallet!').toBeTruthy()
+    expect(msgContentAmount).toContain('"quantity": "1040000"')
+    expect(msgContentAmount).toContain('place_limit')
+    expect(msgContentAmount).toContain('"order_direction": "bid"')
+    await tradePage.isTransactionSuccesful()
+    await tradePage.getTransactionUrl()
+    await tradePage.gotoOrdersHistory(ORDER_HISTORY_TIMEOUT)
     //const p = context.pages()[0]
     //const trxPage = new TransactionsPage(p)
     //await trxPage.isFilledByLimitPrice(highLimitPrice)
-  });
-});
+  })
+})
diff --git a/packages/e2e/tests/monitoring.market.wallet.spec.ts b/packages/e2e/tests/monitoring.market.wallet.spec.ts
index 87d596c258..85beecff7c 100644
--- a/packages/e2e/tests/monitoring.market.wallet.spec.ts
+++ b/packages/e2e/tests/monitoring.market.wallet.spec.ts
@@ -1,99 +1,99 @@
-import { type BrowserContext, chromium, expect, test } from "@playwright/test";
+import { type BrowserContext, chromium, expect, test } from '@playwright/test'
 
-import { TestConfig } from "../test-config";
-import { UnzipExtension } from "../unzip-extension";
+import { TestConfig } from '../test-config'
+import { UnzipExtension } from '../unzip-extension'
 
-import { WalletPage } from "../pages/keplr-page";
-import { TradePage } from "../pages/trade-page";
+import { WalletPage } from '../pages/keplr-page'
+import { TradePage } from '../pages/trade-page'
 
-test.describe("Test Market Buy/Sell Order feature", () => {
-  let context: BrowserContext;
-  const privateKey = process.env.PRIVATE_KEY ?? "private_key";
-  let tradePage: TradePage;
-  const TRX_SUCCESS_TIMEOUT = 10000;
+test.describe('Test Market Buy/Sell Order feature', () => {
+  let context: BrowserContext
+  const privateKey = process.env.PRIVATE_KEY ?? 'private_key'
+  let tradePage: TradePage
+  const TRX_SUCCESS_TIMEOUT = 10000
 
   test.beforeAll(async () => {
-    const pathToExtension = new UnzipExtension().getPathToExtension();
-    console.log("\nSetup Wallet Extension before tests.");
+    const pathToExtension = new UnzipExtension().getPathToExtension()
+    console.log('\nSetup Wallet Extension before tests.')
     // Launch Chrome with a Keplr wallet extension
     context = await chromium.launchPersistentContext(
-      "",
-      new TestConfig().getBrowserExtensionConfig(false, pathToExtension)
-    );
+      '',
+      new TestConfig().getBrowserExtensionConfig(false, pathToExtension),
+    )
     // Get all new pages (including Extension) in the context and wait
-    const emptyPage = context.pages()[0];
-    await emptyPage.waitForTimeout(2000);
-    const page = context.pages()[1];
-    const walletPage = new WalletPage(page);
+    const emptyPage = context.pages()[0]
+    await emptyPage.waitForTimeout(2000)
+    const page = context.pages()[1]
+    const walletPage = new WalletPage(page)
     // Import existing Wallet (could be aggregated in one function).
-    await walletPage.importWalletWithPrivateKey(privateKey);
-    await walletPage.setWalletNameAndPassword("Monitoring E2E Tests");
-    await walletPage.selectChainsAndSave();
-    await walletPage.finish();
+    await walletPage.importWalletWithPrivateKey(privateKey)
+    await walletPage.setWalletNameAndPassword('Monitoring E2E Tests')
+    await walletPage.selectChainsAndSave()
+    await walletPage.finish()
     // Switch to Application
-    tradePage = new TradePage(context.pages()[0]);
-    await tradePage.goto();
-    await tradePage.connectWallet();
-    expect(await tradePage.isError(), "Swap is not available!").toBeFalsy();
-  });
+    tradePage = new TradePage(context.pages()[0])
+    await tradePage.goto()
+    await tradePage.connectWallet()
+    expect(await tradePage.isError(), 'Swap is not available!').toBeFalsy()
+  })
 
   test.afterAll(async () => {
-    await context.close();
-  });
+    await context.close()
+  })
 
   // biome-ignore lint/correctness/noEmptyPattern: <explanation>
   test.afterEach(async ({}, testInfo) => {
-    console.log(`Test [${testInfo.title}] status: ${testInfo.status}`);
-    if (testInfo.status === "failed") {
-      const name = testInfo.title;
-      process.env.GITHUB_STEP_SUMMARY = `Test ${name} failed.`;
-      console.log(`GITHUB_STEP_SUMMARY: ${process.env.GITHUB_STEP_SUMMARY}`);
+    console.log(`Test [${testInfo.title}] status: ${testInfo.status}`)
+    if (testInfo.status === 'failed') {
+      const name = testInfo.title
+      process.env.GITHUB_STEP_SUMMARY = `Test ${name} failed.`
+      console.log(`GITHUB_STEP_SUMMARY: ${process.env.GITHUB_STEP_SUMMARY}`)
     }
-  });
+  })
 
   // biome-ignore lint/complexity/noForEach: <explanation>
-  [{ name: "WBTC" }, { name: "OSMO" }].forEach(({ name }) => {
+  ;[{ name: 'WBTC' }, { name: 'OSMO' }].forEach(({ name }) => {
     test(`User should be able to Market Buy ${name}`, async () => {
-      await tradePage.goto();
-      await tradePage.openBuyTab();
-      await tradePage.selectAsset(name);
-      await tradePage.enterAmount("1.55");
-      await tradePage.isSufficientBalanceForTrade();
-      await tradePage.showSwapInfo();
-      const { msgContentAmount } = await tradePage.buyAndGetWalletMsg(context);
-      expect(msgContentAmount).toBeTruthy();
-      expect(msgContentAmount).toContain("type: osmosis/poolmanager/");
-      await tradePage.isTransactionSuccesful(TRX_SUCCESS_TIMEOUT);
-      await tradePage.getTransactionUrl();
-    });
-  });
+      await tradePage.goto()
+      await tradePage.openBuyTab()
+      await tradePage.selectAsset(name)
+      await tradePage.enterAmount('1.55')
+      await tradePage.isSufficientBalanceForTrade()
+      await tradePage.showSwapInfo()
+      const { msgContentAmount } = await tradePage.buyAndGetWalletMsg(context)
+      expect(msgContentAmount).toBeTruthy()
+      expect(msgContentAmount).toContain('type: osmosis/poolmanager/')
+      await tradePage.isTransactionSuccesful(TRX_SUCCESS_TIMEOUT)
+      await tradePage.getTransactionUrl()
+    })
+  })
 
   // unwrapped market sell tests just in case this affects anything.
-  test("User should be able to Market Sell WBTC", async () => {
-    await tradePage.goto();
-    await tradePage.openSellTab();
-    await tradePage.selectAsset("WBTC");
-    await tradePage.enterAmount("1.54");
-    await tradePage.isSufficientBalanceForTrade();
-    await tradePage.showSwapInfo();
-    const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(context);
-    expect(msgContentAmount).toBeTruthy();
-    expect(msgContentAmount).toContain("type: osmosis/poolmanager/");
-    await tradePage.isTransactionSuccesful(TRX_SUCCESS_TIMEOUT);
-    await tradePage.getTransactionUrl();
-  });
+  test('User should be able to Market Sell WBTC', async () => {
+    await tradePage.goto()
+    await tradePage.openSellTab()
+    await tradePage.selectAsset('WBTC')
+    await tradePage.enterAmount('1.54')
+    await tradePage.isSufficientBalanceForTrade()
+    await tradePage.showSwapInfo()
+    const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(context)
+    expect(msgContentAmount).toBeTruthy()
+    expect(msgContentAmount).toContain('type: osmosis/poolmanager/')
+    await tradePage.isTransactionSuccesful(TRX_SUCCESS_TIMEOUT)
+    await tradePage.getTransactionUrl()
+  })
 
-  test("User should be able to Market Sell OSMO", async () => {
-    await tradePage.goto();
-    await tradePage.openSellTab();
-    await tradePage.selectAsset("OSMO");
-    await tradePage.enterAmount("1.54");
-    await tradePage.isSufficientBalanceForTrade();
-    await tradePage.showSwapInfo();
-    const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(context);
-    expect(msgContentAmount).toBeTruthy();
-    expect(msgContentAmount).toContain("type: osmosis/poolmanager/");
-    await tradePage.isTransactionSuccesful(TRX_SUCCESS_TIMEOUT);
-    await tradePage.getTransactionUrl();
-  });
-});
+  test('User should be able to Market Sell OSMO', async () => {
+    await tradePage.goto()
+    await tradePage.openSellTab()
+    await tradePage.selectAsset('OSMO')
+    await tradePage.enterAmount('1.54')
+    await tradePage.isSufficientBalanceForTrade()
+    await tradePage.showSwapInfo()
+    const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(context)
+    expect(msgContentAmount).toBeTruthy()
+    expect(msgContentAmount).toContain('type: osmosis/poolmanager/')
+    await tradePage.isTransactionSuccesful(TRX_SUCCESS_TIMEOUT)
+    await tradePage.getTransactionUrl()
+  })
+})
diff --git a/packages/e2e/tests/select.spec.ts b/packages/e2e/tests/select.spec.ts
index cfdca8fbaa..e1c55aa042 100644
--- a/packages/e2e/tests/select.spec.ts
+++ b/packages/e2e/tests/select.spec.ts
@@ -4,105 +4,105 @@ import {
   type Page,
   chromium,
   test,
-} from "@playwright/test";
+} from '@playwright/test'
 
-import { TradePage } from "../pages/trade-page";
-import { TestConfig } from "../test-config";
+import { TradePage } from '../pages/trade-page'
+import { TestConfig } from '../test-config'
 
 // Pairs are selected from top 10
-test.describe("Test Select Swap Pair feature", () => {
-  let context: BrowserContext;
-  let swapPage: TradePage;
-  let page: Page;
+test.describe('Test Select Swap Pair feature', () => {
+  let context: BrowserContext
+  let swapPage: TradePage
+  let page: Page
 
   test.beforeAll(async () => {
     context = await chromium.launchPersistentContext(
-      "",
-      new TestConfig().getBrowserConfig(true)
-    );
-    page = context.pages()[0];
-    swapPage = new TradePage(page);
-    await swapPage.goto();
-  });
+      '',
+      new TestConfig().getBrowserConfig(true),
+    )
+    page = context.pages()[0]
+    swapPage = new TradePage(page)
+    await swapPage.goto()
+  })
 
   test.afterAll(async () => {
-    await context.close();
-  });
+    await context.close()
+  })
 
   // Price Impact-54.768% -> no liquidity
-  test("User should be able to select nBTC/USDC", async () => {
-    await swapPage.goto();
-    await swapPage.selectPair("nBTC", "USDC");
-    await swapPage.enterAmount("0.01");
-    await swapPage.showSwapInfo();
-  });
-
-  test("User should be able to select WBTC/USDC", async () => {
-    await swapPage.goto();
-    await swapPage.selectPair("WBTC", "USDC");
-    await swapPage.enterAmount("0.1");
-    await swapPage.showSwapInfo();
-  });
-
-  test("User should be able to select OSMO/USDC", async () => {
-    await swapPage.goto();
-    await swapPage.selectPair("OSMO", "USDC");
-    await swapPage.enterAmount("1");
-    await swapPage.showSwapInfo();
-  });
-
-  test("User should be able to select INJ/USDC", async () => {
-    await swapPage.goto();
-    await swapPage.selectPair("INJ", "USDC");
-    await swapPage.enterAmount("10");
-    await swapPage.showSwapInfo();
-  });
-
-  test("User should be able to select TIA/USDC", async () => {
-    await swapPage.goto();
-    await swapPage.selectPair("TIA", "USDC");
-    await swapPage.enterAmount("100");
-    await swapPage.showSwapInfo();
-  });
-
-  test("User should be able to select ATOM/USDC", async () => {
-    await swapPage.selectPair("ATOM", "USDC");
-    await swapPage.enterAmount("100");
-  });
-
-  test("User should be able to select USDT/USDC", async () => {
-    await swapPage.selectPair("USDT", "USDC");
-    await swapPage.enterAmount("10000");
-  });
-
-  test("User should be able to select TIA/OSMO", async () => {
-    await swapPage.selectPair("TIA", "OSMO");
-    await swapPage.enterAmount("100");
-  });
-
-  test("User should be able to select AKT/OSMO", async () => {
-    await swapPage.selectPair("AKT", "OSMO");
-    await swapPage.enterAmount("100");
-  });
-
-  test("User should be able to select PICA/OSMO", async () => {
-    await swapPage.selectPair("PICA", "OSMO");
-    await swapPage.enterAmount("100");
-  });
-
-  test("User should be able to select USDT/OSMO", async () => {
-    await swapPage.selectPair("USDT", "OSMO");
-    await swapPage.enterAmount("100");
-  });
-
-  test("User should be able to select TIA/BOOT", async () => {
+  test('User should be able to select nBTC/USDC', async () => {
+    await swapPage.goto()
+    await swapPage.selectPair('nBTC', 'USDC')
+    await swapPage.enterAmount('0.01')
+    await swapPage.showSwapInfo()
+  })
+
+  test('User should be able to select WBTC/USDC', async () => {
+    await swapPage.goto()
+    await swapPage.selectPair('WBTC', 'USDC')
+    await swapPage.enterAmount('0.1')
+    await swapPage.showSwapInfo()
+  })
+
+  test('User should be able to select OSMO/USDC', async () => {
+    await swapPage.goto()
+    await swapPage.selectPair('OSMO', 'USDC')
+    await swapPage.enterAmount('1')
+    await swapPage.showSwapInfo()
+  })
+
+  test('User should be able to select INJ/USDC', async () => {
+    await swapPage.goto()
+    await swapPage.selectPair('INJ', 'USDC')
+    await swapPage.enterAmount('10')
+    await swapPage.showSwapInfo()
+  })
+
+  test('User should be able to select TIA/USDC', async () => {
+    await swapPage.goto()
+    await swapPage.selectPair('TIA', 'USDC')
+    await swapPage.enterAmount('100')
+    await swapPage.showSwapInfo()
+  })
+
+  test('User should be able to select ATOM/USDC', async () => {
+    await swapPage.selectPair('ATOM', 'USDC')
+    await swapPage.enterAmount('100')
+  })
+
+  test('User should be able to select USDT/USDC', async () => {
+    await swapPage.selectPair('USDT', 'USDC')
+    await swapPage.enterAmount('10000')
+  })
+
+  test('User should be able to select TIA/OSMO', async () => {
+    await swapPage.selectPair('TIA', 'OSMO')
+    await swapPage.enterAmount('100')
+  })
+
+  test('User should be able to select AKT/OSMO', async () => {
+    await swapPage.selectPair('AKT', 'OSMO')
+    await swapPage.enterAmount('100')
+  })
+
+  test('User should be able to select PICA/OSMO', async () => {
+    await swapPage.selectPair('PICA', 'OSMO')
+    await swapPage.enterAmount('100')
+  })
+
+  test('User should be able to select USDT/OSMO', async () => {
+    await swapPage.selectPair('USDT', 'OSMO')
+    await swapPage.enterAmount('100')
+  })
+
+  test('User should be able to select TIA/BOOT', async () => {
     // Just to verify some odd pair
-    await swapPage.selectPair("TIA", "BOOT");
-    await swapPage.enterAmount("100");
-  });
-
-  test("User should be able to select stATOM/USDC", async () => {
-    await swapPage.selectPair("stATOM", "USDC");
-    await swapPage.enterAmount("100");
-  });
-});
+    await swapPage.selectPair('TIA', 'BOOT')
+    await swapPage.enterAmount('100')
+  })
+
+  test('User should be able to select stATOM/USDC', async () => {
+    await swapPage.selectPair('stATOM', 'USDC')
+    await swapPage.enterAmount('100')
+  })
+})
diff --git a/packages/server/src/queries/data-services/staking-apr.ts b/packages/server/src/queries/data-services/staking-apr.ts
index e68608780b..eb4284a9a2 100644
--- a/packages/server/src/queries/data-services/staking-apr.ts
+++ b/packages/server/src/queries/data-services/staking-apr.ts
@@ -1,6 +1,6 @@
 import { apiClient } from "@osmosis-labs/utils";
 
-import { NUMIA_API_KEY, HISTORICAL_DATA_URL } from "../../env";
+import { HISTORICAL_DATA_URL, NUMIA_API_KEY } from "../../env";
 
 interface StakingAprResponse {
   labels: string;