@jup-ag/plugin 1.0.6 → 1.0.8

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.6",
+      version: "1.0.8",
       private: false,
       license: "MIT",
       scripts: {
@@ -1518,7 +1518,7 @@ var Header = () => {
 var Header_default = Header;
 
 // src/components/screens/InitialScreen.tsx
-var import_react24 = require("react");
+var import_react25 = require("react");
 
 // src/components/Form.tsx
 var import_react19 = require("react");
@@ -2360,7 +2360,6 @@ var JupShield = ({ tokenAddress }) => {
 var JupShield_default = JupShield;
 
 // src/queries/useUltraSwapMutation.ts
-var import_wallet_adapter2 = require("@jup-ag/wallet-adapter");
 var import_react_query5 = require("@tanstack/react-query");
 var import_buffer = require("buffer");
 var import_web34 = require("@solana/web3.js");
@@ -2441,8 +2440,9 @@ function useUltraSwapMutation() {
     }),
     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";
+      const { name } = error;
+      if (name === "WalletSignTransactionError") {
+        const message = "Transaction cancelled";
         setLastSwapResult({
           swapResult: {
             error: new TransactionError(message)
@@ -2460,7 +2460,7 @@ function useUltraSwapMutation() {
         });
         return;
       }
-      if ("json" in error) {
+      if (typeof error === "object" && error !== null && "json" in error) {
         const json = yield error.json();
         setLastSwapResult({
           swapResult: {
@@ -2472,7 +2472,14 @@ function useUltraSwapMutation() {
           txid: json.txid || "",
           status: "fail"
         });
+        return;
       }
+      setLastSwapResult({
+        swapResult: {
+          error: new TransactionError("Unknown error")
+        },
+        quoteReponse: quoteResponseMeta
+      });
     })
   });
 }
@@ -2817,7 +2824,7 @@ var Form = ({ setSelectPairSelector }) => {
 var Form_default = Form;
 
 // src/components/FormPairSelector.tsx
-var import_react23 = require("react");
+var import_react24 = require("react");
 var import_react_virtualized_auto_sizer = __toESM(require("react-virtualized-auto-sizer"));
 var import_react_window = require("react-window");
 
@@ -3026,7 +3033,7 @@ function useLstApyFetcher() {
   return (0, import_react_query6.useQuery)({
     queryKey: ["lst-apy"],
     queryFn: () => __async(this, null, function* () {
-      const lstApy = yield fetch(`https://worker.jup.ag/lst-apys`);
+      const lstApy = yield fetch(`https://worker.jup.ag/lst-apys-v2`);
       const apyResult = yield lstApy.json();
       return apyResult;
     }),
@@ -3040,77 +3047,39 @@ function useLstApyFetcher() {
 // src/components/FormPairRow.tsx
 var import_react_query7 = require("@tanstack/react-query");
 var import_jsx_runtime39 = require("react/jsx-runtime");
+var import_react22 = require("react");
 var PAIR_ROW_HEIGHT = 72;
 var LSTTag = ({ mintAddress }) => {
   const { data: lstApy } = useLstApyFetcher();
   const apy = (0, import_react21.useMemo)(() => {
     if (!lstApy) return;
-    const value = lstApy.apys[mintAddress];
+    const value = lstApy[mintAddress];
     if (value && hasNumericValue(value)) {
       return new import_decimal8.default(value).mul(100).toDP(2).toString();
     }
     return;
   }, [lstApy, mintAddress]);
+  if (!apy) return null;
   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}%` : ""
   ] });
 };
 var MultiTags = ({ item }) => {
+  var _a2, _b;
   const { data: balances } = useBalances();
-  const isLoading = (0, import_react21.useRef)(false);
-  const isLoaded = (0, import_react21.useRef)(false);
-  const [renderedTag, setRenderedTag] = import_react21.default.useState({
-    isVerified: false,
-    isLST: false,
-    // isUnknown: false,
-    isToken2022: false,
-    isFrozen: false
-  });
-  (0, import_react21.useEffect)(() => {
-    if (isLoaded.current || isLoading.current) return;
-    isLoading.current = true;
-    setTimeout(() => {
-      var _a2, _b;
-      const result = {
-        isVerified: checkIsStrictOrVerified(item),
-        isLST: Boolean((_a2 = item.tags) == null ? void 0 : _a2.includes("lst")),
-        // isUnknown: checkIsUnknownToken(item),
-        isToken2022: Boolean(checkIsToken2022(item)),
-        isFrozen: ((_b = balances == null ? void 0 : balances[item.id]) == null ? void 0 : _b.isFrozen) || false
-      };
-      setRenderedTag(result);
-      isLoading.current = false;
-      isLoaded.current = true;
-    }, 0);
-  }, []);
-  const remainingTags = [];
-  if (!renderedTag) return null;
-  const { isToken2022, isFrozen, isLST } = renderedTag;
+  const isFrozen = ((_a2 = balances == null ? void 0 : balances[item.id]) == null ? void 0 : _a2.isFrozen) || false;
+  const isToken2022 = checkIsToken2022(item);
+  const isLST = (_b = item.tags) == null ? void 0 : _b.includes("lst");
   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",
-        children: tag
-      },
-      idx
-    )),
     isLST && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(LSTTag, { mintAddress: item.id })
-  ] });
+  ] }, item.id);
 };
 var FormPairRow = (props) => {
   var _a2;
-  const {
-    item,
-    style,
-    onSubmit,
-    suppressCloseModal,
-    showExplorer = true,
-    enableUnknownTokenWarning = true
-  } = props;
+  const { item, style, onSubmit, suppressCloseModal, showExplorer = true, enableUnknownTokenWarning = true } = props;
   const queryClient = (0, import_react_query7.useQueryClient)();
   const onClick = import_react21.default.useCallback(() => {
     queryClient.setQueryData([...ASSET_QUERY_KEY, item.id], [item]);
@@ -3141,7 +3110,7 @@ var FormPairRow = (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))
+          /* @__PURE__ */ (0, import_react22.createElement)(MultiTags, __spreadProps(__spreadValues({}, props), { key: item.id }))
         ] })
       ] })
     }
@@ -3150,12 +3119,12 @@ var FormPairRow = (props) => {
 var FormPairRow_default = FormPairRow;
 
 // src/hooks/useSearch.ts
-var import_react22 = require("react");
+var import_react23 = require("react");
 var import_react_query8 = require("@tanstack/react-query");
 var CHUNK_SIZE = 100;
 var useSearch = (mintAddresses, options = {}) => {
   var _a2, _b;
-  const mintAddressesString = (0, import_react22.useMemo)(() => mintAddresses.join(","), [mintAddresses]);
+  const mintAddressesString = (0, import_react23.useMemo)(() => mintAddresses.join(","), [mintAddresses]);
   return (0, import_react_query8.useQuery)({
     queryKey: ["search", mintAddressesString],
     queryFn: () => __async(void 0, null, function* () {
@@ -3181,40 +3150,40 @@ var useSearch = (mintAddresses, options = {}) => {
 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) => {
+var rowRenderer = (0, import_react24.memo)((props) => {
   const { data, index, style } = props;
   const item = data.searchResult[index];
   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)("");
+  const [search, setSearch] = (0, import_react24.useState)("");
   const { data: balances = {} } = useBalances();
   const { data: blueChipTokens = [] } = useSearch([]);
   const { data: searchTokens = [], isLoading } = useSearch([search], { staleTime: 5 * 60 * 1e3 });
   const { data: userBalanceTokens = [] } = useSearch([Object.keys(balances).join(",")]);
-  const searchResult = (0, import_react23.useMemo)(() => {
+  const searchResult = (0, import_react24.useMemo)(() => {
     if (!search) {
       return sortByUserBalance([...userBalanceTokens, ...blueChipTokens], balances);
     } else {
       return sortByUserBalance(searchTokens, balances);
     }
   }, [blueChipTokens, balances, searchTokens, search, userBalanceTokens]);
-  const triggerSearch = (0, import_react23.useCallback)(
+  const triggerSearch = (0, import_react24.useCallback)(
     (0, import_lodash2.default)((value) => __async(void 0, null, function* () {
       setSearch(value);
     }), 200),
     [blueChipTokens]
   );
-  const onChange = (0, import_react23.useCallback)(
+  const onChange = (0, import_react24.useCallback)(
     (e) => {
       setSearch("");
       triggerSearch(e.target.value);
     },
     [triggerSearch]
   );
-  const listRef = (0, import_react23.createRef)();
-  const inputRef = (0, import_react23.createRef)();
-  (0, import_react23.useEffect)(() => {
+  const listRef = (0, import_react24.createRef)();
+  const inputRef = (0, import_react24.createRef)();
+  (0, import_react24.useEffect)(() => {
     var _a2;
     return (_a2 = inputRef.current) == null ? void 0 : _a2.focus();
   }, [inputRef]);
@@ -3273,9 +3242,9 @@ var FormPairSelector_default = FormPairSelector;
 var import_jsx_runtime41 = require("react/jsx-runtime");
 var InitialScreen = () => {
   const { form, setForm, loading } = useSwapContext();
-  const [isDisabled, setIsDisabled] = (0, import_react24.useState)(false);
-  const [selectPairSelector, setSelectPairSelector] = (0, import_react24.useState)(null);
-  const onSelectMint = (0, import_react24.useCallback)(
+  const [isDisabled, setIsDisabled] = (0, import_react25.useState)(false);
+  const [selectPairSelector, setSelectPairSelector] = (0, import_react25.useState)(null);
+  const onSelectMint = (0, import_react25.useCallback)(
     (tokenInfo) => __async(void 0, null, function* () {
       if (selectPairSelector === "fromMint") {
         setForm((prev) => __spreadValues(__spreadProps(__spreadValues({}, prev), {
@@ -3308,7 +3277,7 @@ var InitialScreen = () => {
 var InitialScreen_default = InitialScreen;
 
 // src/components/screens/SwappingScreen.tsx
-var import_react25 = require("react");
+var import_react26 = require("react");
 
 // src/icons/SuccessIcon.tsx
 var import_jsx_runtime42 = require("react/jsx-runtime");
@@ -3358,7 +3327,7 @@ var SwappingScreen = () => {
     refresh
   } = useSwapContext();
   const { screen: screen2, setScreen } = useScreenState();
-  const [errorMessage, setErrorMessage] = (0, import_react25.useState)("");
+  const [errorMessage, setErrorMessage] = (0, import_react26.useState)("");
   const onSwapMore = () => {
     reset();
     setErrorMessage("");
@@ -3371,7 +3340,7 @@ var SwappingScreen = () => {
     setScreen("Initial");
     refresh();
   };
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.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)) {
@@ -3403,7 +3372,7 @@ var SwappingScreen = () => {
   };
   const { explorer, getExplorer } = usePreferredExplorer();
   const SuccessContent = () => {
-    const { inputAmount, outputAmount, explorerLink } = (0, import_react25.useMemo)(() => {
+    const { inputAmount, outputAmount, explorerLink } = (0, import_react26.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,
@@ -3521,8 +3490,8 @@ var SwappingScreen = () => {
 var SwappingScreen_default = SwappingScreen;
 
 // src/components/screens/WalletScreen.tsx
-var import_wallet_adapter3 = require("@jup-ag/wallet-adapter");
-var import_react26 = require("react");
+var import_wallet_adapter2 = require("@jup-ag/wallet-adapter");
+var import_react27 = require("react");
 
 // src/icons/CloseIcon.tsx
 var import_jsx_runtime44 = require("react/jsx-runtime");
@@ -3541,7 +3510,7 @@ var CloseIcon_default = CloseIcon;
 var import_jsx_runtime45 = require("react/jsx-runtime");
 var WalletScreen = () => {
   const { setScreen } = useScreenState();
-  const { handleConnectClick } = (0, import_wallet_adapter3.useUnifiedWalletContext)();
+  const { handleConnectClick } = (0, import_wallet_adapter2.useUnifiedWalletContext)();
   const { wallets } = useWalletPassThrough();
   const handleConnect = (event, wallet) => __async(void 0, null, function* () {
     try {
@@ -3552,10 +3521,10 @@ var WalletScreen = () => {
       setScreen("Initial");
     }
   });
-  const numberOfWallets = (0, import_react26.useMemo)(() => {
+  const numberOfWallets = (0, import_react27.useMemo)(() => {
     return wallets == null ? void 0 : wallets.length;
   }, [wallets]);
-  const hasWallet = (0, import_react26.useMemo)(() => {
+  const hasWallet = (0, import_react27.useMemo)(() => {
     return numberOfWallets > 0;
   }, [numberOfWallets]);
   return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "text-primary-text p-2", children: [
@@ -3794,9 +3763,9 @@ var JupiterApp = (props) => {
 var Jupiter_default = JupiterApp;
 
 // src/contexts/ContextProvider.tsx
-var import_wallet_adapter4 = require("@jup-ag/wallet-adapter");
-var import_react27 = __toESM(require("react"));
-var import_react28 = require("react");
+var import_wallet_adapter3 = require("@jup-ag/wallet-adapter");
+var import_react28 = __toESM(require("react"));
+var import_react29 = require("react");
 var import_jsx_runtime48 = require("react/jsx-runtime");
 var noop = () => {
 };
@@ -3808,19 +3777,19 @@ var WalletContextProvider = ({
     if (typeof window === "undefined") return void 0;
     return window.Jupiter.enableWalletPassthrough;
   })();
-  const wallets = (0, import_react28.useMemo)(() => {
+  const wallets = (0, import_react29.useMemo)(() => {
     if (enableWalletPassthrough) {
       return [];
     }
     return [];
   }, [enableWalletPassthrough]);
-  const [showWalletStatus, setShowWalletStatus] = (0, import_react27.useState)({
+  const [showWalletStatus, setShowWalletStatus] = (0, import_react28.useState)({
     show: false,
     message: ""
   });
-  const ShouldWrapWalletProvider = (0, import_react28.useMemo)(() => {
-    return enableWalletPassthrough ? import_react27.default.Fragment : ({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
-      import_wallet_adapter4.UnifiedWalletProvider,
+  const ShouldWrapWalletProvider = (0, import_react29.useMemo)(() => {
+    return enableWalletPassthrough ? import_react28.default.Fragment : ({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+      import_wallet_adapter3.UnifiedWalletProvider,
       {
         wallets,
         config: {
@@ -3888,10 +3857,10 @@ var ContextProvider = (props) => {
 
 // src/index.tsx
 var import_react_query9 = require("@tanstack/react-query");
-var import_react29 = require("react");
+var import_react30 = require("react");
 var import_jsx_runtime49 = require("react/jsx-runtime");
 var App = () => {
-  const queryClient = (0, import_react29.useMemo)(() => new import_react_query9.QueryClient(), []);
+  const queryClient = (0, import_react30.useMemo)(() => new import_react_query9.QueryClient(), []);
   const [props] = (0, import_jotai4.useAtom)(appProps);
   if (!props) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_query9.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)) }) }) })) });