@jup-ag/plugin 1.0.0 → 1.0.2

package/dist/index.js

@@ -85,7 +85,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@jup-ag/plugin",
-      version: "1.0.0",
+      version: "1.0.2",
       private: false,
       license: "MIT",
       scripts: {
@@ -123,7 +123,7 @@ var require_package = __commonJS({
         "@jup-ag/wallet-adapter": "0.2.3",
         "@popperjs/core": "^2.11.8",
         "@solana/wallet-adapter-wallets": "0.19.33",
-        "@tanstack/react-query": "^4.36.1",
+        "@tanstack/react-query": "5.85.5",
         "bn.js": "5.2.1",
         clsx: "^2.1.1",
         "decimal.js": "10.4.3",
@@ -323,12 +323,15 @@ var packageJson = require_package();
 var bundleName = `plugin-${packageJson.version}`;
 var scriptDomain = (() => {
   var _a2;
+  if (!process.env.NEXT_PUBLIC_IS_PLUGIN_DEV) {
+    return null;
+  }
   if (typeof window === "undefined" || typeof document === "undefined") return "";
   const url = (_a2 = document.currentScript) == null ? void 0 : _a2.src;
   if (url) {
     return new URL(url).origin;
   }
-  return "";
+  return null;
 })() || "https://plugin.jup.ag";
 function loadRemote(id, href, type2) {
   return __async(this, null, function* () {
@@ -652,6 +655,8 @@ var USDC_MINT = new import_web3.PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZ
 var USDT_MINT = new import_web3.PublicKey("Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB");
 var JLP_MINT = new import_web3.PublicKey("27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4");
 var WRAPPED_SOL_MINT = new import_web3.PublicKey("So11111111111111111111111111111111111111112");
+var MINIMUM_SOL_BALANCE = 0.01;
+var MAX_INPUT_LIMIT = 1e14;
 var INITIAL_FORM_CONFIG = Object.freeze({
   simulateWalletPassthrough: false,
   defaultExplorer: "Solana Explorer",
@@ -1006,7 +1011,8 @@ var FormattedUltraQuoteResponse = (0, import_superstruct.type)({
   requestId: (0, import_superstruct.string)(),
   prioritizationFeeLamports: (0, import_superstruct.optional)((0, import_superstruct.number)()),
   feeBps: (0, import_superstruct.number)(),
-  router: (0, import_superstruct.string)()
+  router: (0, import_superstruct.string)(),
+  errorMessage: (0, import_superstruct.optional)((0, import_superstruct.string)())
 });
 
 // src/queries/useQuoteQuery.ts
@@ -1037,133 +1043,13 @@ var useQuoteQuery = (params, shouldRefetch = true) => {
     refetchInterval: shouldRefetch ? 5e3 : false,
     retry: 0,
     enabled: Number(amount) > 0,
-    keepPreviousData: Number(amount) > 0,
-    onError: (error) => {
-      console.error("useQuoteQuery", error);
-    }
+    gcTime: 0,
+    staleTime: 0
   });
 };
 
-// src/queries/useUltraSwapMutation.ts
-var import_wallet_adapter2 = require("@jup-ag/wallet-adapter");
-var import_react_query2 = require("@tanstack/react-query");
-var import_buffer = require("buffer");
-var import_web34 = require("@solana/web3.js");
-
-// src/entity/TransactionError.ts
-var TransactionError = class extends Error {
-  constructor(message, txid, code, programIds, serializedTx) {
-    super(message);
-    this.name = "TransactionError";
-    this.txid = txid;
-    this.code = code;
-    this.programIds = programIds;
-    this.serializedTx = serializedTx;
-  }
-};
-
-// src/queries/useUltraSwapMutation.ts
-var UltraSwapError = class extends Error {
-  constructor(message, type2, txid) {
-    super(message);
-    this.type = type2;
-    this.txid = txid;
-  }
-};
-function useUltraSwapMutation() {
-  const { wallet, signTransaction } = useWalletPassThrough();
-  return (0, import_react_query2.useMutation)({
-    mutationFn: (_0) => __async(this, [_0], function* ({
-      setTxStatus,
-      setLastSwapResult,
-      fromTokenInfo,
-      toTokenInfo,
-      quoteResponseMeta
-    }) {
-      const publicKey = wallet == null ? void 0 : wallet.adapter.publicKey;
-      if (!signTransaction || !publicKey) {
-        throw new UltraSwapError(
-          "Wallet not connected, or missing wallet functions",
-          "WALLET_SIGNING_FAILED" /* WALLET_SIGNING_FAILED */
-        );
-      }
-      setTxStatus({
-        txid: "",
-        status: "pending-approval"
-      });
-      const selectedQuote = quoteResponseMeta.original;
-      const { transaction, requestId } = selectedQuote;
-      if (!transaction) throw new Error("Missing transaction");
-      const based64tx = import_buffer.Buffer.from(transaction, "base64");
-      const versionedTransaction = import_web34.VersionedTransaction.deserialize(new Uint8Array(based64tx));
-      const signedTransaction = yield signTransaction(versionedTransaction);
-      const serializedTransaction = import_buffer.Buffer.from(signedTransaction.serialize()).toString("base64");
-      setTxStatus({
-        txid: "",
-        status: "sending"
-      });
-      const response = yield ultraSwapService.submitSwap(serializedTransaction, requestId);
-      const { signature, status } = response;
-      if (status === "Failed") {
-        throw new UltraSwapError(response.error, "FAILED" /* FAILED */, signature);
-      }
-      const { inputAmountResult, outputAmountResult } = response;
-      setTxStatus({
-        txid: signature,
-        status: "success"
-      });
-      setLastSwapResult({
-        swapResult: {
-          txid: signature,
-          inputAddress: new import_web34.PublicKey(fromTokenInfo.id),
-          outputAddress: new import_web34.PublicKey(toTokenInfo.id),
-          inputAmount: Number(inputAmountResult),
-          outputAmount: Number(outputAmountResult)
-        },
-        quoteReponse: quoteResponseMeta
-      });
-      return signature;
-    }),
-    onError: (error, variables) => __async(this, null, function* () {
-      const { setTxStatus, setLastSwapResult, quoteResponseMeta } = variables;
-      if (error instanceof import_wallet_adapter2.WalletSignTransactionError) {
-        const message = error.message || error.error || "Transaction cancelled";
-        setLastSwapResult({
-          swapResult: {
-            error: new TransactionError(message)
-          },
-          quoteReponse: quoteResponseMeta
-        });
-        return;
-      }
-      if (error instanceof Error) {
-        setLastSwapResult({
-          swapResult: {
-            error: new TransactionError(error.message)
-          },
-          quoteReponse: quoteResponseMeta
-        });
-        return;
-      }
-      if ("json" in error) {
-        const json = yield error.json();
-        setLastSwapResult({
-          swapResult: {
-            error: new TransactionError(json.error || "Unknown error")
-          },
-          quoteReponse: quoteResponseMeta
-        });
-        setTxStatus({
-          txid: json.txid || "",
-          status: "fail"
-        });
-      }
-    })
-  });
-}
-
 // src/hooks/useBalances.ts
-var import_react_query3 = require("@tanstack/react-query");
+var import_react_query2 = require("@tanstack/react-query");
 var import_react6 = require("react");
 var ULTRA_NATIVESOL_ID = "SOL";
 var WSOL_ID = WRAPPED_SOL_MINT.toString();
@@ -1184,13 +1070,13 @@ var useBalances = () => {
     if (!publicKey) return "";
     return publicKey.toString();
   }, [publicKey]);
-  return (0, import_react_query3.useQuery)({
+  return (0, import_react_query2.useQuery)({
     queryKey: ["ultra", "balances", address],
     queryFn: (_0) => __async(void 0, [_0], function* ({ signal }) {
       return yield ultraSwapService.getBalance(address, signal);
     }),
     enabled: !!address && getPluginInView(),
-    cacheTime: 2e4,
+    gcTime: 2e4,
     staleTime: 2e4,
     refetchOnWindowFocus: false,
     refetchIntervalInBackground: false,
@@ -1200,7 +1086,7 @@ var useBalances = () => {
 };
 
 // src/hooks/useAsset.ts
-var import_react_query4 = require("@tanstack/react-query");
+var import_react_query3 = require("@tanstack/react-query");
 
 // src/contexts/SearchService.ts
 var BASE_URL = "https://datapi.jup.ag";
@@ -1225,7 +1111,7 @@ var searchService = new SearchService();
 // src/hooks/useAsset.ts
 var ASSET_QUERY_KEY = ["search", "assets"];
 var useAsset = (mint) => {
-  return (0, import_react_query4.useQuery)({
+  return (0, import_react_query3.useQuery)({
     queryKey: [...ASSET_QUERY_KEY, mint],
     queryFn: () => searchService.search(mint),
     enabled: !!mint,
@@ -1256,7 +1142,7 @@ var SwapContextProvider = (props) => {
   const { displayMode, scriptDomain: scriptDomain2, formProps: originalFormProps, children, enableWalletPassthrough } = props;
   const { screen: screen2 } = useScreenState();
   const { wallet } = useWalletPassThrough();
-  const { refetch: refetchBalances } = useBalances();
+  const { data: balances, refetch: refetchBalances } = useBalances();
   const isToPairFocused = (0, import_react7.useRef)(false);
   const walletPublicKey = (0, import_react7.useMemo)(() => {
     var _a3;
@@ -1300,6 +1186,10 @@ var SwapContextProvider = (props) => {
     setupInitialAmount();
   }, [formProps.initialAmount, setupInitialAmount]);
   const debouncedForm = useDebounce(form, 250);
+  const debouncePending = (0, import_react7.useMemo)(
+    () => JSON.stringify(form) !== JSON.stringify(debouncedForm),
+    [form, debouncedForm]
+  );
   const amount = (0, import_react7.useMemo)(() => {
     if (!fromTokenInfo || !toTokenInfo) {
       return import_jsbi2.default.BigInt(0);
@@ -1341,6 +1231,11 @@ var SwapContextProvider = (props) => {
     // Stop refetching when transaction is in progress
     !txStatus
   );
+  const balance = (0, import_react7.useMemo)(() => {
+    var _a3;
+    if (!balances) return 0;
+    return ((_a3 = balances[form.fromMint]) == null ? void 0 : _a3.uiAmount) || 0;
+  }, [balances, form.fromMint]);
   (0, import_react7.useEffect)(() => {
     if (quoteError) {
       if (typeof quoteError === "string") {
@@ -1354,8 +1249,14 @@ var SwapContextProvider = (props) => {
       });
       return;
     }
+    if (form.fromValue && new import_decimal2.default(form.fromValue).gt(balance)) {
+      setErrors({
+        fromValue: { title: `Insufficient ${fromTokenInfo == null ? void 0 : fromTokenInfo.symbol}`, message: "" }
+      });
+      return;
+    }
     setErrors({});
-  }, [quoteError]);
+  }, [quoteError, balance, form.fromValue, fromTokenInfo]);
   const lastRefreshTimestamp = (0, import_react7.useMemo)(() => {
     if (loading) {
       return (/* @__PURE__ */ new Date()).getTime();
@@ -1394,29 +1295,6 @@ var SwapContextProvider = (props) => {
     });
   }, [form.fromValue, form.toValue, fromTokenInfo, quoteResponseMeta, toTokenInfo]);
   const [lastSwapResult, setLastSwapResult] = (0, import_react7.useState)(null);
-  const { mutateAsync: ultraSwapMutation } = useUltraSwapMutation();
-  const onSubmit = (0, import_react7.useCallback)(() => __async(void 0, null, function* () {
-    if (!walletPublicKey || !(wallet == null ? void 0 : wallet.adapter) || !quoteResponseMeta) {
-      return null;
-    }
-    setTxStatus({
-      txid: "",
-      status: "loading"
-    });
-    try {
-      if (!fromTokenInfo) throw new Error("Missing fromTokenInfo");
-      if (!toTokenInfo) throw new Error("Missing toTokenInfo");
-      yield ultraSwapMutation({
-        quoteResponseMeta,
-        fromTokenInfo,
-        toTokenInfo,
-        setTxStatus,
-        setLastSwapResult
-      });
-    } catch (error) {
-      console.log("Swap error", error);
-    }
-  }), [walletPublicKey, wallet == null ? void 0 : wallet.adapter, quoteResponseMeta, ultraSwapMutation, fromTokenInfo, toTokenInfo]);
   const reset = (0, import_react7.useCallback)(
     ({ resetValues } = { resetValues: false }) => {
       if (resetValues) {
@@ -1455,11 +1333,12 @@ var SwapContextProvider = (props) => {
         toTokenInfo,
         quoteResponseMeta,
         setQuoteResponseMeta,
-        onSubmit,
+        // onSubmit,
         lastSwapResult,
+        setLastSwapResult,
         reset,
         refresh,
-        loading,
+        loading: loading || debouncePending,
         quoteError,
         lastRefreshTimestamp,
         isToPairFocused,
@@ -1469,6 +1348,7 @@ var SwapContextProvider = (props) => {
         swapping: {
           txStatus
         },
+        setTxStatus,
         enableWalletPassthrough
       },
       children
@@ -1630,13 +1510,6 @@ var import_react24 = require("react");
 var import_react19 = require("react");
 var import_react_number_format = require("react-number-format");
 
-// src/misc/constants.ts
-var import_web35 = require("@solana/web3.js");
-var MINIMUM_SOL_BALANCE = 0.01;
-var ROUTE_CACHE_DURATION = 2e4;
-var MAX_INPUT_LIMIT = 1e14;
-var WRAPPED_SOL_MINT2 = new import_web35.PublicKey("So11111111111111111111111111111111111111112");
-
 // src/components/Coinbalance.tsx
 var React6 = __toESM(require("react"));
 var import_jsx_runtime14 = require("react/jsx-runtime");
@@ -2041,15 +1914,18 @@ var TransactionFee = ({ gasFee, gasless }) => {
 };
 var TransactionFee_default = TransactionFee;
 
-// src/queries/useUltraRouter.ts
+// src/components/PriceInfo/index.tsx
 var import_react_query5 = require("@tanstack/react-query");
-var useUltraRouters = (options) => {
-  return (0, import_react_query5.useQuery)(__spreadValues({
+
+// src/queries/queries.ts
+var import_react_query4 = require("@tanstack/react-query");
+var UltraQueries = {
+  routers: (0, import_react_query4.queryOptions)({
     queryKey: ["routers"],
-    queryFn: () => ultraSwapService.getRouters(),
-    cacheTime: Infinity,
+    queryFn: ultraSwapService.getRouters,
+    gcTime: Infinity,
     staleTime: Infinity
-  }, options));
+  })
 };
 
 // src/components/PriceInfo/index.tsx
@@ -2069,14 +1945,14 @@ var Index = ({
     // If there's no selectedRoute, we will use first route value to temporarily calculate
     outputDecimal: toTokenInfo.decimals
   };
-  const { data: routerInfo } = useUltraRouters({
+  const { data: routerInfo } = (0, import_react_query5.useQuery)(__spreadProps(__spreadValues({}, UltraQueries.routers), {
     select: (data) => {
       if (!quoteResponse) {
         return null;
       }
       return data.find((router2) => router2.id === quoteResponse.quoteResponse.router);
     }
-  });
+  }));
   const priceImpact = formatNumber.format(
     new import_decimal6.default((quoteResponse == null ? void 0 : quoteResponse.quoteResponse.priceImpactPct) || 0).mul(100).toDP(2)
   );
@@ -2102,7 +1978,7 @@ var Index = ({
     }
     return 0;
   }, [quoteResponse]);
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: cn("mt-4 space-y-4 border border-white/5 rounded-xl", containerClassName), children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: cn("mt-4 space-y-4 ", containerClassName), children: [
     /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: "flex items-center justify-between text-xs", children: [
       /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: "text-primary-text/50", children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("span", { children: "Rate" }) }),
       import_jsbi3.default.greaterThan(rateParams.inAmount, import_jsbi3.default.BigInt(0)) && import_jsbi3.default.greaterThan(rateParams.outAmount, import_jsbi3.default.BigInt(0)) ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
@@ -2179,28 +2055,6 @@ var SwitchPairButton = ({
 };
 var SwitchPairButton_default = SwitchPairButton;
 
-// src/components/useTimeDiff/useTimeDiff.tsx
-var import_react15 = __toESM(require("react"));
-var useTimeDiff = () => {
-  const { lastRefreshTimestamp } = useSwapContext();
-  const [hasExpired, setHasExpired] = import_react15.default.useState(false);
-  const [timeDiff, setTimeDiff] = (0, import_react15.useState)(0);
-  (0, import_react15.useEffect)(() => {
-    const intervalId = setInterval(() => {
-      if (!lastRefreshTimestamp) {
-        return;
-      }
-      const value = Date.now() > lastRefreshTimestamp + ROUTE_CACHE_DURATION;
-      const elapsedSeconds = (Date.now() - (lastRefreshTimestamp + ROUTE_CACHE_DURATION)) / 1e3;
-      setTimeDiff(elapsedSeconds / (ROUTE_CACHE_DURATION / 1e3) * 100);
-      setHasExpired(value);
-    }, 1e3);
-    return () => clearInterval(intervalId);
-  }, [lastRefreshTimestamp]);
-  return [hasExpired, timeDiff];
-};
-var useTimeDiff_default = useTimeDiff;
-
 // src/components/Form.tsx
 var import_decimal7 = __toESM(require("decimal.js"));
 
@@ -2208,10 +2062,10 @@ var import_decimal7 = __toESM(require("decimal.js"));
 var import_react_query6 = require("@tanstack/react-query");
 
 // src/hooks/useMobile.ts
-var import_react16 = require("react");
+var import_react15 = require("react");
 var import_react_use = require("react-use");
 var useMobile = () => {
-  const [isDesktop, setIsDesktop] = (0, import_react16.useState)(false);
+  const [isDesktop, setIsDesktop] = (0, import_react15.useState)(false);
   (0, import_react_use.useIsomorphicLayoutEffect)(() => {
     function updateSize() {
       const desktopQuery = window.matchMedia("(min-width: 1024px)");
@@ -2225,7 +2079,7 @@ var useMobile = () => {
 };
 
 // src/components/Popover/Popover.tsx
-var import_react17 = require("react");
+var import_react16 = require("react");
 var import_react_popper = require("react-popper");
 var import_lodash = __toESM(require("lodash.debounce"));
 var import_jsx_runtime26 = require("react/jsx-runtime");
@@ -2245,16 +2099,16 @@ var Popover = ({
   offset,
   drawShades = false
 }) => {
-  const isLocalMode = (0, import_react17.useMemo)(
+  const isLocalMode = (0, import_react16.useMemo)(
     () => typeof isOpen === "undefined",
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
   const isMobile = useMobile();
-  const [localOpen, setLocalOpen] = (0, import_react17.useState)(isLocalMode ? false : true);
-  const [referenceElement, setReferenceElement] = (0, import_react17.useState)(null);
-  const [popperElement, setPopperElement] = (0, import_react17.useState)(null);
-  const shouldShowArrow = (0, import_react17.useMemo)(() => Boolean(popoverContent) && arrow, [popoverContent, arrow]);
+  const [localOpen, setLocalOpen] = (0, import_react16.useState)(isLocalMode ? false : true);
+  const [referenceElement, setReferenceElement] = (0, import_react16.useState)(null);
+  const [popperElement, setPopperElement] = (0, import_react16.useState)(null);
+  const shouldShowArrow = (0, import_react16.useMemo)(() => Boolean(popoverContent) && arrow, [popoverContent, arrow]);
   const modifiers = offset ? [
     {
       name: "offset",
@@ -2268,7 +2122,7 @@ var Popover = ({
     placement,
     modifiers
   });
-  const handleClose = (0, import_react17.useCallback)(
+  const handleClose = (0, import_react16.useCallback)(
     (0, import_lodash.default)(
       () => {
         if (isLocalMode) {
@@ -2283,7 +2137,7 @@ var Popover = ({
     ),
     [setLocalOpen, isLocalMode, onClose, trigger, persistOnClick]
   );
-  const handleOpen = (0, import_react17.useCallback)(() => {
+  const handleOpen = (0, import_react16.useCallback)(() => {
     handleClose.cancel();
     setLocalOpen(true);
   }, [setLocalOpen, handleClose]);
@@ -2403,7 +2257,7 @@ var PopoverTooltip = ({
 var PopoverTooltip_default = PopoverTooltip;
 
 // src/components/JupShield.tsx
-var import_react18 = require("react");
+var import_react17 = require("react");
 
 // src/components/Plural/index.tsx
 var import_jsx_runtime28 = require("react/jsx-runtime");
@@ -2450,7 +2304,7 @@ var Warnings = ({
   children,
   isHighRisk
 }) => {
-  const warningTitle = (0, import_react18.useCallback)((warning2) => {
+  const warningTitle = (0, import_react17.useCallback)((warning2) => {
     return parseShieldWarningtoSentenceCase(warning2);
   }, []);
   return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)("div", { className: "flex gap-1", children: [
@@ -2466,9 +2320,9 @@ var JupShield = ({ tokenAddress }) => {
   const { data, isFetching } = (0, import_react_query6.useQuery)({
     queryKey: ["shield", tokenAddress],
     queryFn: () => ultraSwapService.getShield([tokenAddress]),
-    cacheTime: 5 * 6e4,
+    gcTime: 5 * 6e4,
     staleTime: 5 * 6e4,
-    keepPreviousData: true,
+    placeholderData: import_react_query6.keepPreviousData,
     select: (data2) => {
       const warnings = data2.warnings[tokenAddress];
       return {
@@ -2521,10 +2375,166 @@ var JupShield = ({ tokenAddress }) => {
 };
 var JupShield_default = JupShield;
 
-// src/components/Form.tsx
+// src/queries/useUltraSwapMutation.ts
+var import_wallet_adapter2 = require("@jup-ag/wallet-adapter");
+var import_react_query7 = require("@tanstack/react-query");
+var import_buffer = require("buffer");
+var import_web34 = require("@solana/web3.js");
+
+// src/entity/TransactionError.ts
+var TransactionError = class extends Error {
+  constructor(message, txid, code, programIds, serializedTx) {
+    super(message);
+    this.name = "TransactionError";
+    this.txid = txid;
+    this.code = code;
+    this.programIds = programIds;
+    this.serializedTx = serializedTx;
+  }
+};
+
+// src/queries/useUltraSwapMutation.ts
+var UltraSwapError = class extends Error {
+  constructor(message, type2, txid) {
+    super(message);
+    this.type = type2;
+    this.txid = txid;
+  }
+};
+function useUltraSwapMutation() {
+  const { wallet, signTransaction } = useWalletPassThrough();
+  return (0, import_react_query7.useMutation)({
+    mutationFn: (_0) => __async(this, [_0], function* ({
+      setTxStatus,
+      setLastSwapResult,
+      fromTokenInfo,
+      toTokenInfo,
+      quoteResponseMeta
+    }) {
+      const publicKey = wallet == null ? void 0 : wallet.adapter.publicKey;
+      if (!signTransaction || !publicKey) {
+        throw new UltraSwapError(
+          "Wallet not connected, or missing wallet functions",
+          "WALLET_SIGNING_FAILED" /* WALLET_SIGNING_FAILED */
+        );
+      }
+      setTxStatus({
+        txid: "",
+        status: "pending-approval"
+      });
+      const selectedQuote = quoteResponseMeta.original;
+      const { transaction, requestId } = selectedQuote;
+      if (!transaction) throw new Error("Missing transaction");
+      const based64tx = import_buffer.Buffer.from(transaction, "base64");
+      const versionedTransaction = import_web34.VersionedTransaction.deserialize(new Uint8Array(based64tx));
+      const signedTransaction = yield signTransaction(versionedTransaction);
+      const serializedTransaction = import_buffer.Buffer.from(signedTransaction.serialize()).toString("base64");
+      setTxStatus({
+        txid: "",
+        status: "sending"
+      });
+      const response = yield ultraSwapService.submitSwap(serializedTransaction, requestId);
+      const { signature, status } = response;
+      if (status === "Failed") {
+        throw new UltraSwapError(response.error, "FAILED" /* FAILED */, signature);
+      }
+      const { inputAmountResult, outputAmountResult } = response;
+      setTxStatus({
+        txid: signature,
+        status: "success"
+      });
+      setLastSwapResult({
+        swapResult: {
+          txid: signature,
+          inputAddress: new import_web34.PublicKey(fromTokenInfo.id),
+          outputAddress: new import_web34.PublicKey(toTokenInfo.id),
+          inputAmount: Number(inputAmountResult),
+          outputAmount: Number(outputAmountResult)
+        },
+        quoteReponse: quoteResponseMeta
+      });
+      return signature;
+    }),
+    onError: (error, variables) => __async(this, null, function* () {
+      const { setTxStatus, setLastSwapResult, quoteResponseMeta } = variables;
+      if (error instanceof import_wallet_adapter2.WalletSignTransactionError) {
+        const message = error.message || error.error || "Transaction cancelled";
+        setLastSwapResult({
+          swapResult: {
+            error: new TransactionError(message)
+          },
+          quoteReponse: quoteResponseMeta
+        });
+        return;
+      }
+      if (error instanceof Error) {
+        setLastSwapResult({
+          swapResult: {
+            error: new TransactionError(error.message)
+          },
+          quoteReponse: quoteResponseMeta
+        });
+        return;
+      }
+      if ("json" in error) {
+        const json = yield error.json();
+        setLastSwapResult({
+          swapResult: {
+            error: new TransactionError(json.error || "Unknown error")
+          },
+          quoteReponse: quoteResponseMeta
+        });
+        setTxStatus({
+          txid: json.txid || "",
+          status: "fail"
+        });
+      }
+    })
+  });
+}
+
+// src/components/SubmitButton.tsx
+var import_react18 = require("react");
 var import_jsx_runtime31 = require("react/jsx-runtime");
+var SubmitButton = ({ onSubmit }) => {
+  const {
+    quoteResponseMeta,
+    loading,
+    errors,
+    swapping: { txStatus },
+    form
+  } = useSwapContext();
+  const shouldButtonDisabled = (0, import_react18.useMemo)(() => {
+    if (!quoteResponseMeta || loading || !!errors.fromValue || (txStatus == null ? void 0 : txStatus.status) === "loading" || (txStatus == null ? void 0 : txStatus.status) === "sending" || (txStatus == null ? void 0 : txStatus.status) === "pending-approval") {
+      return true;
+    }
+    return false;
+  }, [quoteResponseMeta, loading, errors.fromValue, txStatus]);
+  const buttonText = (0, import_react18.useMemo)(() => {
+    var _a2;
+    if (errors.fromValue) return errors.fromValue.title;
+    if ((_a2 = quoteResponseMeta == null ? void 0 : quoteResponseMeta.quoteResponse) == null ? void 0 : _a2.errorMessage) return quoteResponseMeta.quoteResponse.errorMessage;
+    if (loading) return "Loading";
+    if ((txStatus == null ? void 0 : txStatus.status) === "sending") return "Sending";
+    if ((txStatus == null ? void 0 : txStatus.status) === "pending-approval") return "Pending Approval";
+    return "Swap";
+  }, [txStatus, errors.fromValue, loading, quoteResponseMeta]);
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+    JupButton_default,
+    {
+      size: "lg",
+      className: cn("w-full mt-4 disabled:opacity-50 !text-uiv2-text/75 !bg-primary "),
+      onClick: onSubmit,
+      disabled: shouldButtonDisabled,
+      children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { children: buttonText })
+    }
+  );
+};
+
+// src/components/Form.tsx
+var import_jsx_runtime32 = require("react/jsx-runtime");
 var FormInputContainer = ({ tokenInfo, onBalanceClick, title, pairSelectDisabled, onClickSelectPair, children, value }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
     "div",
     {
       className: cn(
@@ -2533,9 +2543,9 @@ var FormInputContainer = ({ tokenInfo, onBalanceClick, title, pairSelectDisabled
         "group focus-within:border-primary/50 focus-within:shadow-swap-input-dark rounded-xl"
       ),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: "flex justify-between items-center text-xs text-primary-text", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { children: title }),
-          tokenInfo && /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "flex justify-between items-center text-xs text-primary-text", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { children: title }),
+          tokenInfo && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
             "div",
             {
               className: cn("flex  space-x-1 text-xs items-center text-primary-text/50 fill-current ", {
@@ -2545,16 +2555,16 @@ var FormInputContainer = ({ tokenInfo, onBalanceClick, title, pairSelectDisabled
                 onBalanceClick == null ? void 0 : onBalanceClick(e);
               },
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(WalletIcon_default, { width: 10, height: 10 }),
-                /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Coinbalance_default, { mintAddress: tokenInfo.id, hideZeroBalance: false }),
-                /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { children: tokenInfo.symbol })
+                /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(WalletIcon_default, { width: 10, height: 10 }),
+                /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Coinbalance_default, { mintAddress: tokenInfo.id, hideZeroBalance: false }),
+                /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("span", { children: tokenInfo.symbol })
               ]
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: "flex", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "flex", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
               "button",
               {
                 type: "button",
@@ -2564,25 +2574,25 @@ var FormInputContainer = ({ tokenInfo, onBalanceClick, title, pairSelectDisabled
                 disabled: pairSelectDisabled,
                 onClick: onClickSelectPair,
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: "h-5 w-5", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(TokenIcon_default, { info: tokenInfo, width: 20, height: 20 }) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: "ml-4 mr-2 font-semibold", translate: "no", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: "truncate", children: tokenInfo == null ? void 0 : tokenInfo.symbol }) }),
-                  pairSelectDisabled ? null : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { className: "text-primary-text/25 fill-current", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronDownIcon_default, {}) })
+                  /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "h-5 w-5", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(TokenIcon_default, { info: tokenInfo, width: 20, height: 20 }) }),
+                  /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "ml-4 mr-2 font-semibold", translate: "no", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "truncate", children: tokenInfo == null ? void 0 : tokenInfo.symbol }) }),
+                  pairSelectDisabled ? null : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("span", { className: "text-primary-text/25 fill-current", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ChevronDownIcon_default, {}) })
                 ]
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: "flex justify-between items-center h-[20px]", children: (tokenInfo == null ? void 0 : tokenInfo.id) && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(JupShield_default, { tokenAddress: tokenInfo.id }) })
+            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "flex justify-between items-center h-[20px]", children: (tokenInfo == null ? void 0 : tokenInfo.id) && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(JupShield_default, { tokenAddress: tokenInfo.id }) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: "flex flex-col items-end justify-between w-full", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "flex flex-col items-end justify-between w-full", children: [
             children,
-            /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { className: "text-xs text-primary-text/50", children: tokenInfo && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(CoinBalanceUSD, { tokenInfo, amount: value }) })
+            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("span", { className: "text-xs text-primary-text/50", children: tokenInfo && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(CoinBalanceUSD, { tokenInfo, amount: value }) })
           ] })
         ] })
       ]
     }
   );
 };
-var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
-  const { publicKey } = useWalletPassThrough();
+var Form = ({ setSelectPairSelector }) => {
+  const { publicKey, wallet } = useWalletPassThrough();
   const { data: balances } = useBalances();
   const {
     form,
@@ -2592,19 +2602,32 @@ var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
     quoteResponseMeta,
     formProps: { fixedAmount, swapMode, fixedMint },
     loading,
-    refresh,
-    quoteError,
-    errors,
     isToPairFocused,
-    onSubmit: onSubmitUltra
+    setTxStatus,
+    setLastSwapResult
   } = useSwapContext();
-  const [hasExpired, timeDiff] = useTimeDiff_default();
   const { setScreen } = useScreenState();
-  (0, import_react19.useEffect)(() => {
-    if (hasExpired) {
-      refresh();
+  const { mutateAsync: ultraSwapMutation } = useUltraSwapMutation();
+  const onSubmit = (0, import_react19.useCallback)(() => __async(void 0, null, function* () {
+    if (!wallet || !wallet.adapter.publicKey || !quoteResponseMeta) {
+      return null;
     }
-  }, [hasExpired]);
+    try {
+      if (!fromTokenInfo) throw new Error("Missing fromTokenInfo");
+      if (!toTokenInfo) throw new Error("Missing toTokenInfo");
+      yield ultraSwapMutation({
+        quoteResponseMeta,
+        fromTokenInfo,
+        toTokenInfo,
+        setTxStatus,
+        setLastSwapResult
+      });
+    } catch (error) {
+      console.log("Swap error", error);
+    } finally {
+      setScreen("Swapping");
+    }
+  }), [wallet, quoteResponseMeta, ultraSwapMutation, fromTokenInfo, toTokenInfo, setTxStatus, setLastSwapResult, setScreen]);
   const shouldDisabledFromSelector = (0, import_react19.useMemo)(() => {
     if ((fromTokenInfo == null ? void 0 : fromTokenInfo.id) === fixedMint) {
       return true;
@@ -2704,15 +2727,9 @@ var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
     },
     [setScreen]
   );
-  const shouldButtonDisabled = (0, import_react19.useMemo)(() => {
-    if (isDisabled || loading || !!errors.fromValue) {
-      return true;
-    }
-    return false;
-  }, [isDisabled, loading, errors.fromValue]);
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: "h-full flex flex-col items-center justify-center", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: "w-full mt-2 rounded-xl flex flex-col px-2", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: "flex-col", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "h-full flex flex-col items-center justify-center", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "w-full mt-2 rounded-xl flex flex-col px-2", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "flex-col", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
         FormInputContainer,
         {
           tokenInfo: fromTokenInfo,
@@ -2724,7 +2741,7 @@ var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
           pairSelectDisabled: shouldDisabledFromSelector,
           onClickSelectPair: onClickSelectFromMint,
           value: form.fromValue,
-          children: (fromTokenInfo == null ? void 0 : fromTokenInfo.decimals) && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+          children: (fromTokenInfo == null ? void 0 : fromTokenInfo.decimals) && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             import_react_number_format.NumericFormat,
             {
               disabled: fixedAmount || swapMode === SwapMode.ExactOut,
@@ -2751,8 +2768,8 @@ var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: "relative z-10 -my-3 flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(SwitchPairButton_default, { onClick: onClickSwitchPair, className: cn("transition-all") }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "relative z-10 -my-3 flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(SwitchPairButton_default, { onClick: onClickSwitchPair, className: cn("transition-all") }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
         FormInputContainer,
         {
           tokenInfo: toTokenInfo,
@@ -2760,7 +2777,7 @@ var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
           pairSelectDisabled: shouldDisabledToSelector,
           onClickSelectPair: onClickSelectToMint,
           value: form.toValue,
-          children: (toTokenInfo == null ? void 0 : toTokenInfo.decimals) && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+          children: (toTokenInfo == null ? void 0 : toTokenInfo.decimals) && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             import_react_number_format.NumericFormat,
             {
               inputMode: "decimal",
@@ -2791,21 +2808,9 @@ var Form = ({ onSubmit, isDisabled, setSelectPairSelector }) => {
         }
       )
     ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: "w-full px-2", children: [
-      !walletPublicKey ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(JupButton_default, { size: "lg", className: "w-full mt-4 bg-primary !text-uiv2-text/75", onClick: handleClick, children: "Connect Wallet" }) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
-        JupButton_default,
-        {
-          size: "lg",
-          className: cn("w-full mt-4 disabled:opacity-50 !text-uiv2-text/75 !bg-primary "),
-          onClick: () => {
-            onSubmit();
-            onSubmitUltra();
-          },
-          disabled: shouldButtonDisabled,
-          children: loading ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { children: "Loading" }) : errors.fromValue ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { children: errors.fromValue.title }) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { children: "Swap" })
-        }
-      ),
-      quoteResponseMeta && fromTokenInfo && toTokenInfo ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "w-full px-2", children: [
+      !walletPublicKey ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(JupButton_default, { size: "lg", className: "w-full mt-4 bg-primary !text-uiv2-text/75", onClick: handleClick, children: "Connect Wallet" }) : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(SubmitButton, { onSubmit }),
+      quoteResponseMeta && fromTokenInfo && toTokenInfo ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
         PriceInfo_default,
         {
           quoteResponse: quoteResponseMeta,
@@ -2825,9 +2830,9 @@ var import_react_virtualized_auto_sizer = __toESM(require("react-virtualized-aut
 var import_react_window = require("react-window");
 
 // src/icons/LeftArrowIcon.tsx
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var LeftArrowIcon = ({ width = "12", height = "12" }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("svg", { width, height, viewBox: "0 0 53 52", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)("svg", { width, height, viewBox: "0 0 53 52", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     "path",
     {
       d: "M17.3336 23.8334H43.7062V28.1667H17.3336L28.9555 39.7887L25.8919 42.8524L9.03955 26L25.8919 9.14771L28.9555 12.2114L17.3336 23.8334Z",
@@ -2838,9 +2843,9 @@ var LeftArrowIcon = ({ width = "12", height = "12" }) => {
 var LeftArrowIcon_default = LeftArrowIcon;
 
 // src/icons/SearchIcon.tsx
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_jsx_runtime34 = require("react/jsx-runtime");
 var SearchIcon = () => {
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)("div", { className: "flex items-center text-primary-text fill-current", children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)("svg", { width: "18", height: "18", viewBox: "0 0 18 18", fill: "inherit", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: "flex items-center text-primary-text fill-current", children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("svg", { width: "18", height: "18", viewBox: "0 0 18 18", fill: "inherit", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     "path",
     {
       d: "M7.30327 14.6058C8.75327 14.6074 10.1705 14.1746 11.3729 13.3637L15.5971 17.5871C16.1463 18.1371 17.0377 18.1371 17.5877 17.5871C18.1377 17.0371 18.1377 16.1457 17.5877 15.5964L13.3643 11.3722C14.5823 9.55661 14.9229 7.28943 14.2909 5.19563C13.6596 3.10183 12.1229 1.40183 10.1033 0.56283C8.08365 -0.276231 5.79385 -0.16607 3.86505 0.86283C1.93537 1.89251 0.569053 3.73243 0.140853 5.87683C-0.286487 8.02143 0.269759 10.2448 1.65725 11.9354C3.04397 13.6261 5.11665 14.6064 7.30325 14.6058H7.30327ZM7.30327 1.68943C8.79233 1.68865 10.2197 2.28005 11.2729 3.33319C12.3252 4.38631 12.9166 5.81359 12.9166 7.30279C12.9166 8.79199 12.3252 10.2192 11.2729 11.2724C10.2198 12.3247 8.79247 12.9162 7.30327 12.9162C5.81407 12.9162 4.38687 12.3247 3.33367 11.2724C2.28133 10.2193 1.68913 8.79199 1.68991 7.30279C1.69148 5.81451 2.28287 4.38719 3.33523 3.33479C4.38759 2.28239 5.81483 1.69103 7.30323 1.68947L7.30327 1.68943Z",
@@ -2860,7 +2865,7 @@ var import_decimal8 = __toESM(require("decimal.js"));
 
 // src/contexts/preferredExplorer/index.tsx
 var import_react20 = require("react");
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime35 = require("react/jsx-runtime");
 var AVAILABLE_EXPLORER = [
   {
     name: "Solana Explorer",
@@ -2936,7 +2941,7 @@ var PreferredExplorerProvider = ({
     (mint, cluster) => explorerObject.getToken(mint, cluster),
     [explorerObject]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
     PreferredExplorerContext.Provider,
     {
       value: { explorer, getExplorer, getTokenExplorer, setExplorer: (explorer2) => setExplorer(explorer2) },
@@ -2950,8 +2955,8 @@ function usePreferredExplorer() {
 }
 
 // src/icons/ExternalIcon.tsx
-var import_jsx_runtime35 = require("react/jsx-runtime");
-var ExternalIcon = () => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("svg", { width: "10", height: "10", viewBox: "0 0 10 10", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+var import_jsx_runtime36 = require("react/jsx-runtime");
+var ExternalIcon = () => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("svg", { width: "10", height: "10", viewBox: "0 0 10 10", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
   "path",
   {
     d: "M4 2V3H1.5V8.5H7V6H8V9C8 9.13261 7.94732 9.25979 7.85355 9.35355C7.75979 9.44732 7.63261 9.5 7.5 9.5H1C0.867392 9.5 0.740215 9.44732 0.646447 9.35355C0.552678 9.25979 0.5 9.13261 0.5 9V2.5C0.5 2.36739 0.552678 2.24021 0.646447 2.14645C0.740215 2.05268 0.867392 2 1 2H4ZM9.5 0.5V4.5H8.5V2.2065L4.6035 6.1035L3.8965 5.3965L7.7925 1.5H5.5V0.5H9.5Z",
@@ -2961,10 +2966,10 @@ var ExternalIcon = () => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("svg", {
 var ExternalIcon_default = ExternalIcon;
 
 // src/components/TokenLink.tsx
-var import_jsx_runtime36 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var TokenLink = ({ tokenInfo, className }) => {
   const { getTokenExplorer } = usePreferredExplorer();
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(
     "a",
     {
       target: "_blank",
@@ -2976,8 +2981,8 @@ var TokenLink = ({ tokenInfo, className }) => {
       href: getTokenExplorer(tokenInfo.id),
       onClick: (e) => e.stopPropagation(),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: "text-xxs", children: shortenAddress(tokenInfo.id) }),
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ExternalIcon_default, {})
+        /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: "text-xxs", children: shortenAddress(tokenInfo.id) }),
+        /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ExternalIcon_default, {})
       ]
     }
   );
@@ -2986,9 +2991,9 @@ TokenLink.displayName = "TokenLink";
 var TokenLink_default = TokenLink;
 
 // src/components/CheckedBadge.tsx
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_jsx_runtime38 = require("react/jsx-runtime");
 var CheckedBadge = ({ width = 24, height = 24 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(
     "svg",
     {
       width,
@@ -2997,7 +3002,7 @@ var CheckedBadge = ({ width = 24, height = 24 }) => {
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
           "path",
           {
             d: "M13.8179 4.54512L13.6275 4.27845C12.8298 3.16176 11.1702 3.16176 10.3725 4.27845L10.1821 4.54512C9.76092 5.13471 9.05384 5.45043 8.33373 5.37041L7.48471 5.27608C6.21088 5.13454 5.13454 6.21088 5.27608 7.48471L5.37041 8.33373C5.45043 9.05384 5.13471 9.76092 4.54512 10.1821L4.27845 10.3725C3.16176 11.1702 3.16176 12.8298 4.27845 13.6275L4.54512 13.8179C5.13471 14.2391 5.45043 14.9462 5.37041 15.6663L5.27608 16.5153C5.13454 17.7891 6.21088 18.8655 7.48471 18.7239L8.33373 18.6296C9.05384 18.5496 9.76092 18.8653 10.1821 19.4549L10.3725 19.7215C11.1702 20.8382 12.8298 20.8382 13.6275 19.7215L13.8179 19.4549C14.2391 18.8653 14.9462 18.5496 15.6663 18.6296L16.5153 18.7239C17.7891 18.8655 18.8655 17.7891 18.7239 16.5153L18.6296 15.6663C18.5496 14.9462 18.8653 14.2391 19.4549 13.8179L19.7215 13.6275C20.8382 12.8298 20.8382 11.1702 19.7215 10.3725L19.4549 10.1821C18.8653 9.76092 18.5496 9.05384 18.6296 8.33373L18.7239 7.48471C18.8655 6.21088 17.7891 5.13454 16.5153 5.27608L15.6663 5.37041C14.9462 5.45043 14.2391 5.13471 13.8179 4.54512Z",
@@ -3007,7 +3012,7 @@ var CheckedBadge = ({ width = 24, height = 24 }) => {
             strokeLinejoin: "round"
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
           "path",
           {
             d: "M9 12L10.8189 13.8189V13.8189C10.9189 13.9189 11.0811 13.9189 11.1811 13.8189V13.8189L15 10",
@@ -3024,27 +3029,25 @@ var CheckedBadge = ({ width = 24, height = 24 }) => {
 var CheckedBadge_default = CheckedBadge;
 
 // src/queries/useLstApy.ts
-var import_react_query7 = require("@tanstack/react-query");
+var import_react_query8 = require("@tanstack/react-query");
 function useLstApyFetcher() {
-  return (0, import_react_query7.useQuery)(
-    ["lst-apy"],
-    () => __async(this, null, function* () {
+  return (0, import_react_query8.useQuery)({
+    queryKey: ["lst-apy"],
+    queryFn: () => __async(this, null, function* () {
       const lstApy = yield fetch(`https://worker.jup.ag/lst-apys`);
       const apyResult = yield lstApy.json();
       return apyResult;
     }),
-    {
-      retry: 3,
-      keepPreviousData: true,
-      staleTime: 3e5
-      // 5m
-    }
-  );
+    retry: 3,
+    placeholderData: import_react_query8.keepPreviousData,
+    staleTime: 3e5
+    // 5m
+  });
 }
 
 // src/components/FormPairRow.tsx
-var import_react_query8 = require("@tanstack/react-query");
-var import_jsx_runtime38 = require("react/jsx-runtime");
+var import_react_query9 = require("@tanstack/react-query");
+var import_jsx_runtime39 = require("react/jsx-runtime");
 var PAIR_ROW_HEIGHT = 72;
 var LSTTag = ({ mintAddress }) => {
   const { data: lstApy } = useLstApyFetcher();
@@ -3056,7 +3059,7 @@ var LSTTag = ({ mintAddress }) => {
     }
     return;
   }, [lstApy, mintAddress]);
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("p", { className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 text-primary/50 border border-primary/50 font-semibold", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("p", { className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 text-primary/50 border border-primary/50 font-semibold", children: [
     "LST ",
     apy ? `${apy}%` : ""
   ] });
@@ -3092,10 +3095,10 @@ var MultiTags = ({ item }) => {
   const remainingTags = [];
   if (!renderedTag) return null;
   const { isToken2022, isFrozen, isLST } = renderedTag;
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: "flex justify-end gap-x-1", children: [
-    isFrozen && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("p", { className: "border rounded-md text-xxs leading-none transition-all py-0.5 px-1 border-warning/50 text-warning/50", children: "Frozen" }),
-    isToken2022 && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("p", { className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 bg-black/10 font-semibold text-primary-text/20", children: "Token2022" }),
-    remainingTags == null ? void 0 : remainingTags.map((tag, idx) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex justify-end gap-x-1", children: [
+    isFrozen && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("p", { className: "border rounded-md text-xxs leading-none transition-all py-0.5 px-1 border-warning/50 text-warning/50", children: "Frozen" }),
+    isToken2022 && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("p", { className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 bg-black/10 font-semibold text-primary-text/20", children: "Token2022" }),
+    remainingTags == null ? void 0 : remainingTags.map((tag, idx) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
       "div",
       {
         className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 bg-black/10 font-semibold text-primary-text/20",
@@ -3103,7 +3106,7 @@ var MultiTags = ({ item }) => {
       },
       idx
     )),
-    isLST && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(LSTTag, { mintAddress: item.id })
+    isLST && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(LSTTag, { mintAddress: item.id })
   ] });
 };
 var FormPairRow = (props) => {
@@ -3116,7 +3119,7 @@ var FormPairRow = (props) => {
     showExplorer = true,
     enableUnknownTokenWarning = true
   } = props;
-  const queryClient = (0, import_react_query8.useQueryClient)();
+  const queryClient = (0, import_react_query9.useQueryClient)();
   const onClick = import_react21.default.useCallback(() => {
     queryClient.setQueryData([...ASSET_QUERY_KEY, item.id], [item]);
     onSubmit(item);
@@ -3126,27 +3129,27 @@ var FormPairRow = (props) => {
   const balance = (_a2 = balances == null ? void 0 : balances[item.id]) == null ? void 0 : _a2.uiAmount;
   const usdValue = balance ? new import_decimal8.default(balance).mul(item.usdPrice || 0) : void 0;
   const usdValueDisplay = usdValue && usdValue.gte(0.01) ? `$${formatNumber.format(usdValue, 2)}` : "";
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
     "li",
     {
       className: `rounded cursor-pointer px-5 my-1 list-none flex w-full items-center bg-interactive hover:bg-interactive/80`,
       style: __spreadValues({ maxHeight: PAIR_ROW_HEIGHT - 4, height: PAIR_ROW_HEIGHT - 4 }, style),
       onClick,
       translate: "no",
-      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: "flex h-full w-full items-center space-x-4", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "flex-shrink-0", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "bg-gray-200 rounded-full", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(TokenIcon_default, { info: item, width: 36, height: 36, enableUnknownTokenWarning }) }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "flex-1 min-w-0", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: "flex flex-col gap-y-px", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: "flex items-center", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("p", { className: "text-sm font-medium text-primary-text truncate", children: item.symbol }),
-            checkIsStrictOrVerified(item) && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("p", { className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 text-primary", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(CheckedBadge_default, { width: 18, height: 18 }) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex h-full w-full items-center space-x-4", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "flex-shrink-0", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "bg-gray-200 rounded-full", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(TokenIcon_default, { info: item, width: 36, height: 36, enableUnknownTokenWarning }) }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "flex-1 min-w-0", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex flex-col gap-y-px", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex items-center", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("p", { className: "text-sm font-medium text-primary-text truncate", children: item.symbol }),
+            checkIsStrictOrVerified(item) && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("p", { className: "rounded-md text-xxs leading-none transition-all py-0.5 px-1 text-primary", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CheckedBadge_default, { width: 18, height: 18 }) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("p", { className: "text-xs text-primary-text/50 dark:text-primary-text-35 truncate", children: item.id === WRAPPED_SOL_MINT.toBase58() ? "Solana" : item.name }),
-          showExplorer ? /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "-ml-1 z-10 w-fit", onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(TokenLink_default, { tokenInfo: item }) }) : null
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("p", { className: "text-xs text-primary-text/50 dark:text-primary-text-35 truncate", children: item.id === WRAPPED_SOL_MINT.toBase58() ? "Solana" : item.name }),
+          showExplorer ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "-ml-1 z-10 w-fit", onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(TokenLink_default, { tokenInfo: item }) }) : null
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: "text-xs text-primary-text/50 text-right h-full flex flex-col justify-evenly", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Coinbalance_default, { mintAddress: item.id, hideZeroBalance: true }),
-          usdValueDisplay ? /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("p", { children: usdValueDisplay }) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(MultiTags, __spreadValues({}, props))
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "text-xs text-primary-text/50 text-right h-full flex flex-col justify-evenly", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Coinbalance_default, { mintAddress: item.id, hideZeroBalance: true }),
+          usdValueDisplay ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("p", { children: usdValueDisplay }) : null,
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(MultiTags, __spreadValues({}, props))
         ] })
       ] })
     }
@@ -3156,12 +3159,12 @@ var FormPairRow_default = FormPairRow;
 
 // src/hooks/useSearch.ts
 var import_react22 = require("react");
-var import_react_query9 = require("@tanstack/react-query");
+var import_react_query10 = require("@tanstack/react-query");
 var CHUNK_SIZE = 100;
 var useSearch = (mintAddresses, options = {}) => {
   var _a2, _b;
   const mintAddressesString = (0, import_react22.useMemo)(() => mintAddresses.join(","), [mintAddresses]);
-  return (0, import_react_query9.useQuery)({
+  return (0, import_react_query10.useQuery)({
     queryKey: ["search", mintAddressesString],
     queryFn: () => __async(void 0, null, function* () {
       if (mintAddresses.length === 0) {
@@ -3183,13 +3186,13 @@ var useSearch = (mintAddresses, options = {}) => {
 };
 
 // src/components/FormPairSelector.tsx
-var import_jsx_runtime39 = require("react/jsx-runtime");
+var import_jsx_runtime40 = require("react/jsx-runtime");
 var PAIR_ROW_HEIGHT2 = 72;
 var SEARCH_BOX_HEIGHT = 56;
 var rowRenderer = (0, import_react23.memo)((props) => {
   const { data, index, style } = props;
   const item = data.searchResult[index];
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(FormPairRow_default, { item, style, onSubmit: data.onSubmit }, item.address);
+  return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(FormPairRow_default, { item, style, onSubmit: data.onSubmit }, item.address);
 }, import_react_window.areEqual);
 var FormPairSelector = ({ onSubmit, onClose }) => {
   const [search, setSearch] = (0, import_react23.useState)("");
@@ -3223,20 +3226,20 @@ var FormPairSelector = ({ onSubmit, onClose }) => {
     var _a2;
     return (_a2 = inputRef.current) == null ? void 0 : _a2.focus();
   }, [inputRef]);
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex flex-col h-full w-full py-4 px-2 bg-black", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex w-full justify-between", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "text-primary-text fill-current w-6 h-6 cursor-pointer", onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(LeftArrowIcon_default, { width: 24, height: 24 }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "text-primary-text", children: "Select Token" }),
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: " w-6 h-6" })
+  return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: "flex flex-col h-full w-full py-4 px-2 bg-black", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: "flex w-full justify-between", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: "text-primary-text fill-current w-6 h-6 cursor-pointer", onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(LeftArrowIcon_default, { width: 24, height: 24 }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: "text-primary-text", children: "Select Token" }),
+      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: " w-6 h-6" })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(
       "div",
       {
         className: "flex px-5 mt-4 w-[98%] rounded-xl bg-module",
         style: { height: SEARCH_BOX_HEIGHT, maxHeight: SEARCH_BOX_HEIGHT },
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SearchIcon_default, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(SearchIcon_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
             "input",
             {
               autoComplete: "off",
@@ -3249,9 +3252,9 @@ var FormPairSelector = ({ onSubmit, onClose }) => {
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "mt-2", style: { flexGrow: 1 }, children: [
-      searchResult && searchResult.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_react_virtualized_auto_sizer.default, { children: ({ height, width }) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: "mt-2", style: { flexGrow: 1 }, children: [
+      searchResult && searchResult.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_react_virtualized_auto_sizer.default, { children: ({ height, width }) => {
+        return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
           import_react_window.FixedSizeList,
           {
             ref: listRef,
@@ -3268,48 +3271,17 @@ var FormPairSelector = ({ onSubmit, onClose }) => {
           }
         );
       } }),
-      isLoading ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "mt-4 mb-4 text-center text-primary-text/50", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("span", { children: "Loading..." }) }) : searchResult && searchResult.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "mt-4 mb-4 text-center text-primary-text/50", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("span", { children: "No tokens found" }) }) : /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, {})
+      isLoading ? /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: "mt-4 mb-4 text-center text-primary-text/50", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("span", { children: "Loading..." }) }) : searchResult && searchResult.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: "mt-4 mb-4 text-center text-primary-text/50", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("span", { children: "No tokens found" }) }) : /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, {})
     ] })
   ] });
 };
 var FormPairSelector_default = FormPairSelector;
 
 // src/components/screens/InitialScreen.tsx
-var import_decimal9 = __toESM(require("decimal.js"));
-var import_jsx_runtime40 = require("react/jsx-runtime");
+var import_jsx_runtime41 = require("react/jsx-runtime");
 var InitialScreen = () => {
-  const { data: balances } = useBalances();
-  const {
-    form,
-    setForm,
-    setErrors,
-    quoteResponseMeta,
-    loading
-  } = useSwapContext();
-  const { setScreen } = useScreenState();
-  const balance = (0, import_react24.useMemo)(() => {
-    var _a2;
-    if (!balances) return 0;
-    return ((_a2 = balances[form.fromMint]) == null ? void 0 : _a2.uiAmount) || 0;
-  }, [balances, form.fromMint]);
+  const { form, setForm, loading } = useSwapContext();
   const [isDisabled, setIsDisabled] = (0, import_react24.useState)(false);
-  const { data: asset } = useAsset(form.fromMint);
-  (0, import_react24.useEffect)(() => {
-    if (!form.fromValue || !form.fromMint || !form.toMint || !form.toValue || !quoteResponseMeta || loading) {
-      setErrors({});
-      setIsDisabled(true);
-      return;
-    }
-    if (new import_decimal9.default(form.fromValue).gt(balance)) {
-      setErrors({
-        fromValue: { title: `Insufficient ${asset == null ? void 0 : asset.symbol}`, message: "" }
-      });
-      setIsDisabled(true);
-      return;
-    }
-    setErrors({});
-    setIsDisabled(false);
-  }, [form, asset, balance, quoteResponseMeta, loading, setErrors]);
   const [selectPairSelector, setSelectPairSelector] = (0, import_react24.useState)(null);
   const onSelectMint = (0, import_react24.useCallback)(
     (tokenInfo) => __async(void 0, null, function* () {
@@ -3328,128 +3300,28 @@ var InitialScreen = () => {
     }),
     [selectPairSelector, setForm]
   );
-  const onSubmitToConfirmation = (0, import_react24.useCallback)(() => {
-    setScreen("Swapping");
-  }, [setScreen]);
-  return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(import_jsx_runtime40.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
       "form",
       {
-        onSubmit: onSubmitToConfirmation,
         className: cn({
           hidden: Boolean(selectPairSelector)
         }),
-        children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
-          Form_default,
-          {
-            onSubmit: onSubmitToConfirmation,
-            isDisabled,
-            setSelectPairSelector
-          }
-        )
+        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Form_default, { isDisabled, setSelectPairSelector })
       }
     ),
-    selectPairSelector !== null ? /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: "absolute top-0 left-0 h-full w-full bg-black rounded-lg overflow-hidden", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
-      FormPairSelector_default,
-      {
-        onSubmit: onSelectMint,
-        onClose: () => setSelectPairSelector(null)
-      }
-    ) }) : null
+    selectPairSelector !== null ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: "absolute top-0 left-0 h-full w-full bg-black rounded-lg overflow-hidden", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(FormPairSelector_default, { onSubmit: onSelectMint, onClose: () => setSelectPairSelector(null) }) }) : null
   ] });
 };
 var InitialScreen_default = InitialScreen;
 
-// src/components/screens/ReviewOrderScreen.tsx
-var import_react25 = require("react");
-var import_jsx_runtime41 = require("react/jsx-runtime");
-var ConfirmationScreen = () => {
-  const {
-    fromTokenInfo,
-    toTokenInfo,
-    onSubmit: onSubmitJupiter,
-    quoteResponseMeta,
-    loading,
-    refresh
-  } = useSwapContext();
-  const [hasExpired] = useTimeDiff_default();
-  const { setScreen } = useScreenState();
-  const onGoBack = () => {
-    refresh();
-    setScreen("Initial");
-  };
-  const onSubmit = (0, import_react25.useCallback)(() => __async(void 0, null, function* () {
-    setScreen("Swapping");
-    onSubmitJupiter();
-  }), [onSubmitJupiter, setScreen]);
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "flex flex-col h-full w-full py-4 px-2", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "flex w-full justify-between", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: "text-primary-text fill-current w-6 h-6 cursor-pointer", onClick: onGoBack, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(LeftArrowIcon_default, { width: 24, height: 24 }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: "text-primary-text", children: "Review Order" }),
-      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: " w-6 h-6" })
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { children: quoteResponseMeta && fromTokenInfo && toTokenInfo ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-      PriceInfo_default,
-      {
-        quoteResponse: quoteResponseMeta,
-        fromTokenInfo,
-        toTokenInfo,
-        loading,
-        containerClassName: "bg-modiu; border-none"
-      }
-    ) : null }),
-    hasExpired ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(JupButton_default, { size: "lg", className: "w-full mt-4 disabled:opacity-50 !p-0", onClick: onGoBack, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { className: "text-sm", children: "Refresh" }) }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-      JupButton_default,
-      {
-        size: "lg",
-        className: cn(
-          "w-full mt-4 disabled:opacity-50 !text-uiv2-text/75 leading-none !max-h-14 bg-gradient-to-r from-[#00BEF0] to-[#C7F284]"
-        ),
-        onClick: onSubmit,
-        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "Confirm" })
-      }
-    )
-  ] });
-};
-var ReviewOrderScreen_default = ConfirmationScreen;
-
 // src/components/screens/SwappingScreen.tsx
-var import_react26 = require("react");
-
-// src/components/Spinner/index.tsx
-var import_jsx_runtime42 = require("react/jsx-runtime");
-var Spinner = ({
-  className,
-  baseColor = "currentColor",
-  spinnerColor = "currentColor",
-  width = 16,
-  height = 16
-}) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: `rounded-full flex items-center justify-center ${className}`, style: { width, height }, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(
-  "svg",
-  {
-    className: "animate-spin h-5 w-5 text-black dark:text-primary-text",
-    xmlns: "http://www.w3.org/2000/svg",
-    fill: "none",
-    viewBox: "0 0 24 24",
-    children: [
-      /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("circle", { className: "opacity-25", cx: "12", cy: "12", r: "10", stroke: baseColor, strokeWidth: "4" }),
-      /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
-        "path",
-        {
-          className: "opacity-75",
-          fill: spinnerColor,
-          d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-        }
-      )
-    ]
-  }
-) });
-var Spinner_default = Spinner;
+var import_react25 = require("react");
 
 // src/icons/SuccessIcon.tsx
-var import_jsx_runtime43 = require("react/jsx-runtime");
+var import_jsx_runtime42 = require("react/jsx-runtime");
 var SuccessIcon = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("svg", __spreadProps(__spreadValues({ xmlns: "http://www.w3.org/2000/svg", width: "256", height: "256", viewBox: "0 0 256 256" }, props), { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("svg", __spreadProps(__spreadValues({ xmlns: "http://www.w3.org/2000/svg", width: "256", height: "256", viewBox: "0 0 256 256" }, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
     "path",
     {
       fill: "currentColor",
@@ -3460,19 +3332,19 @@ var SuccessIcon = (props) => {
 var SuccessIcon_default = SuccessIcon;
 
 // src/components/screens/SwappingScreen.tsx
-var import_jsx_runtime44 = require("react/jsx-runtime");
+var import_jsx_runtime43 = require("react/jsx-runtime");
 var ErrorIcon = () => {
-  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("g", { clipPath: "url(#clip0_7547_116874)", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("circle", { cx: "20", cy: "20", r: "20", fill: "#F04A44" }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("g", { clipPath: "url(#clip0_7547_116874)", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("circle", { cx: "20", cy: "20", r: "20", fill: "#F04A44" }),
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
         "path",
         {
           d: "M19.8444 25.4321C18.6773 25.4332 17.7205 24.5092 17.6793 23.3431L17.1718 9.04107C17.1507 8.45326 17.3706 7.88344 17.7786 7.46056C18.1867 7.03768 18.7492 6.7998 19.337 6.7998H20.3519C20.9397 6.7998 21.5021 7.03768 21.9102 7.46056C22.3183 7.88344 22.5382 8.45329 22.5171 9.04107L22.0096 23.3431C21.9684 24.5092 21.0116 25.4332 19.8444 25.4321Z",
           fill: "white"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
         "path",
         {
           d: "M22.8893 30.4989C22.8893 32.1809 21.5266 33.5436 19.8446 33.5436C18.1626 33.5436 16.7998 32.1809 16.7998 30.4989C16.7998 28.8169 18.1626 27.4541 19.8446 27.4541C21.5266 27.4541 22.8893 28.8169 22.8893 30.4989Z",
@@ -3480,7 +3352,7 @@ var ErrorIcon = () => {
         }
       )
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("defs", { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("clipPath", { id: "clip0_7547_116874", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("rect", { width: "40", height: "40", fill: "white" }) }) })
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("defs", { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("clipPath", { id: "clip0_7547_116874", children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("rect", { width: "40", height: "40", fill: "white" }) }) })
   ] });
 };
 var SwappingScreen = () => {
@@ -3494,7 +3366,7 @@ var SwappingScreen = () => {
     refresh
   } = useSwapContext();
   const { screen: screen2, setScreen } = useScreenState();
-  const [errorMessage, setErrorMessage] = (0, import_react26.useState)("");
+  const [errorMessage, setErrorMessage] = (0, import_react25.useState)("");
   const onSwapMore = () => {
     reset();
     setErrorMessage("");
@@ -3507,7 +3379,7 @@ var SwappingScreen = () => {
     setScreen("Initial");
     refresh();
   };
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     var _a2, _b, _c, _d;
     if (screen2 !== "Swapping") return;
     if ((lastSwapResult == null ? void 0 : lastSwapResult.swapResult) && "error" in (lastSwapResult == null ? void 0 : lastSwapResult.swapResult)) {
@@ -3538,23 +3410,8 @@ var SwappingScreen = () => {
     setScreen("Initial");
   };
   const { explorer, getExplorer } = usePreferredExplorer();
-  const isLoading = (txStatus == null ? void 0 : txStatus.status) === "loading" || (txStatus == null ? void 0 : txStatus.status) === "pending-approval" || (txStatus == null ? void 0 : txStatus.status) === "sending";
-  const Content2 = () => {
-    return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "flex w-full justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "text-primary-text", children: "Swapping" }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "flex w-full justify-center items-center mt-9", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "h-16 w-16 animate-hue duration-100", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(JupiterLogo_default, { width: 64, height: 64 }) }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "flex flex-col w-full justify-center items-center px-5 mt-7", children: isLoading && /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex items-center w-full rounded-xl p-4 bg-module mb-2", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Spinner_default, { spinnerColor: "white" }),
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "ml-4 flex w-full justify-between", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("span", { className: "text-primary-text text-sm", children: [
-          txStatus.status === "loading" && "Preparing transactions",
-          txStatus.status === "pending-approval" && "Pending Approval",
-          txStatus.status === "sending" && "Swapping"
-        ] }) })
-      ] }) })
-    ] });
-  };
   const SuccessContent = () => {
-    const { inputAmount, outputAmount, explorerLink } = (0, import_react26.useMemo)(() => {
+    const { inputAmount, outputAmount, explorerLink } = (0, import_react25.useMemo)(() => {
       return {
         inputAmount: (lastSwapResult == null ? void 0 : lastSwapResult.swapResult) && "inputAmount" in (lastSwapResult == null ? void 0 : lastSwapResult.swapResult) ? lastSwapResult == null ? void 0 : lastSwapResult.swapResult.inputAmount : 0,
         outputAmount: (lastSwapResult == null ? void 0 : lastSwapResult.swapResult) && "outputAmount" in (lastSwapResult == null ? void 0 : lastSwapResult.swapResult) ? lastSwapResult == null ? void 0 : lastSwapResult.swapResult.outputAmount : 0,
@@ -3564,28 +3421,28 @@ var SwappingScreen = () => {
     if (!fromTokenInfo || !toTokenInfo || !(lastSwapResult == null ? void 0 : lastSwapResult.quoteReponse)) {
       return null;
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "flex justify-center mt-8", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: " flex justify-center relative  items-center", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "bg-success bg-opacity-[15%]  animate-pulse  h-[60px] w-[60px] rounded-full" }),
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "rounded-full absolute  justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(SuccessIcon_default, { className: "text-success", height: 56, width: 56 }) })
+    return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(import_jsx_runtime43.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "flex justify-center mt-8", children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: " flex justify-center relative  items-center", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "bg-success bg-opacity-[15%]  animate-pulse  h-[60px] w-[60px] rounded-full" }),
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "rounded-full absolute  justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(SuccessIcon_default, { className: "text-success", height: 56, width: 56 }) })
       ] }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex flex-col justify-center items-center gap-y-2", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "mt-2 flex flex-col items-center justify-center text-center px-4", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("p", { className: "text-xs font-semibold text-primary-text", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "flex flex-col justify-center items-center gap-y-2", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "mt-2 flex flex-col items-center justify-center text-center px-4", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("p", { className: "text-xs font-semibold text-primary-text", children: [
             "Swapped ",
             readableValue(inputAmount, fromTokenInfo.decimals),
             " ",
             fromTokenInfo.symbol,
             " to"
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("p", { className: "text-2xl font-semibold text-primary-text", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("p", { className: "text-2xl font-semibold text-primary-text", children: [
             readableValue(outputAmount, toTokenInfo.decimals),
             " ",
             toTokenInfo.symbol
           ] })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: " bg-module rounded-xl overflow-y-auto w-full webkit-scrollbar py-3 max-h-[260px]  px-3", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: " bg-module rounded-xl overflow-y-auto w-full webkit-scrollbar py-3 max-h-[260px]  px-3", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
             PriceInfo_default,
             {
               quoteResponse: lastSwapResult == null ? void 0 : lastSwapResult.quoteReponse,
@@ -3595,9 +3452,9 @@ var SwappingScreen = () => {
               containerClassName: " border-none mt-0"
             }
           ),
-          explorerLink && /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex items-center justify-between text-xs text-primary-text/50  mt-4", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { children: "Transaction" }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(
+          explorerLink && /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "flex items-center justify-between text-xs text-primary-text/50  mt-4", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { children: "Transaction" }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(
               "a",
               {
                 href: explorerLink,
@@ -3613,73 +3470,72 @@ var SwappingScreen = () => {
           ] })
         ] })
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "pb-4 flex space-x-2", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "pb-4 flex space-x-2", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
           JupButton_default,
           {
             size: "lg",
             className: "w-full mt-4 disabled:opacity-50 !text-uiv2-text/75 leading-none !max-h-14 bg-primary",
             onClick: onSwapMore,
-            children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { className: "text-sm", children: "Swap More" }) })
+            children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { className: "text-sm", children: "Swap More" }) })
           }
         ),
-        displayMode !== "integrated" ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+        displayMode !== "integrated" ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
           JupButton_default,
           {
             size: "lg",
             className: "w-full mt-4 disabled:opacity-50 leading-none !max-h-14 text-primary-text bg-interactive",
             onClick: onClose,
-            children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { className: "text-sm", children: "Close" })
+            children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { className: "text-sm", children: "Close" })
           }
         ) : null
       ] })
     ] });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex flex-col h-full w-full px-2", children: [
-    errorMessage || (txStatus == null ? void 0 : txStatus.status) === "fail" ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex flex-col items-center justify-center text-center mt-12", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(ErrorIcon, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("p", { className: "text-primary-text mt-2", children: "Swap Failed" }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("p", { className: "text-primary-text/50 text-xs mt-2", children: "We were unable to complete the swap, please try again." }),
-      errorMessage ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("p", { className: "text-primary-text/50 text-xs mt-2 break-all", children: errorMessage }) : "",
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "flex flex-col h-full w-full px-2", children: [
+    errorMessage || (txStatus == null ? void 0 : txStatus.status) === "fail" ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "flex flex-col items-center justify-center text-center mt-12", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ErrorIcon, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "text-primary-text mt-2", children: "Swap Failed" }),
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "text-primary-text/50 text-xs mt-2", children: "We were unable to complete the swap, please try again." }),
+      errorMessage ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "text-primary-text/50 text-xs mt-2 break-all", children: errorMessage }) : "",
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
         JupButton_default,
         {
           size: "lg",
           className: "w-full mt-6 disabled:opacity-50 !text-uiv2-text/75 leading-none !max-h-14 bg-primary",
           onClick: onGoBack,
-          children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { children: "Retry" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { children: "Retry" })
         }
       )
     ] }) }) : null,
-    !errorMessage && (txStatus == null ? void 0 : txStatus.status) === "timeout" ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: "flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex flex-col items-center justify-center text-center mt-12", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(ErrorIcon, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("p", { className: "text-primary-text mt-2", children: "Transaction timed-out" }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("p", { className: "text-primary-text/50 text-xs mt-2", children: "We were unable to complete the swap, please try again." }),
-      errorMessage ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("p", { className: "text-primary-text/50 text-xs mt-2", children: errorMessage }) : "",
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+    !errorMessage && (txStatus == null ? void 0 : txStatus.status) === "timeout" ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "flex flex-col items-center justify-center text-center mt-12", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(ErrorIcon, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "text-primary-text mt-2", children: "Transaction timed-out" }),
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "text-primary-text/50 text-xs mt-2", children: "We were unable to complete the swap, please try again." }),
+      errorMessage ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "text-primary-text/50 text-xs mt-2", children: errorMessage }) : "",
+      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
         JupButton_default,
         {
           size: "lg",
           className: "w-full mt-6 disabled:opacity-50 !text-uiv2-text/75 leading-none !max-h-14 bg-primary",
           onClick: onGoBack,
-          children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { children: "Retry" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { children: "Retry" })
         }
       )
     ] }) }) : null,
-    !errorMessage && isLoading ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Content2, {}) : null,
-    !errorMessage && (txStatus == null ? void 0 : txStatus.status) === "success" ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(SuccessContent, {}) : null
+    !errorMessage && (txStatus == null ? void 0 : txStatus.status) === "success" ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(SuccessContent, {}) : null
   ] });
 };
 var SwappingScreen_default = SwappingScreen;
 
 // src/components/screens/WalletScreen.tsx
 var import_wallet_adapter3 = require("@jup-ag/wallet-adapter");
-var import_react27 = require("react");
+var import_react26 = require("react");
 
 // src/icons/CloseIcon.tsx
-var import_jsx_runtime45 = require("react/jsx-runtime");
+var import_jsx_runtime44 = require("react/jsx-runtime");
 var CloseIcon = ({ width = 20, height = 20 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("svg", { width, height, viewBox: "0 0 20 21", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("svg", { width, height, viewBox: "0 0 20 21", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
     "path",
     {
       d: "M2.0336 16.2126L8.2336 10.0126L2.0336 3.81263C1.7961 3.57903 1.66172 3.25951 1.66016 2.92669C1.65938 2.59309 1.79141 2.27357 2.02734 2.03763C2.26328 1.80247 2.5828 1.67045 2.9164 1.67201C3.25 1.67357 3.56874 1.80795 3.80234 2.04623L9.99994 8.24623L16.1999 2.04623C16.4335 1.80795 16.7523 1.67357 17.0859 1.67201C17.4187 1.67045 17.739 1.80248 17.9749 2.03763C18.2109 2.27357 18.3429 2.59309 18.3413 2.92669C18.3406 3.25951 18.2062 3.57903 17.9687 3.81263L11.7663 10.0126L17.9663 16.2126C18.2038 16.4462 18.3382 16.7658 18.3397 17.0986C18.3405 17.4322 18.2085 17.7517 17.9725 17.9876C17.7366 18.2228 17.4171 18.3548 17.0835 18.3533C16.7499 18.3517 16.4311 18.2173 16.1975 17.979L9.99994 11.779L3.79994 17.979C3.31088 18.4611 2.52494 18.4579 2.039 17.9736C1.55384 17.4884 1.54994 16.7025 2.03119 16.2126L2.0336 16.2126Z",
@@ -3690,7 +3546,7 @@ var CloseIcon = ({ width = 20, height = 20 }) => {
 var CloseIcon_default = CloseIcon;
 
 // src/components/screens/WalletScreen.tsx
-var import_jsx_runtime46 = require("react/jsx-runtime");
+var import_jsx_runtime45 = require("react/jsx-runtime");
 var WalletScreen = () => {
   const { setScreen } = useScreenState();
   const { handleConnectClick } = (0, import_wallet_adapter3.useUnifiedWalletContext)();
@@ -3704,37 +3560,37 @@ var WalletScreen = () => {
       setScreen("Initial");
     }
   });
-  const numberOfWallets = (0, import_react27.useMemo)(() => {
+  const numberOfWallets = (0, import_react26.useMemo)(() => {
     return wallets == null ? void 0 : wallets.length;
   }, [wallets]);
-  const hasWallet = (0, import_react27.useMemo)(() => {
+  const hasWallet = (0, import_react26.useMemo)(() => {
     return numberOfWallets > 0;
   }, [numberOfWallets]);
-  return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("div", { className: "text-primary-text p-2", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("div", { className: "flex justify-between items-center mb-2 h-[28px] ", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("h1", { className: "text-sm font-bold", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "text-primary-text p-2", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "flex justify-between items-center mb-2 h-[28px] ", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("h1", { className: "text-sm font-bold", children: [
         "Available Wallets (",
         numberOfWallets,
         ")"
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
         "button",
         {
           onClick: () => setScreen("Initial"),
           className: "text-primary-text hover:text-primary-text/50 transition-colors bg-interactive rounded-full p-1",
-          children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(CloseIcon_default, { width: 15, height: 15 })
+          children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(CloseIcon_default, { width: 15, height: 15 })
         }
       )
     ] }),
-    !hasWallet && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: "text-sm font-medium text-primary-text flex items-center justify-center h-full py-4", children: "No wallet found" }),
-    /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: "grid grid-cols-2 gap-2", children: wallets == null ? void 0 : wallets.map((wallet) => /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
+    !hasWallet && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { className: "text-sm font-medium text-primary-text flex items-center justify-center h-full py-4", children: "No wallet found" }),
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { className: "grid grid-cols-2 gap-2", children: wallets == null ? void 0 : wallets.map((wallet) => /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
       "button",
       {
         onClick: (e) => handleConnect(e, wallet),
         className: `w-full text-left bg-interactive p-4 rounded-lg transition-colors ${"hover:bg-interactive/80 cursor-pointer"}`,
-        children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("div", { className: "flex items-center gap-3", children: [
-          wallet.adapter.icon && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("img", { src: wallet.adapter.icon, alt: `${wallet.adapter.name} icon`, className: "w-8 h-8" }),
-          /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("h2", { className: "text-sm font-medium", children: wallet.adapter.name }) })
+        children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "flex items-center gap-3", children: [
+          wallet.adapter.icon && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("img", { src: wallet.adapter.icon, alt: `${wallet.adapter.name} icon`, className: "w-8 h-8" }),
+          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("h2", { className: "text-sm font-medium", children: wallet.adapter.name }) })
         ] }) })
       },
       wallet.adapter.name
@@ -3744,46 +3600,46 @@ var WalletScreen = () => {
 var WalletScreen_default = WalletScreen;
 
 // src/icons/JupiterLogoV2.tsx
-var import_jsx_runtime47 = require("react/jsx-runtime");
+var import_jsx_runtime46 = require("react/jsx-runtime");
 var JupiterLogoV2 = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("svg", __spreadProps(__spreadValues({ xmlns: "http://www.w3.org/2000/svg", width: "128", height: "128", viewBox: "0 0 33 32", fill: "none" }, props), { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("g", { clipPath: "url(#clip0_11565_169621)", children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("g", { filter: "url(#filter0_d_11565_169621)", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("svg", __spreadProps(__spreadValues({ xmlns: "http://www.w3.org/2000/svg", width: "128", height: "128", viewBox: "0 0 33 32", fill: "none" }, props), { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("g", { clipPath: "url(#clip0_11565_169621)", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("g", { filter: "url(#filter0_d_11565_169621)", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
         "path",
         {
           d: "M3.09074 25.1666C4.44267 27.0471 6.17683 28.6205 8.1795 29.7838C10.1822 30.947 12.4081 31.6738 14.7114 31.9165C13.5264 30.1333 11.8039 28.4928 9.65354 27.2438C7.50318 25.9948 5.22592 25.3125 3.09074 25.1666Z",
           fill: "url(#paint0_linear_11565_169621)"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
         "path",
         {
           d: "M12.543 22.2705C8.40015 19.8636 3.91612 19.2502 0.707663 20.3338C1.0174 21.3575 1.42589 22.3487 1.92738 23.2934C4.71498 23.2288 7.75856 23.9859 10.5906 25.6308C13.4227 27.2757 15.5888 29.5459 16.9143 32C17.9839 31.9672 19.0479 31.8309 20.0913 31.5932C19.4426 28.2698 16.6849 24.6779 12.543 22.2705Z",
           fill: "url(#paint1_linear_11565_169621)"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
         "path",
         {
           d: "M32.2852 12.5009C31.7585 10.3584 30.8054 8.34403 29.4829 6.57804C28.1604 4.81205 26.4956 3.33067 24.5879 2.22235C22.6802 1.11403 20.5687 0.401504 18.3796 0.127309C16.1904 -0.146885 13.9684 0.0228794 11.8463 0.626465C15.3915 1.06033 19.3267 2.39122 23.1859 4.63324C27.0452 6.87525 30.1533 9.63411 32.2852 12.5009Z",
           fill: "url(#paint2_linear_11565_169621)"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
         "path",
         {
           d: "M27.1271 20.3583C25.3124 17.3446 22.2038 14.4588 18.3743 12.2342C14.5449 10.0095 10.4991 8.7388 6.98531 8.65474C3.894 8.58152 1.57389 9.48017 0.621548 11.1197C0.616125 11.1294 0.608532 11.1386 0.602566 11.1484C0.516877 11.4559 0.44312 11.7639 0.37587 12.0731C1.70568 11.5481 3.24645 11.2558 4.95969 11.2232C8.76959 11.1517 13.0334 12.3703 16.9681 14.6562C20.9027 16.9422 24.0759 20.0438 25.9003 23.3878C26.7182 24.8944 27.2285 26.3777 27.4308 27.7948C27.6662 27.5844 27.8972 27.3669 28.1212 27.1408C28.1272 27.1305 28.131 27.1196 28.1369 27.1088C29.0893 25.4677 28.721 23.0076 27.1271 20.3583Z",
           fill: "url(#paint3_linear_11565_169621)"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
         "path",
         {
           d: "M15.4609 17.2485C9.59662 13.8416 3.11626 13.3079 0 15.6855C0.00612096 16.4297 0.0630166 17.1726 0.170292 17.9091C1.08699 17.6312 2.03177 17.4562 2.98718 17.3874C6.46952 17.1254 10.3087 18.0957 13.7927 20.1207C17.2766 22.1458 20.023 25.0018 21.5209 28.1543C21.935 29.018 22.2508 29.9254 22.4624 30.8595C23.1555 30.5878 23.8294 30.2694 24.4794 29.9066C25.0011 26.0213 21.3268 20.656 15.4609 17.2485Z",
           fill: "url(#paint4_linear_11565_169621)"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
         "path",
         {
           d: "M30.1434 15.3141C28.3082 12.3036 25.1724 9.40969 21.3158 7.17039C17.4593 4.93109 13.3977 3.64033 9.87257 3.53674C7.1853 3.45919 5.10382 4.11053 4.02457 5.34109C8.50588 4.58182 14.4168 5.85794 20.146 9.18625C25.8753 12.5146 29.9135 17.0181 31.4722 21.2868C32.0064 19.7406 31.5416 17.6098 30.1434 15.3141Z",
@@ -3791,8 +3647,8 @@ var JupiterLogoV2 = (props) => {
         }
       )
     ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("defs", { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+    /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("defs", { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "filter",
         {
           id: "filter0_d_11565_169621",
@@ -3803,8 +3659,8 @@ var JupiterLogoV2 = (props) => {
           filterUnits: "userSpaceOnUse",
           colorInterpolationFilters: "sRGB",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feFlood", { floodOpacity: "0", result: "BackgroundImageFix" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feFlood", { floodOpacity: "0", result: "BackgroundImageFix" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
               "feColorMatrix",
               {
                 in: "SourceAlpha",
@@ -3813,16 +3669,16 @@ var JupiterLogoV2 = (props) => {
                 result: "hardAlpha"
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feOffset", { dy: "2.27449" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feGaussianBlur", { stdDeviation: "11.3724" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feComposite", { in2: "hardAlpha", operator: "out" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feColorMatrix", { type: "matrix", values: "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feBlend", { mode: "normal", in2: "BackgroundImageFix", result: "effect1_dropShadow_11565_169621" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("feBlend", { mode: "normal", in: "SourceGraphic", in2: "effect1_dropShadow_11565_169621", result: "shape" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feOffset", { dy: "2.27449" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feGaussianBlur", { stdDeviation: "11.3724" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feComposite", { in2: "hardAlpha", operator: "out" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feColorMatrix", { type: "matrix", values: "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feBlend", { mode: "normal", in2: "BackgroundImageFix", result: "effect1_dropShadow_11565_169621" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("feBlend", { mode: "normal", in: "SourceGraphic", in2: "effect1_dropShadow_11565_169621", result: "shape" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "linearGradient",
         {
           id: "paint0_linear_11565_169621",
@@ -3832,12 +3688,12 @@ var JupiterLogoV2 = (props) => {
           y2: "32",
           gradientUnits: "userSpaceOnUse",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "1", stopColor: "currentColor" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "1", stopColor: "currentColor" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "linearGradient",
         {
           id: "paint1_linear_11565_169621",
@@ -3847,12 +3703,12 @@ var JupiterLogoV2 = (props) => {
           y2: "32",
           gradientUnits: "userSpaceOnUse",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "1", stopColor: "currentColor" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "1", stopColor: "currentColor" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "linearGradient",
         {
           id: "paint2_linear_11565_169621",
@@ -3862,12 +3718,12 @@ var JupiterLogoV2 = (props) => {
           y2: "32",
           gradientUnits: "userSpaceOnUse",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "1", stopColor: "currentColor" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "1", stopColor: "currentColor" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "linearGradient",
         {
           id: "paint3_linear_11565_169621",
@@ -3877,12 +3733,12 @@ var JupiterLogoV2 = (props) => {
           y2: "32",
           gradientUnits: "userSpaceOnUse",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "1", stopColor: "currentColor" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "1", stopColor: "currentColor" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "linearGradient",
         {
           id: "paint4_linear_11565_169621",
@@ -3892,12 +3748,12 @@ var JupiterLogoV2 = (props) => {
           y2: "32",
           gradientUnits: "userSpaceOnUse",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "1", stopColor: "currentColor" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "1", stopColor: "currentColor" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
         "linearGradient",
         {
           id: "paint5_linear_11565_169621",
@@ -3907,50 +3763,49 @@ var JupiterLogoV2 = (props) => {
           y2: "32",
           gradientUnits: "userSpaceOnUse",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
-            /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("stop", { offset: "1", stopColor: "currentColor" })
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "0.0001", stopColor: "currentColor" }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("stop", { offset: "1", stopColor: "currentColor" })
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("clipPath", { id: "clip0_11565_169621", children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("rect", { width: "32.2852", height: "32", fill: "white" }) })
+      /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("clipPath", { id: "clip0_11565_169621", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("rect", { width: "32.2852", height: "32", fill: "white" }) })
     ] })
   ] }));
 };
 var JupiterLogoV2_default = JupiterLogoV2;
 
 // src/components/Jupiter.tsx
-var import_jsx_runtime48 = require("react/jsx-runtime");
+var import_jsx_runtime47 = require("react/jsx-runtime");
 var Content = () => {
   const { screen: screen2 } = useScreenState();
-  return /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { id: "jupiter-plugin", className: " h-full bg-background relative flex flex-col justify-between", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { children: [
-      screen2 === "Initial" ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Header_default, {}),
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(InitialScreen_default, {})
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { id: "jupiter-plugin", className: " h-full bg-background relative flex flex-col justify-between", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { children: [
+      screen2 === "Initial" ? /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(import_jsx_runtime47.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Header_default, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(InitialScreen_default, {})
       ] }) : null,
-      screen2 === "Confirmation" ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ReviewOrderScreen_default, {}) : null,
-      screen2 === "Swapping" ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(SwappingScreen_default, {}) : null,
-      screen2 === "Wallet" ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(WalletScreen_default, {}) : null
+      screen2 === "Swapping" ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(SwappingScreen_default, {}) : null,
+      screen2 === "Wallet" ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(WalletScreen_default, {}) : null
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("span", { className: "text-primary-text/50 text-xs p-2 flex-row flex gap-1  justify-center", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("span", { className: "text-primary-text/50 text-xs p-2 flex-row flex gap-1  justify-center", children: [
       "Powered by",
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("a", { href: "https://jup.ag", target: "_blank", rel: "noreferrer noopener", className: "flex items-center gap-1 ", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(JupiterLogoV2_default, { className: "text-primary-text/50", width: 15, height: 15 }),
+      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("a", { href: "https://jup.ag", target: "_blank", rel: "noreferrer noopener", className: "flex items-center gap-1 ", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(JupiterLogoV2_default, { className: "text-primary-text/50", width: 15, height: 15 }),
         "Jupiter"
       ] })
     ] })
   ] });
 };
 var JupiterApp = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(SwapContextProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(BrandingProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Content, {}) })) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(SwapContextProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(BrandingProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Content, {}) })) }));
 };
 var Jupiter_default = JupiterApp;
 
 // src/contexts/ContextProvider.tsx
 var import_wallet_adapter4 = require("@jup-ag/wallet-adapter");
-var import_react28 = __toESM(require("react"));
-var import_react29 = require("react");
-var import_jsx_runtime49 = require("react/jsx-runtime");
+var import_react27 = __toESM(require("react"));
+var import_react28 = require("react");
+var import_jsx_runtime48 = require("react/jsx-runtime");
 var noop = () => {
 };
 var WalletContextProvider = ({
@@ -3961,18 +3816,18 @@ var WalletContextProvider = ({
     if (typeof window === "undefined") return void 0;
     return window.Jupiter.enableWalletPassthrough;
   })();
-  const wallets = (0, import_react29.useMemo)(() => {
+  const wallets = (0, import_react28.useMemo)(() => {
     if (enableWalletPassthrough) {
       return [];
     }
     return [];
   }, [enableWalletPassthrough]);
-  const [showWalletStatus, setShowWalletStatus] = (0, import_react28.useState)({
+  const [showWalletStatus, setShowWalletStatus] = (0, import_react27.useState)({
     show: false,
     message: ""
   });
-  const ShouldWrapWalletProvider = (0, import_react29.useMemo)(() => {
-    return enableWalletPassthrough ? import_react28.default.Fragment : ({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+  const ShouldWrapWalletProvider = (0, import_react28.useMemo)(() => {
+    return enableWalletPassthrough ? import_react27.default.Fragment : ({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
       import_wallet_adapter4.UnifiedWalletProvider,
       {
         wallets,
@@ -3994,11 +3849,11 @@ var WalletContextProvider = ({
             onNotInstalled: ({ walletName, metadata }) => {
               setShowWalletStatus({
                 show: true,
-                message: /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("p", { className: "space-y-1", children: [
+                message: /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("p", { className: "space-y-1", children: [
                   walletName,
                   " is not installed.",
-                  /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("p", { className: "space-x-1", children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(
+                  /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("p", { className: "space-x-1", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(
                       "a",
                       {
                         className: "underline font-semibold",
@@ -4012,7 +3867,7 @@ var WalletContextProvider = ({
                         ]
                       }
                     ),
-                    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("span", { children: "to install it." })
+                    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("span", { children: "to install it." })
                   ] })
                 ] })
               });
@@ -4030,27 +3885,27 @@ var WalletContextProvider = ({
       }
     );
   }, [autoConnect, enableWalletPassthrough, wallets]);
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(import_jsx_runtime49.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ShouldWrapWalletProvider, { children }),
-    showWalletStatus.show && showWalletStatus.message ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("div", { className: "absolute bottom-2 w-full px-2", children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("div", { className: "w-full h-full bg-white/10 rounded-lg p-2 text-warning text-xs", children: showWalletStatus.message }) }) : null
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ShouldWrapWalletProvider, { children }),
+    showWalletStatus.show && showWalletStatus.message ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { className: "absolute bottom-2 w-full px-2", children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { className: "w-full h-full bg-white/10 rounded-lg p-2 text-warning text-xs", children: showWalletStatus.message }) }) : null
   ] });
 };
 var ContextProvider = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_jsx_runtime49.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(WalletContextProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(PreferredExplorerProvider, { defaultExplorer: props.defaultExplorer, children: props.children }) })) });
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(import_jsx_runtime48.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(WalletContextProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(PreferredExplorerProvider, { defaultExplorer: props.defaultExplorer, children: props.children }) })) });
 };
 
 // src/index.tsx
-var import_react_query10 = require("@tanstack/react-query");
-var import_react30 = require("react");
-var import_jsx_runtime50 = require("react/jsx-runtime");
+var import_react_query11 = require("@tanstack/react-query");
+var import_react29 = require("react");
+var import_jsx_runtime49 = require("react/jsx-runtime");
 var App = () => {
-  const queryClient = (0, import_react30.useMemo)(() => new import_react_query10.QueryClient(), []);
+  const queryClient = (0, import_react29.useMemo)(() => new import_react_query11.QueryClient(), []);
   const [props] = (0, import_jotai4.useAtom)(appProps);
   if (!props) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_react_query10.QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ContextProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(WalletPassthroughProvider_default, { children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ScreenProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Jupiter_default, __spreadValues({}, props)) }) }) })) });
+  return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_query11.QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ContextProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(WalletPassthroughProvider_default, { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ScreenProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Jupiter_default, __spreadValues({}, props)) }) }) })) });
 };
 var RenderJupiter = () => {
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_jotai4.Provider, { store: typeof window !== "undefined" ? window.Jupiter.store : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(App, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_jotai4.Provider, { store: typeof window !== "undefined" ? window.Jupiter.store : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(App, {}) });
 };
 
 // src/npmlibary.tsx