thirdweb 5.115.1 → 5.115.3-nightly-b0eccf365a7521ec882fca9e680837c84147041e-20251205000343

package/dist/types/react/web/ui/Bridge/swap-widget/SwapWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwapWidget.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/SwapWidget.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAGhF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAC;AAErE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAWvF,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgDG;IACH,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE;YACT,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,CAAC;IACF;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE;QACjB,KAAK,EAAE,iBAAiB,CAAC;QACzB,QAAQ,EAAE,qBAAqB,EAAE,CAAC;KACnC,KAAK,IAAI,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC3D;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,2CAoBhD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACzC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,GAAG,SAAS,CAAC;IACxC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,2CAcA"}
+{"version":3,"file":"SwapWidget.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/SwapWidget.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAGhF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAC;AAErE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAUvF,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgDG;IACH,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE;YACT,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,CAAC;IACF;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE;QACjB,KAAK,EAAE,iBAAiB,CAAC;QACzB,QAAQ,EAAE,qBAAqB,EAAE,CAAC;KACnC,KAAK,IAAI,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC3D;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,2CAoBhD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACzC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,GAAG,SAAS,CAAC;IACxC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,2CAcA"}

package/dist/types/react/web/ui/Bridge/swap-widget/select-token-ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-token-ui.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/select-token-ui.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAsBtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AASnE;;GAEG;AACH,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,cAAc,GAAG,SAAS,CAAC;IAC1C,gBAAgB,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAChD,CAAC;AAYF;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,kBAAkB,2CAoFpD"}
+{"version":3,"file":"select-token-ui.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/select-token-ui.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAwBtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AASnE;;GAEG;AACH,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,cAAc,GAAG,SAAS,CAAC;IAC1C,gBAAgB,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAChD,CAAC;AAWF;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,kBAAkB,2CA2EpD"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.115.1";
+export declare const version = "5.115.3-nightly-b0eccf365a7521ec882fca9e680837c84147041e-20251205000343";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,YAAY,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,4EAA4E,CAAC"}

package/package.json

@@ -399,7 +399,7 @@
     }
   },
   "typings": "./dist/types/exports/thirdweb.d.ts",
-  "version": "5.115.1",
+  "version": "5.115.3-nightly-b0eccf365a7521ec882fca9e680837c84147041e-20251205000343",
   "scripts": {
     "bench": "vitest -c ./test/vitest.config.ts bench",
     "bench:compare": "bun run ./benchmarks/run.ts",

package/src/react/web/ui/Bridge/swap-widget/SwapWidget.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { trackPayEvent } from "../../../../../analytics/track/pay.js";
 import type { Buy, Sell } from "../../../../../bridge/index.js";
 import type { TokenWithPrices } from "../../../../../bridge/types/Token.js";
@@ -16,7 +16,6 @@ import { webWindowAdapter } from "../../../adapters/WindowAdapter.js";
 import { EmbedContainer } from "../../ConnectWallet/Modal/ConnectEmbed.js";
 import { DynamicHeight } from "../../components/DynamicHeight.js";
 import { ErrorBanner } from "../ErrorBanner.js";
-import { PaymentDetails } from "../payment-details/PaymentDetails.js";
 import { SuccessScreen } from "../payment-success/SuccessScreen.js";
 import { StepRunner } from "../StepRunner.js";
 import { useActiveWalletInfo } from "./hooks.js";
@@ -364,19 +363,6 @@ function SwapWidgetContent(
   // preload requests
   useBridgeChains(props.client);
 
-  const handleError = useCallback(
-    (error: Error, quote: SwapPreparedQuote) => {
-      console.error(error);
-      props.onError?.(error, quote);
-      setScreen({
-        id: "error",
-        preparedQuote: quote,
-        error,
-      });
-    },
-    [props.onError],
-  );
-
   // if wallet suddenly disconnects, show screen 1
   if (screen.id === "1:swap-ui" || !activeWalletInfo) {
     return (
@@ -399,19 +385,8 @@ function SwapWidgetContent(
         amountSelection={amountSelection}
         setAmountSelection={setAmountSelection}
         onSwap={(data) => {
-          trackPayEvent({
-            chainId: data.result.intent.originChainId,
-            client: props.client,
-            event: "payment_details",
-            fromToken: data.result.intent.originTokenAddress,
-            toChainId: data.result.intent.destinationChainId,
-            toToken: data.result.intent.destinationTokenAddress,
-            walletAddress:
-              activeWalletInfo?.activeWallet?.getAccount()?.address,
-            walletType: activeWalletInfo?.activeWallet?.id,
-          });
           setScreen({
-            id: "2:preview",
+            id: "3:execute",
             buyToken: data.buyToken,
             sellToken: data.sellToken,
             sellTokenBalance: data.sellTokenBalance,
@@ -425,43 +400,6 @@ function SwapWidgetContent(
     );
   }
 
-  if (screen.id === "2:preview") {
-    return (
-      <PaymentDetails
-        metadata={{
-          title: "Review Swap",
-          description: undefined,
-        }}
-        confirmButtonLabel="Swap"
-        client={props.client}
-        onBack={() => {
-          setScreen({ id: "1:swap-ui" });
-        }}
-        onConfirm={() => {
-          setScreen({
-            ...screen,
-            id: "3:execute",
-          });
-        }}
-        onError={(error) => handleError(error, screen.preparedQuote)}
-        paymentMethod={{
-          quote: screen.quote,
-          type: "wallet",
-          payerWallet: activeWalletInfo.activeWallet,
-          balance: screen.sellTokenBalance,
-          originToken: screen.sellToken,
-          action: screen.mode,
-          hasEnoughBalance: true,
-        }}
-        preparedQuote={screen.preparedQuote}
-        currency={props.currency}
-        modeInfo={{
-          mode: "fund_wallet",
-        }}
-      />
-    );
-  }
-
   if (screen.id === "3:execute") {
     return (
       <StepRunner
@@ -472,8 +410,7 @@ function SwapWidgetContent(
         onBack={() => {
           setScreen({
             ...screen,
-            id: "2:preview",
-            sellTokenBalance: screen.sellTokenBalance,
+            id: "1:swap-ui",
           });
         }}
         onCancel={() => props.onCancel?.(screen.preparedQuote)}

package/src/react/web/ui/Bridge/swap-widget/select-token-ui.tsx

@@ -10,6 +10,8 @@ import {
   radius,
   spacing,
 } from "../../../../core/design-system/index.js";
+import { CoinsIcon } from "../../ConnectWallet/icons/CoinsIcon.js";
+import { WalletDotIcon } from "../../ConnectWallet/icons/WalletDotIcon.js";
 import { Container, noScrollBar } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
 import { Img } from "../../components/Img.js";
@@ -50,8 +52,7 @@ function findChain(chains: BridgeChain[], activeChainId: number | undefined) {
   return chains.find((chain) => chain.chainId === activeChainId);
 }
 
-const ALL_TOKENS_LIMIT = 100;
-const OWNED_TOKENS_LIMIT = 50;
+const INITIAL_LIMIT = 100;
 
 /**
  * @internal
@@ -60,8 +61,12 @@ export function SelectToken(props: SelectTokenUIProps) {
   const chainQuery = useBridgeChains(props.client);
   const [search, _setSearch] = useState("");
   const debouncedSearch = useDebouncedValue(search, 500);
-  const [allTokensLimit, setAllTokensLimit] = useState(ALL_TOKENS_LIMIT);
-  const [ownedTokensLimit, setOwnedTokensLimit] = useState(OWNED_TOKENS_LIMIT);
+  const [limit, setLimit] = useState(INITIAL_LIMIT);
+
+  const setSearch = useCallback((search: string) => {
+    _setSearch(search);
+    setLimit(INITIAL_LIMIT);
+  }, []);
 
   const [_selectedChain, setSelectedChain] = useState<BridgeChain | undefined>(
     undefined,
@@ -79,7 +84,7 @@ export function SelectToken(props: SelectTokenUIProps) {
     client: props.client,
     chainId: selectedChain?.chainId,
     search: debouncedSearch,
-    limit: allTokensLimit,
+    limit,
     offset: 0,
   });
 
@@ -87,7 +92,7 @@ export function SelectToken(props: SelectTokenUIProps) {
   const ownedTokensQuery = useTokenBalances({
     clientId: props.client.clientId,
     chainId: selectedChain?.chainId,
-    limit: ownedTokensLimit,
+    limit,
     page: 1,
     walletAddress: props.activeWalletInfo?.activeAccount.address,
   });
@@ -104,62 +109,43 @@ export function SelectToken(props: SelectTokenUIProps) {
     });
   }, [ownedTokensQuery.data?.tokens, debouncedSearch]);
 
-  const setSearch = useCallback((search: string) => {
-    _setSearch(search);
-    setAllTokensLimit(ALL_TOKENS_LIMIT);
-    setOwnedTokensLimit(OWNED_TOKENS_LIMIT);
-  }, []);
+  const isFetching = tokensQuery.isFetching || ownedTokensQuery.isFetching;
 
   return (
     <SelectTokenUI
       {...props}
-      ownedTokens={{
-        data: filteredOwnedTokens || [],
-        isFetching: ownedTokensQuery.isFetching,
-        showMore: ownedTokensQuery.data?.pagination.hasMore
-          ? () => {
-              setOwnedTokensLimit(ownedTokensLimit + OWNED_TOKENS_LIMIT);
-            }
-          : undefined,
-      }}
-      allTokens={{
-        data: tokensQuery.data || [],
-        isFetching: tokensQuery.isFetching,
-        showMore:
-          tokensQuery.data?.length === allTokensLimit
-            ? () => {
-                setAllTokensLimit(allTokensLimit + ALL_TOKENS_LIMIT);
-              }
-            : undefined,
-      }}
+      ownedTokens={filteredOwnedTokens || []}
+      allTokens={tokensQuery.data || []}
+      isFetching={isFetching}
       selectedChain={selectedChain}
       setSelectedChain={setSelectedChain}
       search={search}
       setSearch={setSearch}
       selectedToken={props.selectedToken}
       setSelectedToken={props.setSelectedToken}
+      showMore={
+        tokensQuery.data?.length === limit
+          ? () => {
+              setLimit(limit + INITIAL_LIMIT);
+            }
+          : undefined
+      }
     />
   );
 }
 
 function SelectTokenUI(
   props: SelectTokenUIProps & {
-    allTokens: {
-      data: Token[];
-      isFetching: boolean;
-      showMore: (() => void) | undefined;
-    };
-    ownedTokens: {
-      data: TokenBalance[];
-      isFetching: boolean;
-      showMore: (() => void) | undefined;
-    };
+    ownedTokens: TokenBalance[];
+    allTokens: Token[];
+    isFetching: boolean;
     selectedChain: BridgeChain | undefined;
     setSelectedChain: (chain: BridgeChain) => void;
     search: string;
     setSearch: (search: string) => void;
     selectedToken: TokenSelection | undefined;
     setSelectedToken: (token: TokenSelection) => void;
+    showMore: (() => void) | undefined;
   },
 ) {
   const isMobile = useIsMobile();
@@ -169,7 +155,7 @@ function SelectTokenUI(
 
   // show tokens with icons first
   const sortedOwnedTokens = useMemo(() => {
-    return props.ownedTokens.data.sort((a, b) => {
+    return props.ownedTokens.sort((a, b) => {
       if (a.icon_uri && !b.icon_uri) {
         return -1;
       }
@@ -178,11 +164,23 @@ function SelectTokenUI(
       }
       return 0;
     });
-  }, [props.ownedTokens.data]);
+  }, [props.ownedTokens]);
+
+  const otherTokens = useMemo(() => {
+    const ownedTokenSet = new Set(
+      sortedOwnedTokens.map((t) =>
+        `${t.token_address}-${t.chain_id}`.toLowerCase(),
+      ),
+    );
+    return props.allTokens.filter(
+      (token) =>
+        !ownedTokenSet.has(`${token.address}-${token.chainId}`.toLowerCase()),
+    );
+  }, [props.allTokens, sortedOwnedTokens]);
 
   // show tokens with icons first
-  const sortedAllTokens = useMemo(() => {
-    return props.allTokens.data.sort((a, b) => {
+  const sortedOtherTokens = useMemo(() => {
+    return otherTokens.sort((a, b) => {
       if (a.iconUri && !b.iconUri) {
         return -1;
       }
@@ -191,7 +189,7 @@ function SelectTokenUI(
       }
       return 0;
     });
-  }, [props.allTokens.data]);
+  }, [otherTokens]);
 
   // desktop
   if (!isMobile) {
@@ -223,20 +221,15 @@ function SelectTokenUI(
             }}
             isMobile={false}
             selectedToken={props.selectedToken}
-            ownedTokens={{
-              ...props.ownedTokens,
-              data: sortedOwnedTokens,
-            }}
-            allTokens={{
-              ...props.allTokens,
-              data: sortedAllTokens,
-            }}
+            isFetching={props.isFetching}
+            ownedTokens={props.ownedTokens}
+            otherTokens={sortedOtherTokens}
+            showMore={props.showMore}
             selectedChain={props.selectedChain}
             onSelectChain={() => setScreen("select-chain")}
             client={props.client}
             search={props.search}
             setSearch={props.setSearch}
-            isWalletConnected={props.activeWalletInfo !== undefined}
           />
         </Container>
       </Container>
@@ -246,20 +239,15 @@ function SelectTokenUI(
   if (screen === "select-token") {
     return (
       <TokenSelectionScreen
-        isWalletConnected={props.activeWalletInfo !== undefined}
         onSelectToken={(token) => {
           props.setSelectedToken(token);
           props.onClose();
         }}
         selectedToken={props.selectedToken}
-        ownedTokens={{
-          ...props.ownedTokens,
-          data: sortedOwnedTokens,
-        }}
-        allTokens={{
-          ...props.allTokens,
-          data: sortedAllTokens,
-        }}
+        isFetching={props.isFetching}
+        ownedTokens={props.ownedTokens}
+        otherTokens={sortedOtherTokens}
+        showMore={props.showMore}
         selectedChain={props.selectedChain}
         isMobile={true}
         onSelectChain={() => setScreen("select-chain")}
@@ -447,36 +435,17 @@ function TokenSelectionScreen(props: {
   client: ThirdwebClient;
   search: string;
   setSearch: (search: string) => void;
+  isFetching: boolean;
+  ownedTokens: TokenBalance[];
+  otherTokens: Token[];
+  showMore: (() => void) | undefined;
   selectedToken: TokenSelection | undefined;
   onSelectToken: (token: TokenSelection) => void;
-  isWalletConnected: boolean;
-  allTokens: {
-    data: Token[];
-    isFetching: boolean;
-    showMore: (() => void) | undefined;
-  };
-  ownedTokens: {
-    data: TokenBalance[];
-    isFetching: boolean;
-    showMore: (() => void) | undefined;
-  };
 }) {
-  const noAllTokensFound =
-    !props.allTokens.isFetching && props.allTokens.data.length === 0;
-
-  const noOwnedTokensFound =
-    !props.ownedTokens.isFetching && props.ownedTokens.data.length === 0;
-
-  const [activeTab, setActiveTab] = useState<"owned" | "all">("all");
-  const showSkeletons =
-    (props.allTokens.isFetching && activeTab === "all") ||
-    (props.ownedTokens.isFetching && activeTab === "owned");
-
-  const showNoTokensFound =
-    (activeTab === "all" && noAllTokensFound) ||
-    (activeTab === "owned" && noOwnedTokensFound);
-
-  const theme = useCustomTheme();
+  const noTokensFound =
+    !props.isFetching &&
+    props.otherTokens.length === 0 &&
+    props.ownedTokens.length === 0;
 
   return (
     <Container fullHeight flex="column">
@@ -534,28 +503,7 @@ function TokenSelectionScreen(props: {
             />
           </Container>
 
-          <Spacer y="sm" />
-
-          {/* tabs */}
-          {props.isWalletConnected && (
-            <Container
-              flex="row"
-              gap="xs"
-              px="md"
-              style={{ borderBottom: `1px solid ${theme.colors.borderColor}` }}
-            >
-              <TabButton
-                isSelected={activeTab === "all"}
-                onSelect={() => setActiveTab("all")}
-                label="All Tokens"
-              />
-              <TabButton
-                isSelected={activeTab === "owned"}
-                onSelect={() => setActiveTab("owned")}
-                label="Your Tokens"
-              />
-            </Container>
-          )}
+          <Spacer y="xs" />
 
           <Container
             pb="md"
@@ -571,17 +519,36 @@ function TokenSelectionScreen(props: {
               paddingBottom: spacing.md,
             }}
           >
-            {props.isWalletConnected && <Spacer y="xxs" />}
-
-            {showSkeletons &&
+            {props.isFetching &&
               new Array(20).fill(0).map((_, i) => (
                 // biome-ignore lint/suspicious/noArrayIndexKey: ok
                 <TokenButtonSkeleton key={i} />
               ))}
 
-            {activeTab === "owned" &&
-              !props.ownedTokens.isFetching &&
-              props.ownedTokens.data.map((token) => (
+            {!props.isFetching && props.ownedTokens.length > 0 && (
+              <Container
+                px="xs"
+                py="xs"
+                flex="row"
+                gap="xs"
+                center="y"
+                color="secondaryText"
+              >
+                <WalletDotIcon size="14" />
+                <Text
+                  size="sm"
+                  color="secondaryText"
+                  style={{
+                    overflow: "unset",
+                  }}
+                >
+                  Your Tokens
+                </Text>
+              </Container>
+            )}
+
+            {!props.isFetching &&
+              props.ownedTokens.map((token) => (
                 <TokenButton
                   key={token.token_address}
                   token={token}
@@ -596,9 +563,33 @@ function TokenSelectionScreen(props: {
                 />
               ))}
 
-            {activeTab === "all" &&
-              !props.allTokens.isFetching &&
-              props.allTokens.data.map((token) => (
+            {!props.isFetching && props.ownedTokens.length > 0 && (
+              <Container
+                px="xs"
+                py="xs"
+                flex="row"
+                gap="xs"
+                center="y"
+                color="secondaryText"
+                style={{
+                  marginTop: spacing.sm,
+                }}
+              >
+                <CoinsIcon size="14" />
+                <Text
+                  size="sm"
+                  color="secondaryText"
+                  style={{
+                    overflow: "unset",
+                  }}
+                >
+                  Other Tokens
+                </Text>
+              </Container>
+            )}
+
+            {!props.isFetching &&
+              props.otherTokens.map((token) => (
                 <TokenButton
                   key={token.address}
                   token={token}
@@ -613,31 +604,19 @@ function TokenSelectionScreen(props: {
                 />
               ))}
 
-            {activeTab === "all" && props.allTokens.showMore && (
-              <Button
-                variant="secondary"
-                fullWidth
-                onClick={() => {
-                  props.allTokens.showMore?.();
-                }}
-              >
-                Load More
-              </Button>
-            )}
-
-            {activeTab === "owned" && props.ownedTokens.showMore && (
+            {props.showMore && (
               <Button
                 variant="secondary"
                 fullWidth
                 onClick={() => {
-                  props.ownedTokens.showMore?.();
+                  props.showMore?.();
                 }}
               >
                 Load More
               </Button>
             )}
 
-            {showNoTokensFound && (
+            {noTokensFound && (
               <div
                 style={{
                   flex: 1,
@@ -669,45 +648,3 @@ const LeftContainer = /* @__PURE__ */ StyledDiv((_) => {
     position: "relative",
   };
 });
-
-function TabButton(props: {
-  isSelected: boolean;
-  onSelect: () => void;
-  label: string;
-}) {
-  const theme = useCustomTheme();
-  return (
-    <div
-      style={{
-        paddingBottom: "4px",
-        position: "relative",
-      }}
-    >
-      <Button
-        variant="ghost-solid"
-        onClick={props.onSelect}
-        style={{
-          fontSize: fontSize.sm,
-          padding: `10px ${spacing.xs}`,
-          color: props.isSelected
-            ? theme.colors.primaryText
-            : theme.colors.secondaryText,
-        }}
-      >
-        {props.label}
-      </Button>
-
-      {props.isSelected && (
-        <div
-          style={{
-            position: "absolute",
-            left: 0,
-            right: 0,
-            bottom: "-1.5px",
-            borderBottom: `2px solid ${theme.colors.primaryText}`,
-          }}
-        ></div>
-      )}
-    </div>
-  );
-}

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.115.1";
+export const version = "5.115.3-nightly-b0eccf365a7521ec882fca9e680837c84147041e-20251205000343";