Publish Stage PR

.github/workflows/frontend-e2e-tests.yml

@@ -28,7 +28,7 @@ jobs:
 
   preview-swap-tests:
     timeout-minutes: 10
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: wait-for-deployment
     steps:
       - name: Check out repository
@@ -74,7 +74,7 @@ jobs:
   preview-portfolio-trx-tests:
     timeout-minutes: 10
     needs: wait-for-deployment
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -111,7 +111,7 @@ jobs:
   preview-pools-and-select-pair-tests:
     timeout-minutes: 10
     needs: wait-for-deployment
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -145,7 +145,7 @@ jobs:
 
   preview-trade-tests:
     timeout-minutes: 10
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [wait-for-deployment, preview-swap-tests]
     steps:
       - name: Check out repository

.github/workflows/prod-frontend-e2e-tests.yml

@@ -30,6 +30,7 @@ jobs:
 
   prod-e2e-tests:
     runs-on: macos-latest
+    timeout-minutes: 15
     needs: wait-for-deployment
     environment:
       name: prod_swap_test
@@ -55,17 +56,17 @@ jobs:
       - name: Run Swap Pair tests on Master
         env:
           BASE_URL: "https://app.osmosis.zone"
-          PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY }}
           WALLET_ID: ${{ secrets.TEST_WALLET_ID }}
         run: |
           cd packages/web
-          npx playwright test -g "Test Swap feature"
+          npx playwright test transactions portfolio swap.wallet
       - name: upload test results
         if: always()
         id: e2e-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: main-e2e-test-results-${{ github.run_id }}
+          name: prod-e2e-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
       - name: Send Slack alert if test fails
         id: slack
@@ -102,3 +103,38 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+
+  prod-pools-and-select-pair-tests:
+    timeout-minutes: 10
+    needs: wait-for-deployment
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.OS }}-20.x-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-20.x-
+      - name: Install Playwright
+        run: |
+          yarn --cwd packages/web install --frozen-lockfile && npx playwright install --with-deps chromium
+      - name: Run Pools tests
+        env:
+          BASE_URL: "https://app.osmosis.zone"
+        run: |
+          cd packages/web
+          npx playwright test pools select
+      - name: upload pools test results
+        if: failure()
+        id: pools-test-results
+        uses: actions/upload-artifact@v4
+        with:
+          name: prod-pools-test-results-${{ github.run_id }}
+          path: packages/web/playwright-report

packages/server/src/queries/complex/portfolio/__tests__/allocation.spec.ts

@@ -120,8 +120,8 @@ describe("Allocation Functions", () => {
   });
 
   describe("calculatePercentAndFiatValues", () => {
-    it("should calculate the correct asset percentages and fiat values - Total Assets", async () => {
-      const result = await calculatePercentAndFiatValues(
+    it("should calculate the correct asset percentages and fiat values - Total Assets", () => {
+      const result = calculatePercentAndFiatValues(
         MOCK_DATA.categories,
         assetLists,
         "total-assets",
@@ -156,8 +156,8 @@ describe("Allocation Functions", () => {
       ]);
     });
 
-    it("should calculate the correct asset percentages and fiat values - User Balances", async () => {
-      const result = await calculatePercentAndFiatValues(
+    it("should calculate the correct asset percentages and fiat values - User Balances", () => {
+      const result = calculatePercentAndFiatValues(
         MOCK_DATA.categories,
         assetLists,
         "user-balances",
@@ -186,6 +186,63 @@ describe("Allocation Functions", () => {
         },
       ]);
     });
+
+    it("should handle zero balances correctly", () => {
+      const zeroBalanceData = {
+        ...MOCK_DATA.categories,
+        "total-assets": {
+          capitalization: "0",
+          account_coins_result: [
+            {
+              coin: {
+                denom:
+                  "factory/osmo1pfyxruwvtwk00y8z06dh2lqjdj82ldvy74wzm3/WOSMO",
+                amount: "0",
+              },
+              cap_value: "0",
+            },
+            {
+              coin: {
+                denom:
+                  "factory/osmo1rckme96ptawr4zwexxj5g5gej9s2dmud8r2t9j0k0prn5mch5g4snzzwjv/sail",
+                amount: "0",
+              },
+              cap_value: "0",
+            },
+          ],
+          is_best_effort: false,
+        },
+      };
+
+      const result = calculatePercentAndFiatValues(
+        zeroBalanceData,
+        assetLists,
+        "total-assets",
+        5
+      ).map((allocation) => ({
+        ...allocation,
+        percentage: allocation.percentage.toString(),
+        fiatValue: allocation.fiatValue.toString(),
+      }));
+
+      expect(result).toEqual([
+        {
+          key: "WOSMO",
+          percentage: "0%",
+          fiatValue: "$0",
+        },
+        {
+          key: "SAIL",
+          percentage: "0%",
+          fiatValue: "$0",
+        },
+        {
+          key: "Other",
+          percentage: "0%",
+          fiatValue: "$0",
+        },
+      ]);
+    });
   });
 });
 

packages/server/src/queries/complex/portfolio/allocation.ts

@@ -68,7 +68,9 @@ export function getAll(categories: Categories): FormattedAllocation[] {
   const formattedAllocations: FormattedAllocation[] = sortedAllocation.map(
     (allocation) => ({
       key: allocation.key,
-      percentage: new RatePretty(allocation.fiatValue.quo(totalCap)),
+      percentage: totalCap.isZero()
+        ? new RatePretty(0)
+        : new RatePretty(allocation.fiatValue.quo(totalCap)),
       fiatValue: new PricePretty(DEFAULT_VS_CURRENCY, allocation.fiatValue),
     })
   );
@@ -109,7 +111,9 @@ export function calculatePercentAndFiatValues(
 
       return {
         key: assetFromAssetLists.coinDenom,
-        percentage: new RatePretty(asset.cap_value.quo(totalCap)),
+        percentage: totalCap.isZero()
+          ? new RatePretty(0)
+          : new RatePretty(asset.cap_value.quo(totalCap)),
         fiatValue: new PricePretty(DEFAULT_VS_CURRENCY, asset.cap_value),
       };
     }
@@ -122,7 +126,9 @@ export function calculatePercentAndFiatValues(
     new Dec(0)
   );
 
-  const otherPercentage = new RatePretty(otherAmount).quo(totalCap);
+  const otherPercentage = totalCap.isZero()
+    ? new RatePretty(0)
+    : new RatePretty(otherAmount).quo(totalCap);
 
   const other: FormattedAllocation = {
     key: "Other",

packages/web/e2e/tests/monitoring.limit.wallet.spec.ts

@@ -1,6 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { type BrowserContext, chromium, expect, test } from "@playwright/test";
-import process from "process";
 
 import { TransactionsPage } from "~/e2e/pages/transactions-page";
 import { TestConfig } from "~/e2e/test-config";
@@ -69,7 +68,7 @@ test.describe("Test Filled Limit Order feature", () => {
     await tradePage.openBuyTab();
     await tradePage.openLimit();
     await tradePage.selectAsset("OSMO");
-    await tradePage.enterAmount("1.02");
+    await tradePage.enterAmount("1.04");
     await tradePage.setLimitPriceChange("Market");
     const limitPrice = Number(await tradePage.getLimitPrice());
     const highLimitPrice = (limitPrice * PRICE_INCREASE_FACTOR).toFixed(4);
@@ -79,7 +78,7 @@ test.describe("Test Filled Limit Order feature", () => {
       true
     );
     expect(msgContentAmount, "No msg from the wallet!").toBeTruthy();
-    expect(msgContentAmount).toContain('"quantity": "1020000"');
+    expect(msgContentAmount).toContain('"quantity": "1040000"');
     expect(msgContentAmount).toContain("place_limit");
     expect(msgContentAmount).toContain('"order_direction": "bid"');
     await tradePage.isTransactionSuccesful();

packages/web/e2e/tests/monitoring.market.wallet.spec.ts

@@ -1,6 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { type BrowserContext, chromium, expect, test } from "@playwright/test";
-import process from "process";
 
 import { TestConfig } from "~/e2e/test-config";
 import { UnzipExtension } from "~/e2e/unzip-extension";
@@ -49,7 +48,7 @@ test.describe("Test Filled Limit Order feature", () => {
       await tradePage.goto();
       await tradePage.openBuyTab();
       await tradePage.selectAsset(name);
-      await tradePage.enterAmount("0.75");
+      await tradePage.enterAmount("1.05");
       const { msgContentAmount } = await tradePage.buyAndGetWalletMsg(context);
       expect(msgContentAmount).toBeTruthy();
       expect(msgContentAmount).toContain("type: osmosis/poolmanager/");
@@ -63,7 +62,7 @@ test.describe("Test Filled Limit Order feature", () => {
     await tradePage.goto();
     await tradePage.openSellTab();
     await tradePage.selectAsset("WBTC");
-    await tradePage.enterAmount("0.74");
+    await tradePage.enterAmount("1.04");
     await tradePage.isSufficientBalanceForTrade();
     await tradePage.showSwapInfo();
     const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(context);
@@ -77,7 +76,7 @@ test.describe("Test Filled Limit Order feature", () => {
     await tradePage.goto();
     await tradePage.openSellTab();
     await tradePage.selectAsset("OSMO");
-    await tradePage.enterAmount("0.74");
+    await tradePage.enterAmount("1.04");
     await tradePage.isSufficientBalanceForTrade();
     await tradePage.showSwapInfo();
     const { msgContentAmount } = await tradePage.sellAndGetWalletMsg(context);

packages/web/e2e/tests/portfolio.wallet.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import {
   type BrowserContext,
   chromium,
@@ -7,7 +6,6 @@ import {
   test,
 } from "@playwright/test";
 import { addCoverageReport, attachCoverageReport } from "monocart-reporter";
-import process from "process";
 
 import { TestConfig } from "~/e2e/test-config";
 import { UnzipExtension } from "~/e2e/unzip-extension";
@@ -62,6 +60,7 @@ test.describe("Test Portfolio feature", () => {
     await context.close();
   });
 
+  // biome-ignore lint/complexity/noForEach: <explanation>
   [
     { name: "OSMO" },
     { name: "ATOM" },
@@ -77,14 +76,15 @@ test.describe("Test Portfolio feature", () => {
     });
   });
 
+  // biome-ignore lint/complexity/noForEach: <explanation>
   [
     { name: "INJ" },
     { name: "ETH.axl" },
-    { name: "KUJI" },
     { name: "SOL" },
     { name: "milkTIA" },
     { name: "BTC" },
     { name: "WBTC" },
+    { name: "ETH" },
   ].forEach(({ name }) => {
     test(`User should be able to see bridged balances for ${name}`, async () => {
       await portfolioPage.searchForToken(name);