@skip-go/widget 3.12.10 → 3.12.11

package/build/{index-DUKz-PJN.js → index-CSCk_22k.js}

@@ -45486,7 +45486,7 @@ function walletConnect(parameters) {
         const optionalChains = config2.chains.map((x2) => x2.id);
         if (!optionalChains.length)
           return;
-        const { EthereumProvider } = await import("./index.es-BzNcdd4e.js");
+        const { EthereumProvider } = await import("./index.es-BhgJ58L0.js");
         return await EthereumProvider.init({
           ...parameters,
           disableProviderPing: true,
@@ -48069,9 +48069,9 @@ const useGetAccount = () => {
   const getAccount = useCallback(
     // if checkChainType is true, it only check wallet connected no chainId is dependent
     (chainId, checkChainType, chainType) => {
-      var _a;
       if (!chainId) return;
-      chainType ?? (chainType = (_a = chains2 == null ? void 0 : chains2.find((c) => c.chainId === chainId)) == null ? void 0 : _a.chainType);
+      const chain = chains2 == null ? void 0 : chains2.find((c) => c.chainId === chainId);
+      chainType ?? (chainType = chain == null ? void 0 : chain.chainType);
       if (connectedAddress && connectedAddress[chainId]) {
         return {
           address: connectedAddress[chainId],
@@ -48108,16 +48108,16 @@ const useGetAccount = () => {
           if (!evmAccount.address) return;
           if (!evmAccount.connector) return;
           const getLogo = () => {
-            var _a2, _b, _c;
-            if (((_a2 = evmAccount == null ? void 0 : evmAccount.connector) == null ? void 0 : _a2.id) === "walletConnect") {
+            var _a, _b, _c;
+            if (((_a = evmAccount == null ? void 0 : evmAccount.connector) == null ? void 0 : _a.id) === "walletConnect") {
               return (evmWallet == null ? void 0 : evmWallet.logo) ?? walletConnectLogo;
             }
             if ((_b = evmAccount == null ? void 0 : evmAccount.connector) == null ? void 0 : _b.id.includes("keplr")) {
               return getCosmosWalletInfo(WalletType.KEPLR).imgSrc;
             }
             return (_c = connectors.find((item) => {
-              var _a3;
-              return item.id === ((_a3 = evmAccount.connector) == null ? void 0 : _a3.id);
+              var _a2;
+              return item.id === ((_a2 = evmAccount.connector) == null ? void 0 : _a2.id);
             })) == null ? void 0 : _c.icon;
           };
           return {
@@ -48636,7 +48636,7 @@ function getTotalFees(fees2) {
   return {
     assetAmount: totalAsset,
     formattedAssetAmount: `${totalAsset.toFixed(6)} ${symbol}`,
-    formattedUsdAmount: totalUsd > 0 ? formatUSD(totalUsd.toString()) : void 0
+    formattedUsdAmount: totalUsd > 0 ? formatUSD(totalUsd.toString()) : "< $0.01"
   };
 }
 const QuestionMarkIcon = ({
@@ -49386,7 +49386,7 @@ const SwapPageAssetChainInput = ({
   isWaitingToUpdateInputValue,
   badPriceWarning,
   disabled,
-  feeAmountUsd,
+  feeLabel,
   feeWarning
 }) => {
   var _a;
@@ -49562,10 +49562,7 @@ const SwapPageAssetChainInput = ({
             "%"
           ] })
         ] }) : /* @__PURE__ */ jsx(SmallText, { children: usdValue && formatUSD(usdValue) }),
-        feeAmountUsd && /* @__PURE__ */ jsx(Row, { align: "center", gap: 4, children: /* @__PURE__ */ jsxs(SmallText, { color: feeColor, children: [
-          feeAmountUsd,
-          " in fees"
-        ] }) })
+        usdValue && feeLabel && /* @__PURE__ */ jsx(Row, { align: "center", gap: 4, children: /* @__PURE__ */ jsx(SmallText, { color: feeColor, children: feeLabel }) })
       ] }),
       (assetDetails == null ? void 0 : assetDetails.chainName) ? /* @__PURE__ */ jsx(
         StyledOnChainGhostButton,
@@ -50711,6 +50708,7 @@ const SwapExecutionPageRouteSimpleRow = ({
       case "source": {
         const selected = chainAddressArray[0];
         return {
+          source: selected == null ? void 0 : selected.source,
           address: selected == null ? void 0 : selected.address,
           image: (selected == null ? void 0 : selected.source) === "wallet" && ((_a = selected == null ? void 0 : selected.wallet) == null ? void 0 : _a.walletInfo.logo) || void 0
         };
@@ -50718,6 +50716,7 @@ const SwapExecutionPageRouteSimpleRow = ({
       case "destination": {
         const selected = chainAddressArray[chainAddressArray.length - 1];
         return {
+          source: selected == null ? void 0 : selected.source,
           address: selected == null ? void 0 : selected.address,
           image: (selected == null ? void 0 : selected.source) === "wallet" && ((_b = selected == null ? void 0 : selected.wallet) == null ? void 0 : _b.walletInfo.logo) || void 0
         };
@@ -50726,10 +50725,11 @@ const SwapExecutionPageRouteSimpleRow = ({
   }, [chainAddresses, context]);
   const walletImage = useCroppedImage(source.image);
   const renderWalletImage = useMemo(() => {
+    if (source.source === "injected") return;
     if (!source.address) return;
     if (walletImage) return /* @__PURE__ */ jsx("img", { height: 12, width: 12, src: walletImage });
     return /* @__PURE__ */ jsx(SkeletonElement, { height: 12, width: 12 });
-  }, [source.address, walletImage]);
+  }, [source.address, source.source, walletImage]);
   const renderExplorerLink = useMemo(() => {
     if (!explorerLink) return;
     if (isMobileScreenSize) {
@@ -51219,6 +51219,7 @@ const useAutoSetAddress = () => {
   const [isLoading, setIsLoading] = useState(true);
   const [walletHasChanged, setWalletHasChanged] = useState(false);
   const [currentSourceWallets, setCurrentSourceWallets] = useState();
+  const [currentConnectedAddress, setCurrentConnectedAddress] = useState();
   const { createCosmosWallets } = useCreateCosmosWallets();
   const { createEvmWallets } = useCreateEvmWallets();
   const { createSolanaWallets } = useCreateSolanaWallets();
@@ -51242,9 +51243,8 @@ const useAutoSetAddress = () => {
       requiredChainAddresses.forEach(async (chainId, index) => {
         var _a2, _b2;
         const chain = chains2 == null ? void 0 : chains2.find((c) => c.chainId === chainId);
-        if (!chain) {
-          return;
-        }
+        if (!chain) return;
+        const chainType = chain.chainType;
         const showSetAddressModal = () => {
           const isSignRequired = signRequiredChains == null ? void 0 : signRequiredChains.includes(chainId);
           NiceModal.show(Modals.SetAddressModal, {
@@ -51254,14 +51254,39 @@ const useAutoSetAddress = () => {
           });
         };
         if (chainAddresses[index].source === WalletSource.Input) return;
+        const isInjectedWallet = connectedAddress == null ? void 0 : connectedAddress[chainId];
+        if (isInjectedWallet) {
+          setChainAddresses((prev2) => {
+            return {
+              ...prev2,
+              [index]: {
+                chainId,
+                address: connectedAddress == null ? void 0 : connectedAddress[chainId],
+                chainType,
+                source: WalletSource.Injected,
+                wallet: {
+                  walletName: "injected",
+                  walletPrettyName: "injected",
+                  walletChainType: chainType,
+                  walletInfo: {
+                    logo: void 0
+                  }
+                }
+              }
+            };
+          });
+          setIsLoading(false);
+          return;
+        }
         try {
-          const chainType = chain.chainType;
           const wallets = createWallets[chainType](chainId);
           const walletName = (_a2 = sourceWallet[chainType]) == null ? void 0 : _a2.walletName;
           const wallet = wallets.find((w2) => w2.walletName === walletName);
           const isSignRequired = signRequiredChains == null ? void 0 : signRequiredChains.includes(chainId);
-          const response = await ((_b2 = wallet == null ? void 0 : wallet.getAddress) == null ? void 0 : _b2.call(wallet, { signRequired: isSignRequired }));
-          const isInjectedWallet = connectedAddress == null ? void 0 : connectedAddress[chainId];
+          const response = await ((_b2 = wallet == null ? void 0 : wallet.getAddress) == null ? void 0 : _b2.call(wallet, {
+            signRequired: isSignRequired
+          }));
+          const isInjectedWallet2 = connectedAddress == null ? void 0 : connectedAddress[chainId];
           const address = (connectedAddress == null ? void 0 : connectedAddress[chainId]) ?? (response == null ? void 0 : response.address);
           if (!address) {
             throw new Error(
@@ -51286,7 +51311,7 @@ const useAutoSetAddress = () => {
                 chainId,
                 address,
                 chainType,
-                source: isInjectedWallet ? WalletSource.Injected : WalletSource.Wallet,
+                source: isInjectedWallet2 ? WalletSource.Injected : WalletSource.Wallet,
                 wallet: wallet ? {
                   walletName: wallet == null ? void 0 : wallet.walletName,
                   walletPrettyName: wallet == null ? void 0 : wallet.walletPrettyName,
@@ -51327,12 +51352,19 @@ const useAutoSetAddress = () => {
       return;
     }
     const hasWalletChanged = ((_a2 = sourceWallet.cosmos) == null ? void 0 : _a2.id) !== ((_b2 = currentSourceWallets == null ? void 0 : currentSourceWallets.cosmos) == null ? void 0 : _b2.id) || ((_c2 = sourceWallet.evm) == null ? void 0 : _c2.id) !== ((_d = currentSourceWallets == null ? void 0 : currentSourceWallets.evm) == null ? void 0 : _d.id) || ((_e2 = sourceWallet.svm) == null ? void 0 : _e2.id) !== ((_f = currentSourceWallets == null ? void 0 : currentSourceWallets.svm) == null ? void 0 : _f.id);
+    const hasConnectedAddressChanged = JSON.stringify(connectedAddress) !== JSON.stringify(currentConnectedAddress);
+    if (hasConnectedAddressChanged) {
+      setCurrentConnectedAddress(connectedAddress);
+      setWalletHasChanged(true);
+    }
     if (hasWalletChanged) {
       setCurrentSourceWallets(sourceWallet);
       setWalletHasChanged(true);
     }
   }, [
     connectRequiredChains,
+    connectedAddress,
+    currentConnectedAddress,
     (_a = currentSourceWallets == null ? void 0 : currentSourceWallets.cosmos) == null ? void 0 : _a.id,
     (_b = currentSourceWallets == null ? void 0 : currentSourceWallets.evm) == null ? void 0 : _b.id,
     (_c = currentSourceWallets == null ? void 0 : currentSourceWallets.svm) == null ? void 0 : _c.id,
@@ -52533,7 +52565,7 @@ const ConnectedWalletContent = () => {
             align: "center",
             gap: 8,
             children: [
-              walletImage ? /* @__PURE__ */ jsx("img", { style: { objectFit: "cover" }, src: walletImage, height: 16, width: 16 }) : /* @__PURE__ */ jsx(SkeletonElement, { height: 16, width: 16 }),
+              sourceAccount.wallet.name !== "injected" && (walletImage ? /* @__PURE__ */ jsx("img", { style: { objectFit: "cover" }, src: walletImage, height: 16, width: 16 }) : /* @__PURE__ */ jsx(SkeletonElement, { height: 16, width: 16 })),
               isLoading ? /* @__PURE__ */ jsx(
                 "div",
                 {
@@ -52743,7 +52775,7 @@ const useConnectToMissingCosmosChain = () => {
   return { isAskingToApproveConnection };
 };
 const SwapPage = () => {
-  var _a, _b;
+  var _a;
   const { SettingsFooter, drawerOpen } = useSettingsDrawer();
   useAtom(onRouteUpdatedEffect);
   useAtom(preloadSigningStargateClientEffect);
@@ -52890,7 +52922,14 @@ const SwapPage = () => {
     return calculatePercentageChange(route2.usdAmountIn, route2.usdAmountOut);
   }, [isWaitingForNewRoute, route2 == null ? void 0 : route2.usdAmountIn, route2 == null ? void 0 : route2.usdAmountOut]);
   const fees2 = useMemo(() => route2 ? getFeeList(route2) : [], [route2]);
-  const totalFeeUsd = (_a = getTotalFees(fees2)) == null ? void 0 : _a.formattedUsdAmount;
+  const feeLabel = useMemo(() => {
+    var _a2;
+    const formattedUsdAmount = (_a2 = getTotalFees(fees2)) == null ? void 0 : _a2.formattedUsdAmount;
+    if (formattedUsdAmount) {
+      return `${formattedUsdAmount} in fees`;
+    }
+    return "no fees";
+  }, [fees2]);
   const feeWarning = useMemo(() => {
     if (!(route2 == null ? void 0 : route2.usdAmountIn) || !(route2 == null ? void 0 : route2.usdAmountOut)) return false;
     return parseFloat(route2.usdAmountOut) <= parseFloat(route2.usdAmountIn) * 0.9;
@@ -52954,7 +52993,7 @@ const SwapPage = () => {
       return /* @__PURE__ */ jsx(MainButton, { label, disabled: true, icon: ICONS.swap, fontSize: computeFontSize(label) });
     }
     const onClick = () => {
-      var _a3, _b2;
+      var _a3, _b;
       track("swap page: continue button - clicked", {
         route: route2,
         type: isSwapOperation ? "swap" : "send",
@@ -52999,7 +53038,7 @@ const SwapPage = () => {
         });
         return;
       }
-      if (((_b2 = route2 == null ? void 0 : route2.warning) == null ? void 0 : _b2.type) === "LOW_INFO_WARNING") {
+      if (((_b = route2 == null ? void 0 : route2.warning) == null ? void 0 : _b.type) === "LOW_INFO_WARNING") {
         track("warning page: low info", { route: route2 });
         setError({
           errorWarningType: ErrorWarningType.LowInfoWarning,
@@ -53103,8 +53142,8 @@ const SwapPage = () => {
               usdValue: route2 == null ? void 0 : route2.usdAmountOut,
               value: destinationAsset == null ? void 0 : destinationAsset.amount,
               priceChangePercentage: Number(priceChangePercentage),
-              badPriceWarning: ((_b = route2 == null ? void 0 : route2.warning) == null ? void 0 : _b.type) === "BAD_PRICE_WARNING",
-              feeAmountUsd: totalFeeUsd,
+              badPriceWarning: ((_a = route2 == null ? void 0 : route2.warning) == null ? void 0 : _a.type) === "BAD_PRICE_WARNING",
+              feeLabel,
               feeWarning,
               onChangeValue: (v2) => {
                 track("swap page: destination asset amount input - changed", { amount: v2 });
@@ -54295,7 +54334,7 @@ const initSentry = () => {
 };
 const name = "@skip-go/widget";
 const description = "Swap widget";
-const version = "3.12.10";
+const version = "3.12.11";
 const repository = {
   url: "https://github.com/skip-mev/skip-go",
   directory: "packages/widget"

package/build/{index.es-BzNcdd4e.js → index.es-BhgJ58L0.js}

@@ -1,4 +1,4 @@
-import { g as getAugmentedNamespace, c as commonjsGlobal, a as getDefaultExportFromCjs, p as process$1 } from "./index-DUKz-PJN.js";
+import { g as getAugmentedNamespace, c as commonjsGlobal, a as getDefaultExportFromCjs, p as process$1 } from "./index-CSCk_22k.js";
 import qg, { PROPOSAL_EXPIRY_MESSAGE } from "@walletconnect/sign-client";
 const global = globalThis || void 0 || self;
 var buffer$1 = {};

package/build/index.js

@@ -1,4 +1,4 @@
-import { W, d, l, o, r, s } from "./index-DUKz-PJN.js";
+import { W, d, l, o, r, s } from "./index-CSCk_22k.js";
 export {
   W as Widget,
   d as defaultTheme,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@skip-go/widget",
   "description": "Swap widget",
-  "version": "3.12.10",
+  "version": "3.12.11",
   "repository": {
     "url": "https://github.com/skip-mev/skip-go",
     "directory": "packages/widget"