Publish Stage

package.json

@@ -70,7 +70,7 @@
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.2",
     "turbo": "^1.13.3",
-    "typescript": "5.4.3"
+    "typescript": "5.4.5"
   },
   "packageManager": "[email protected]",
   "resolutions": {

packages/server/src/queries/complex/assets/__tests__/categories.spec.ts

@@ -1,4 +1,4 @@
-import dayjs from "../../../../utils/dayjs";
+import { dayjs } from "../../../../utils/dayjs";
 import { AssetLists } from "../../../__tests__/mock-asset-lists";
 import { isAssetInCategories } from "../categories";
 

packages/server/src/queries/complex/assets/categories.ts

@@ -3,7 +3,7 @@ import cachified, { CacheEntry } from "cachified";
 import { LRUCache } from "lru-cache";
 
 import { DEFAULT_LRU_OPTIONS } from "../../../utils";
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { queryUpcomingAssets } from "../../github";
 
 /** Filters an asset for whether it is included in the given list of categories. */

packages/server/src/queries/complex/assets/price/historical.ts

@@ -2,7 +2,7 @@ import cachified, { CacheEntry } from "cachified";
 import { LRUCache } from "lru-cache";
 
 import { DEFAULT_LRU_OPTIONS } from "../../../../utils/cache";
-import dayjs from "../../../../utils/dayjs";
+import { dayjs } from "../../../../utils/dayjs";
 import { queryMarketChart } from "../../../coingecko";
 import {
   queryTokenHistoricalChart,

packages/server/src/queries/complex/earn/strategies.ts

@@ -17,7 +17,7 @@ import {
 } from "../../../queries/data-services/earn";
 import { queryOsmosisCMS } from "../../../queries/github";
 import { DEFAULT_LRU_OPTIONS } from "../../../utils/cache";
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { captureIfError } from "../../../utils/error";
 import { type Asset, getAsset } from "../assets";
 import { DEFAULT_VS_CURRENCY } from "../assets/config";

packages/server/src/queries/complex/osmosis/lockup.ts

@@ -1,7 +1,7 @@
 import { Chain } from "@osmosis-labs/types";
 import { Duration } from "dayjs/plugin/duration";
 
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { queryAccountLockedLongerDuration } from "../../osmosis/lockup";
 
 export type UserLock = {

packages/server/src/queries/complex/pools/bonding.ts

@@ -2,7 +2,7 @@ import { CoinPretty, PricePretty, RatePretty } from "@keplr-wallet/unit";
 import { AssetList, Chain } from "@osmosis-labs/types";
 import type { Duration } from "dayjs/plugin/duration";
 
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { captureErrorAndReturn } from "../../../utils/error";
 import { querySyntheticLockupsByLockId } from "../../osmosis/lockup";
 import {

packages/server/src/utils/dayjs.ts

@@ -5,5 +5,4 @@ import duration from "dayjs/plugin/duration";
 
 dayjs.extend(duration);
 
-// eslint-disable-next-line import/no-default-export
-export default dayjs;
+export { dayjs };

packages/tx/src/__tests__/events.spec.ts

@@ -63,6 +63,35 @@ describe("getSumTotalSpenderCoinsSpent", () => {
 
     expect(coins).toEqual([]);
   });
+
+  it("should only total the amounts for the specified sender", () => {
+    const coins = getSumTotalSpenderCoinsSpent(
+      "osmo1gtgx92pxk6hvhc3c3g0xlkrwqq6knymu0e0caw",
+      mockMultipleEvents
+    );
+
+    // Expected result is the sum of the amounts for the specified sender, not for osmo13vhcd3xllpvz8tql4dzp8yszxeas8zxpzptyvjttdy7m64kuyz5sv6caqq
+    const expectedResult = [
+      {
+        denom:
+          "factory/osmo1z0qrq605sjgcqpylfl4aa6s90x738j7m58wyatt0tdzflg2ha26q67k743/wbtc",
+        amount: "58573",
+      },
+      {
+        denom:
+          "ibc/EA1D43981D5C9A1C4AAEA9C23BB1D4FA126BA9BC7020A25E0AE4AA841EA25DC5",
+        amount: "21083680327000100",
+      },
+      {
+        denom:
+          "ibc/F4A070A6D78496D53127EA85C094A9EC87DFC1F36071B8CCDDBD020F933D213D",
+        amount: "131211643845355500",
+      },
+      { denom: "uosmo", amount: "95799380" },
+    ];
+
+    expect(coins).toEqual(expectedResult);
+  });
 });
 
 describe("matchRawCoinValue", () => {
@@ -225,4 +254,26 @@ const mockMultipleEvents = [
       },
     ],
   },
+  {
+    type: "coin_spent",
+    attributes: [
+      {
+        key: "spender",
+        value:
+          "osmo13vhcd3xllpvz8tql4dzp8yszxeas8zxpzptyvjttdy7m64kuyz5sv6caqq",
+        index: true,
+      },
+      {
+        key: "amount",
+        value:
+          "2605ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4",
+        index: true,
+      },
+      {
+        key: "msg_index",
+        value: "0",
+        index: true,
+      },
+    ],
+  },
 ];

packages/tx/src/events.ts

@@ -15,7 +15,8 @@ export function getSumTotalSpenderCoinsSpent(
     if (type !== "coin_spent") return;
     if (attributes.length === 0) return;
     const spendAttribute = attributes.find((attr) => attr.key === "spender");
-    if (spendAttribute && spendAttribute.value !== spenderBech32Address) return;
+    if (!spendAttribute || spendAttribute.value !== spenderBech32Address)
+      return;
 
     // a comma separated list of coins spent
     const coinsSpentRawAttribute = attributes.find(

packages/tx/src/gas.ts

@@ -297,9 +297,15 @@ export async function getGasFeeAmount({
       bech32Address,
     }),
   ]);
-  const feeBalances = balances.filter((balance) =>
-    chainFeeDenoms.includes(balance.denom)
-  );
+  const feeBalances: { denom: string; amount: string }[] = [];
+
+  // iterate in order of fee denoms
+  for (const denom of chainFeeDenoms) {
+    const balance = balances.find((balance) => balance.denom === denom);
+    if (balance) {
+      feeBalances.push(balance);
+    }
+  }
 
   if (!feeBalances.length) {
     throw new InsufficientFeeError(

packages/web/.eslintrc.json

@@ -25,6 +25,17 @@
     "simple-import-sort/imports": "error",
     "simple-import-sort/exports": "error",
     "unused-imports/no-unused-imports": "error",
-    "react/no-unescaped-entities": "off"
-  }
+    "react/no-unescaped-entities": "off",
+    "import/no-default-export": "error"
+    // see https://stackoverflow.com/questions/44378395/how-to-configure-eslint-so-that-it-disallows-default-exports
+  },
+  "overrides": [
+    // Pages router, config files
+    {
+      "files": ["pages/**/*", "playwright.config.ts"],
+      "rules": {
+        "import/no-default-export": "off"
+      }
+    }
+  ]
 }

packages/web/components/ad-banner/__tests__/ad-banner-content.spec.tsx

@@ -1,4 +1,4 @@
-import { screen } from "@testing-library/react";
+import { act, screen } from "@testing-library/react";
 
 import { renderWithProviders } from "~/__tests__/test-utils";
 import { SwapAdBannerResponse } from "~/pages";
@@ -21,7 +21,10 @@ test("renders ad banner content correctly", () => {
     featured: true,
   };
 
-  renderWithProviders(<AdBannerContent {...mockAd} localization={{}} />);
+  act(() => {
+    renderWithProviders(<AdBannerContent {...mockAd} localization={{}} />);
+  });
+
   const headerElement = screen.getByText(mockAd.headerOrTranslationKey);
   const subheaderElement = screen.getByText(mockAd.subheaderOrTranslationKey);
   const imageElement = screen.getByAltText(mockAd.iconImageAltOrTranslationKey);
@@ -62,12 +65,15 @@ test("renders ad banner content with localization correctly", () => {
 
   const ad = mockAdResponseWithLocalization.banners[0];
 
-  renderWithProviders(
-    <AdBannerContent
-      {...ad}
-      localization={mockAdResponseWithLocalization.localization}
-    />
-  );
+  act(() => {
+    renderWithProviders(
+      <AdBannerContent
+        {...ad}
+        localization={mockAdResponseWithLocalization.localization}
+      />
+    );
+  });
+
   const headerElement = screen.getByText("Mock Header");
   const subheaderElement = screen.getByText("Mock Subheader");
   const imageElement = screen.getByAltText("Mock Icon");

packages/web/components/assets/highlights-categories.tsx

@@ -4,7 +4,7 @@ import Link from "next/link";
 import { FunctionComponent, ReactNode } from "react";
 
 import { PriceChange } from "~/components/assets/price";
-import SkeletonLoader from "~/components/loaders/skeleton-loader";
+import { SkeletonLoader } from "~/components/loaders/skeleton-loader";
 import { EventName } from "~/config";
 import {
   Breakpoint,

packages/web/components/buttons/clipboard-button.tsx

@@ -5,12 +5,12 @@ import { useState } from "react";
 import { Icon } from "~/components/assets";
 import { SpriteIconId } from "~/config";
 
-import IconButton from "./icon-button";
+import { IconButton } from "./icon-button";
 
 /**
  * Renders an icon within a button.
  */
-const ClipboardButton = forwardRef<
+export const ClipboardButton = forwardRef<
   HTMLButtonElement,
   {
     value?: string;
@@ -78,5 +78,3 @@ const ClipboardButton = forwardRef<
     </IconButton>
   );
 });
-
-export default ClipboardButton;

packages/web/components/buttons/icon-button.tsx

@@ -11,7 +11,7 @@ import { Button } from "~/components/buttons/button";
 /**
  * Renders an icon within a button.
  */
-const IconButton = forwardRef<
+export const IconButton = forwardRef<
   HTMLButtonElement,
   {
     icon?: ReactNode;
@@ -41,5 +41,3 @@ const IconButton = forwardRef<
     </Button>
   );
 });
-
-export default IconButton;

packages/web/components/buttons/link-button.tsx

@@ -4,7 +4,7 @@ import { ReactElement } from "react";
 
 import { Button } from "~/components/ui/button";
 
-export default function LinkButton({
+export function LinkButton({
   label,
   icon,
   ariaLabel,

packages/web/components/cards/my-position/expanded.tsx

@@ -41,11 +41,17 @@ import { formatPretty, getPriceExtendedFormatOptions } from "~/utils/formatter";
 import { RouterOutputs } from "~/utils/trpc";
 
 const ConcentratedLiquidityDepthChart = dynamic(
-  () => import("~/components/chart/concentrated-liquidity-depth"),
+  () =>
+    import("~/components/chart/concentrated-liquidity-depth").then(
+      (module) => module.ConcentratedLiquidityDepthChart
+    ),
   { ssr: false }
 );
 const HistoricalPriceChart = dynamic(
-  () => import("~/components/chart/price-historical"),
+  () =>
+    import("~/components/chart/price-historical").then(
+      (module) => module.HistoricalPriceChart
+    ),
   { ssr: false }
 );
 

packages/web/components/cards/my-position/index.tsx

@@ -7,7 +7,7 @@ import { FunctionComponent, ReactNode, useState } from "react";
 import { Icon, PoolAssetsIcon, PoolAssetsName } from "~/components/assets";
 import { MyPositionCardExpandedSection } from "~/components/cards/my-position/expanded";
 import { MyPositionStatus } from "~/components/cards/my-position/status";
-import SkeletonLoader from "~/components/loaders/skeleton-loader";
+import { SkeletonLoader } from "~/components/loaders/skeleton-loader";
 import { EventName } from "~/config";
 import { useFeatureFlags, useTranslation } from "~/hooks";
 import { useAmplitudeAnalytics } from "~/hooks";

packages/web/components/cards/validator-squad-card.tsx

@@ -172,5 +172,3 @@ const AvatarIcon: React.FC<{ extraValidators?: number }> = ({
     </div>
   );
 };
-
-export default AvatarIcon;

packages/web/components/chart/concentrated-liquidity-depth.tsx

@@ -19,7 +19,7 @@ export type DepthData = {
   depth: number;
 };
 
-const ConcentratedLiquidityDepthChart: FunctionComponent<{
+export const ConcentratedLiquidityDepthChart: FunctionComponent<{
   min?: number;
   max?: number;
   yRange: [number, number];
@@ -252,6 +252,3 @@ const DragContainer: FunctionComponent<{
     />
   </Annotation>
 );
-
-// needed for next/dynamic to avoid including visx in main bundle
-export default ConcentratedLiquidityDepthChart;

packages/web/components/chart/pool-composition.tsx

@@ -2,7 +2,7 @@ import { CoinPretty } from "@keplr-wallet/unit";
 import Image from "next/image";
 import { FunctionComponent } from "react";
 
-const PoolComposition: FunctionComponent<{
+export const PoolComposition: FunctionComponent<{
   assets: CoinPretty[];
 }> = ({ assets }) => {
   return (
@@ -28,5 +28,3 @@ const PoolComposition: FunctionComponent<{
     </ul>
   );
 };
-
-export default PoolComposition;

packages/web/components/chart/price-historical-v2.tsx

@@ -20,7 +20,7 @@ const seriesOpt: DeepPartial<AreaSeriesOptions> = {
   crosshairMarkerRadius: 8,
 };
 
-const HistoricalPriceChartV2: FunctionComponent<{
+export const HistoricalPriceChartV2: FunctionComponent<{
   data: { close: number; time: number }[];
   onPointerHover?: (price: number) => void;
   onPointerOut?: () => void;
@@ -50,5 +50,3 @@ const HistoricalPriceChartV2: FunctionComponent<{
     />
   );
 });
-
-export default HistoricalPriceChartV2;

packages/web/components/chart/price-historical.tsx

@@ -21,7 +21,7 @@ import { observer } from "mobx-react-lite";
 import React, { FunctionComponent, memo, useCallback, useMemo } from "react";
 
 import { Icon } from "~/components/assets";
-import SkeletonLoader from "~/components/loaders/skeleton-loader";
+import { SkeletonLoader } from "~/components/loaders/skeleton-loader";
 import { ChartButton } from "~/components/ui/button";
 import { type PriceRange, useTranslation } from "~/hooks";
 import { theme } from "~/tailwind.config";
@@ -33,7 +33,7 @@ import {
 } from "~/utils/formatter";
 import { getDecimalCount } from "~/utils/number";
 
-const HistoricalPriceChart: FunctionComponent<{
+export const HistoricalPriceChart: FunctionComponent<{
   data: { close: number; time: number }[];
   margin?: Partial<Margin>;
   annotations: Dec[];
@@ -246,8 +246,6 @@ const HistoricalPriceChart: FunctionComponent<{
   )
 );
 
-export default HistoricalPriceChart;
-
 export const PriceChartHeader: FunctionComponent<{
   historicalRange: PriceRange;
   setHistoricalRange: (pr: PriceRange) => void;

packages/web/components/client-only.tsx

@@ -1,6 +1,8 @@
 import { PropsWithChildren, useEffect, useState } from "react";
 
-const ClientOnly = (props: PropsWithChildren<{ className?: string }>) => {
+export const ClientOnly = (
+  props: PropsWithChildren<{ className?: string }>
+) => {
   const [hasMounted, setHasMounted] = useState(false);
 
   useEffect(() => {
@@ -13,5 +15,3 @@ const ClientOnly = (props: PropsWithChildren<{ className?: string }>) => {
 
   return <div {...props} />;
 };
-
-export default ClientOnly;