Merge branch 'master' into aptos/contracts

apps/ui/package.json

@@ -51,15 +51,15 @@
     "@solana/spl-token": "^0.3.5",
     "@solana/web3.js": "^1.62.0",
     "@swim-io/aptos": "workspace:^",
-    "@swim-io/core": "^0.39.0",
-    "@swim-io/evm": "^0.39.0",
-    "@swim-io/evm-contracts": "^0.39.0",
-    "@swim-io/pool-math": "^0.39.0",
-    "@swim-io/solana": "^0.39.0",
-    "@swim-io/solana-contracts": "^0.39.0",
-    "@swim-io/token-projects": "workspace:^",
-    "@swim-io/utils": "^0.39.0",
-    "@swim-io/wormhole": "^0.39.0",
+    "@swim-io/core": "^0.40.0",
+    "@swim-io/evm": "^0.40.0",
+    "@swim-io/evm-contracts": "^0.40.0",
+    "@swim-io/pool-math": "^0.40.0",
+    "@swim-io/solana": "^0.40.0",
+    "@swim-io/solana-contracts": "^0.40.0",
+    "@swim-io/token-projects": "^0.40.0",
+    "@swim-io/utils": "^0.40.0",
+    "@swim-io/wormhole": "^0.40.0",
     "bn.js": "^5.2.1",
     "classnames": "^2.3.1",
     "decimal.js": "^10.3.1",

apps/ui/src/components/AddForm.tsx

@@ -37,9 +37,9 @@ import {
   useMultipleUserBalances,
   usePool,
   usePoolMath,
-  useSplTokenAccountsQuery,
   useUserBalanceAmount,
   useUserNativeBalances,
+  useUserSolanaTokenAccountsQuery,
   useWallets,
 } from "../hooks";
 import {
@@ -206,7 +206,7 @@ export const AddForm = ({
     poolTokens,
     poolSpec.isLegacyPool ? undefined : poolSpec.ecosystem,
   );
-  const { data: splTokenAccounts = null } = useSplTokenAccountsQuery();
+  const { data: splTokenAccounts = null } = useUserSolanaTokenAccountsQuery();
   const startNewInteraction = useStartNewInteraction(() => {
     setFormInputAmounts(poolTokens.map(() => "0"));
   });

apps/ui/src/components/RecentInteractions.tsx

@@ -9,7 +9,7 @@ import { Fragment, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 
 import { useEnvironment, useInteractionState } from "../core/store";
-import { useSplTokenAccountsQuery, useWallets } from "../hooks";
+import { useUserSolanaTokenAccountsQuery, useWallets } from "../hooks";
 import { isEveryAddressConnected } from "../models";
 import type { InteractionType } from "../models";
 
@@ -34,7 +34,8 @@ export const RecentInteractions = ({
     loadInteractionStatesFromIdb(env).catch(console.error);
   }, [env, loadInteractionStatesFromIdb]);
 
-  const { isSuccess: didLoadSplTokenAccounts } = useSplTokenAccountsQuery();
+  const { isSuccess: didLoadSplTokenAccounts } =
+    useUserSolanaTokenAccountsQuery();
   const wallets = useWallets();
   // Don’t display current interaction
   const { recentInteractionId, interactionStates } = useInteractionState();

apps/ui/src/components/RecentInteractionsV2.tsx

@@ -12,7 +12,6 @@ import { useWallets } from "../hooks";
 import { isEveryAddressConnected } from "../models";
 import type { InteractionType } from "../models";
 
-import { MultiConnectButton } from "./ConnectButton";
 import { ConnectedWallets } from "./ConnectedWallets";
 import { InteractionStateComponentV2 } from "./molecules/InteractionStateComponentV2";
 
@@ -55,7 +54,6 @@ export const RecentInteractionsV2 = ({
       <EuiAccordion
         id="recent-interactions"
         buttonContent={`${title} (${recentInteractions.length})`}
-        extraAction={<MultiConnectButton size="s" fullWidth />}
       >
         <EuiSpacer />
         <EuiPanel color="subdued">

apps/ui/src/components/RemoveForm.tsx

@@ -40,9 +40,9 @@ import {
   usePoolMath,
   useRemoveFeesEstimationQuery,
   useRemoveFeesEstimationQueryV2,
-  useSplTokenAccountsQuery,
   useUserLpBalances,
   useUserNativeBalances,
+  useUserSolanaTokenAccountsQuery,
   useWallets,
 } from "../hooks";
 import {
@@ -93,7 +93,7 @@ export const RemoveForm = ({
     state: poolState,
   } = usePool(poolSpec.id);
   const poolMath = usePoolMath(poolSpec.id);
-  const { data: splTokenAccounts = null } = useSplTokenAccountsQuery();
+  const { data: splTokenAccounts = null } = useUserSolanaTokenAccountsQuery();
   const startNewInteractionV1 = useStartNewInteraction(() => {
     if (method === RemoveMethod.ExactOutput) {
       setFormOutputAmounts(formOutputAmounts.map(() => "0"));

apps/ui/src/components/SwapForm/SwapForm.test.tsx

@@ -14,12 +14,12 @@ import {
   useErc20BalanceQuery,
   useGetSwapFormErrors,
   useSolanaClient,
-  useSolanaLiquidityQueries,
-  useSplTokenAccountsQuery,
-  useSplUserBalance,
+  useSolanaTokenAccountQueries,
   useStartNewInteraction,
   useSwapFeesEstimationQuery,
   useUserNativeBalances,
+  useUserSolanaTokenAccountsQuery,
+  useUserSolanaTokenBalance,
 } from "../../hooks";
 import { mockOf, renderWithAppContext } from "../../testUtils";
 
@@ -37,9 +37,9 @@ jest.mock(
 
 jest.mock("../../hooks/solana", () => ({
   ...jest.requireActual("../../hooks/solana"),
-  useSplTokenAccountsQuery: jest.fn(),
-  useSplUserBalance: jest.fn(),
-  useSolanaLiquidityQueries: jest.fn(),
+  useUserSolanaTokenAccountsQuery: jest.fn(),
+  useUserSolanaTokenBalance: jest.fn(),
+  useSolanaTokenAccountQueries: jest.fn(),
 }));
 
 jest.mock("../../hooks/solana/useSolanaClient", () => ({
@@ -66,13 +66,15 @@ jest.mock("../../hooks", () => ({
 
 const useGetSwapFormErrorsMock = mockOf(useGetSwapFormErrors);
 const useSolanaClientMock = mockOf(useSolanaClient);
-const useSplTokenAccountsQueryMock = mockOf(useSplTokenAccountsQuery);
+const useUserSolanaTokenAccountsQueryMock = mockOf(
+  useUserSolanaTokenAccountsQuery,
+);
 const useStartNewInteractionMock = mockOf(useStartNewInteraction);
 const useSwapFeesEstimationQueryMock = mockOf(useSwapFeesEstimationQuery);
 const useErc20BalanceQueryMock = mockOf(useErc20BalanceQuery);
 const useUserNativeBalancesMock = mockOf(useUserNativeBalances);
-const useSplUserBalanceMock = mockOf(useSplUserBalance);
-const useSolanaLiquidityQueriesMock = mockOf(useSolanaLiquidityQueries);
+const useUserSolanaTokenBalanceMock = mockOf(useUserSolanaTokenBalance);
+const useSolanaTokenAccountQueriesMock = mockOf(useSolanaTokenAccountQueries);
 
 const findFromTokenButton = () => screen.queryAllByRole("button")[0];
 const findToTokenButton = () => screen.queryAllByRole("button")[3];
@@ -86,7 +88,7 @@ describe("SwapForm", () => {
         },
       } as Partial<CustomConnection> as unknown as CustomConnection,
     });
-    useSplTokenAccountsQueryMock.mockReturnValue({
+    useUserSolanaTokenAccountsQueryMock.mockReturnValue({
       data: [],
     });
 
@@ -107,8 +109,8 @@ describe("SwapForm", () => {
     useSwapFeesEstimationQueryMock.mockReturnValue(null);
     useGetSwapFormErrorsMock.mockReturnValue(() => []);
     useErc20BalanceQueryMock.mockReturnValue({ data: zero });
-    useSplUserBalanceMock.mockReturnValue(zero);
-    useSolanaLiquidityQueriesMock.mockReturnValue([
+    useUserSolanaTokenBalanceMock.mockReturnValue(zero);
+    useSolanaTokenAccountQueriesMock.mockReturnValue([
       { data: [] },
     ] as unknown as readonly UseQueryResult<readonly TokenAccount[], Error>[]);
   });

apps/ui/src/components/SwapForm/SwapForm.tsx

@@ -24,12 +24,12 @@ import {
   useIsLargeSwap,
   usePoolMaths,
   usePools,
-  useSplTokenAccountsQuery,
   useSwapFeesEstimationQuery,
   useSwapOutputAmountEstimate,
   useSwapTokensContext,
   useUserBalanceAmount,
   useUserNativeBalances,
+  useUserSolanaTokenAccountsQuery,
 } from "../../hooks";
 import {
   useHasActiveInteraction,
@@ -59,7 +59,7 @@ export const SwapForm = ({ maxSlippageFraction }: Props): ReactElement => {
   const { t } = useTranslation();
   const config = useEnvironment(selectConfig, shallow);
   const { notify } = useNotification();
-  const { data: splTokenAccounts = null } = useSplTokenAccountsQuery();
+  const { data: splTokenAccounts = null } = useUserSolanaTokenAccountsQuery();
   const startNewInteraction = useStartNewInteraction(() => {
     setFormInputAmount("");
   });

apps/ui/src/components/TokenSearchModal.tsx

@@ -16,7 +16,7 @@ import { useTranslation } from "react-i18next";
 import shallow from "zustand/shallow.js";
 
 import type { EcosystemId, TokenConfig } from "../config";
-import { ECOSYSTEM_LIST, isEcosystemEnabled } from "../config";
+import { ECOSYSTEM_LIST, isEcosystemEnabled, isSwimUsd } from "../config";
 import { selectConfig } from "../core/selectors";
 import { useEnvironment } from "../core/store";
 import { useUserBalanceAmount } from "../hooks";
@@ -40,6 +40,7 @@ interface Props {
   readonly handleSelectEcosystem: (ecosystemId: EcosystemId) => void;
   readonly tokenOptionIds: readonly string[];
   readonly selectedEcosystemId: EcosystemId;
+  readonly showSwimUsd?: boolean;
 }
 
 interface TokenProps {
@@ -63,6 +64,7 @@ export const TokenSearchModal = ({
   handleSelectEcosystem,
   selectedEcosystemId,
   tokenOptionIds,
+  showSwimUsd = false,
 }: Props): ReactElement => {
   const { t } = useTranslation();
   const { tokens } = useEnvironment(selectConfig, shallow);
@@ -81,7 +83,8 @@ export const TokenSearchModal = ({
   const filteredTokens = tokens.filter(
     (token) =>
       tokenOptionIds.includes(token.id) &&
-      token.nativeEcosystemId === selectedEcosystemId,
+      (token.nativeEcosystemId === selectedEcosystemId ||
+        (showSwimUsd && isSwimUsd(token))),
   );
 
   const options = filteredTokens.map((token) => {