@skip-go/widget 3.11.2 → 3.12.0

package/build/{index-CdsNlttQ.js → index-Bm1mrpK6.js}

@@ -1426,9 +1426,17 @@ const getBrandButtonTextColor = (color) => {
   const typeOfColor = hsp > 127.5 ? "light" : "dark";
   return typeOfColor === "light" ? "black" : "white";
 };
+const defaultBorderRadius = {
+  main: "25px",
+  selectionButton: "10px",
+  ghostButton: "30px",
+  modalContainer: "20px",
+  rowItem: "12px"
+};
 const defaultTheme = {
   brandColor: "#ff66ff",
   brandTextColor: void 0,
+  borderRadius: defaultBorderRadius,
   primary: {
     background: {
       normal: "#000000"
@@ -1462,6 +1470,7 @@ const defaultTheme = {
 const lightTheme = {
   brandColor: "#ff66ff",
   brandTextColor: void 0,
+  borderRadius: defaultBorderRadius,
   primary: {
     background: {
       normal: "#ffffff"
@@ -2215,6 +2224,10 @@ const TextButton = dt(Text).attrs({ as: "button" })`
   ${removeButtonStyles}
   cursor: pointer;
 `;
+const convertToPxValue = (value) => {
+  if (!value) return "0px";
+  return typeof value === "number" ? `${value}px` : value;
+};
 const ErrorWarningPageContent = ({
   title,
   description: description2,
@@ -2255,7 +2268,10 @@ const ErrorWarningPageContent = ({
 const StyledErrorWarningStateContainer = dt(Column)`
   width: 100%;
   height: 225px;
-  border-radius: 25px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
   ${({ backgroundColor }) => backgroundColor && `background: ${backgroundColor}`};
 `;
 const StyledErrorWarningTextInnerContainer = dt(Column)`
@@ -2402,7 +2418,10 @@ const MainButtonContainer = dt.div`
     left: 0;
     width: 100%;
     height: 100%;
-    border-radius: 25px;
+    border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
     background-color: rgba(255, 255, 255, 0);
     pointer-events: none;
     ${transition(["background-color"], "fast", "easeOut")};
@@ -2420,7 +2439,10 @@ const StyledMainButton = dt(Row).attrs({
   height: 70px;
   padding: 20px;
   width: 100%;
-  border-radius: 25px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
   overflow: hidden;
 
   &:hover {
@@ -2492,7 +2514,10 @@ const StyledOverlay$1 = dt(Row)`
   left: 2px;
   right: 0;
   width: calc(100% - 4px);
-  border-radius: 24px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
   background: ${({ theme }) => theme.primary.background.normal};
 
   @media (max-width: 767px) {
@@ -3948,11 +3973,107 @@ const getTruncatedAddress = (address, extraShort) => {
   if (extraShort) return `${address.slice(0, 6)}…${address.slice(-3)}`;
   return `${address.slice(0, 9)}…${address.slice(-5)}`;
 };
-const hasAmountChanged = (newAmount, oldAmount, decimals = DEFAULT_DECIMAL_PLACES) => {
-  const newAmountBN = new BigNumber(newAmount).decimalPlaces(decimals, BigNumber.ROUND_DOWN);
-  const oldAmountBN = new BigNumber(oldAmount).decimalPlaces(decimals, BigNumber.ROUND_DOWN);
-  return !newAmountBN.eq(oldAmountBN);
+const MAX_CACHE_ENTRIES = 20;
+const croppedImageCache = /* @__PURE__ */ new Map();
+const getCache = (url) => {
+  const entry = croppedImageCache.get(url);
+  if (entry) {
+    entry.hits += 1;
+    return entry.value;
+  }
 };
+const setCache = (url, value) => {
+  if (croppedImageCache.size >= MAX_CACHE_ENTRIES) {
+    let keyToEvict = null;
+    let lowestHits = Infinity;
+    for (const [key, entry] of croppedImageCache.entries()) {
+      if (entry.hits < lowestHits) {
+        lowestHits = entry.hits;
+        keyToEvict = key;
+      }
+    }
+    if (keyToEvict) {
+      croppedImageCache.delete(keyToEvict);
+    }
+  }
+  croppedImageCache.set(url, { value, hits: 1 });
+};
+function useCroppedImage(imageUrl) {
+  const [croppedSrc, setCroppedSrc] = useState(void 0);
+  useEffect(() => {
+    if (!imageUrl) {
+      setCroppedSrc(void 0);
+      return;
+    }
+    if (croppedImageCache.has(imageUrl)) {
+      setCroppedSrc(getCache(imageUrl));
+      return;
+    }
+    let isCancelled = false;
+    const loadImage = (url) => new Promise((resolve, reject) => {
+      const img = new Image();
+      img.crossOrigin = "anonymous";
+      img.onload = () => resolve(img);
+      img.onerror = () => reject(new Error("Failed to load image"));
+      img.src = url;
+    });
+    const cropImage = (img) => {
+      const canvas = document.createElement("canvas");
+      const ctx = canvas.getContext("2d");
+      if (!ctx) return null;
+      const { naturalWidth: width, naturalHeight: height } = img;
+      canvas.width = width;
+      canvas.height = height;
+      ctx.drawImage(img, 0, 0);
+      const imageData = ctx.getImageData(0, 0, width, height);
+      const pixels = imageData.data;
+      let top = null;
+      let left = null;
+      let right = null;
+      let bottom = null;
+      for (let y2 = 0; y2 < height; y2++) {
+        for (let x2 = 0; x2 < width; x2++) {
+          const alpha = pixels[(y2 * width + x2) * 4 + 3];
+          if (alpha !== 0) {
+            if (top === null) top = y2;
+            if (left === null || x2 < left) left = x2;
+            if (right === null || x2 > right) right = x2;
+            bottom = y2;
+          }
+        }
+      }
+      if (top === null || left === null || right === null || bottom === null) {
+        console.warn("Image is fully transparent.");
+        return null;
+      }
+      const trimmedWidth = right - left + 1;
+      const trimmedHeight = bottom - top + 1;
+      const trimmed = ctx.getImageData(left, top, trimmedWidth, trimmedHeight);
+      canvas.width = trimmedWidth;
+      canvas.height = trimmedHeight;
+      const newCtx = canvas.getContext("2d");
+      if (!newCtx) return null;
+      newCtx.putImageData(trimmed, 0, 0);
+      return canvas.toDataURL();
+    };
+    setCroppedSrc(void 0);
+    loadImage(imageUrl).then((img) => {
+      if (isCancelled) return;
+      const cropped = cropImage(img) ?? imageUrl;
+      setCache(imageUrl, cropped);
+      setCroppedSrc(cropped);
+    }).catch((err) => {
+      console.error("Image cropping failed:", err);
+      if (!isCancelled) {
+        setCroppedSrc(imageUrl);
+      }
+    });
+    return () => {
+      isCancelled = true;
+    };
+  }, [imageUrl]);
+  return croppedSrc;
+}
 const useGetAssetDetails = ({
   assetDenom,
   amount,
@@ -3977,6 +4098,7 @@ const useGetAssetDetails = ({
     tokenAmount = convertHumanReadableAmountToCryptoAmount(amount, asset == null ? void 0 : asset.decimals);
   }
   const assetImage = asset == null ? void 0 : asset.logoUri;
+  const croppedImage = useCroppedImage(assetImage);
   const symbol = (asset == null ? void 0 : asset.recommendedSymbol) ?? (asset == null ? void 0 : asset.symbol);
   const chain = chains2 == null ? void 0 : chains2.find((chain2) => {
     if (chainId) {
@@ -4003,7 +4125,7 @@ const useGetAssetDetails = ({
   return {
     asset,
     chain,
-    assetImage: assetImage ?? "",
+    assetImage: croppedImage ?? "",
     chainName: chainPrettyName ?? chainName ?? chainId,
     chainImage: chainImage ?? "",
     symbol: symbol ?? "",
@@ -4098,6 +4220,12 @@ function limitDecimalsDisplayed(input, decimalPlaces = DEFAULT_DECIMAL_PLACES) {
   const flooredAndLimitedDecimalPlacesNumber = Math.floor(input * decimalScalingFactor) / decimalScalingFactor;
   return flooredAndLimitedDecimalPlacesNumber.toString();
 }
+function removeTrailingZeros(input) {
+  if (input == null) return "";
+  const str = input.toString();
+  if (!str.includes(".")) return str;
+  return str.replace(/(\.\d*?[1-9])0+$/g, "$1").replace(/\.0+$/g, "");
+}
 const GhostButton = dt(SmallText).attrs({
   as: "button"
 })`
@@ -4125,15 +4253,19 @@ const GhostButton = dt(SmallText).attrs({
       `;
   }
 }}
- 
+
   padding: 8px 15px;
-  border-radius: 90px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.ghostButton);
+}};
   ${flexProps};
 `;
 const Button = dt.button`
   ${removeButtonStyles}
   line-height: initial;
-  ${({ disabled }) => disabled ? lt`          &:hover {
+  ${({ disabled }) => disabled ? lt`
+          &:hover {
             cursor: not-allowed;
           }
         ` : lt`
@@ -4154,7 +4286,7 @@ const PillButton = dt(Button)`
   align-items: center;
   justify-content: center;
 
-  &:hover{
+  &:hover {
     background: ${({ theme }) => theme.secondary.background.hover};
   }
 `;
@@ -4252,7 +4384,7 @@ const WarningPageBadPrice = ({
     if (hasUsdValues && swapDifferencePercentage) {
       return {
         title: `Warning: Bad trade (-${swapDifferencePercentage})`,
-        descriptionContent: /* @__PURE__ */ jsxs(StyledDescriptionContent, { children: [
+        descriptionContent: /* @__PURE__ */ jsxs(StyledDescriptionContent$1, { children: [
           "You will lose ",
           swapDifferencePercentage,
           " of your input value with this trade",
@@ -4356,7 +4488,7 @@ const WarningPageBadPrice = ({
     )
   ] });
 };
-const StyledDescriptionContent = dt.div`
+const StyledDescriptionContent$1 = dt.div`
   line-height: 1.5;
 `;
 const ExpectedErrorPageAuthFailed = ({ onClickBack }) => {
@@ -4837,7 +4969,7 @@ const useBroadcastedTxsStatus = ({
       setPrevData(resData);
       return resData;
     },
-    enabled: txsRequired !== void 0 && txs !== void 0 && !isSettled && (!!txs && txs.length > 0 && enabled !== void 0 ? enabled : true),
+    enabled: txsRequired !== void 0 && txs !== void 0 && txs.length > 0 && !isSettled && (!!txs && txs.length > 0 && enabled !== void 0 ? enabled : true),
     refetchInterval: 500,
     // to make the data persist when query key changed
     initialData: prevData
@@ -5311,16 +5443,6 @@ const _mainnetChains = [
           average: 0.05,
           high: 0.07
         }
-      },
-      {
-        coinDenom: "ist",
-        coinMinimalDenom: "uist",
-        coinDecimals: 6,
-        gasPriceStep: {
-          low: 34e-4,
-          average: 7e-3,
-          high: 0.02
-        }
       }
     ],
     stakeCurrency: {
@@ -5753,6 +5875,11 @@ const _mainnetChains = [
         coinDenom: "atone",
         coinMinimalDenom: "uatone",
         coinDecimals: 6
+      },
+      {
+        coinDenom: "photon",
+        coinMinimalDenom: "uphoton",
+        coinDecimals: 6
       }
     ],
     rest: "https://atomone-api.allinbits.com",
@@ -5767,6 +5894,16 @@ const _mainnetChains = [
     },
     chainName: "atomone",
     feeCurrencies: [
+      {
+        coinDenom: "photon",
+        coinMinimalDenom: "uphoton",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 0.225,
+          average: 0.3,
+          high: 0.5
+        }
+      },
       {
         coinDenom: "atone",
         coinMinimalDenom: "uatone",
@@ -6408,6 +6545,11 @@ const _mainnetChains = [
         coinDenom: "GGE",
         coinMinimalDenom: "factory/bze12gyp30f29zg26nuqrwdhl26ej4q066pt572fhm/GGE",
         coinDecimals: 6
+      },
+      {
+        coinDenom: "CTL",
+        coinMinimalDenom: "factory/bze1972aqfzdg29ugjln74edx0xvcg4ehvysjptk77/CTL",
+        coinDecimals: 6
       }
     ],
     rest: "https://rest.getbze.com",
@@ -8094,6 +8236,11 @@ const _mainnetChains = [
         coinDenom: "susds",
         coinMinimalDenom: "ibc/B9B561EB378C9EB8C13CAA11FCBC78E6B865A3C65707972F17B1052CFC39F473",
         coinDecimals: 18
+      },
+      {
+        coinDenom: "OPHIR",
+        coinMinimalDenom: "ibc/B26F762ED6D20D0D5305FE1870A476EBCB95127C10199F3CB16E69D893E9F775",
+        coinDecimals: 6
       }
     ],
     rest: "https://cosmoshub.lava.build:443",
@@ -9911,6 +10058,47 @@ const _mainnetChains = [
       coinType: 459
     }
   },
+  {
+    chainId: "hippo-protocol-1",
+    currencies: [
+      {
+        coinDenom: "ahp",
+        coinMinimalDenom: "ahp",
+        coinDecimals: 0
+      }
+    ],
+    rest: "https://api.hippo-protocol.com/",
+    rpc: "https://rpc.hippo-protocol.com/",
+    bech32Config: {
+      bech32PrefixAccAddr: "hippo",
+      bech32PrefixAccPub: "hippopub",
+      bech32PrefixValAddr: "hippovaloper",
+      bech32PrefixValPub: "hippovaloperpub",
+      bech32PrefixConsAddr: "hippovalcons",
+      bech32PrefixConsPub: "hippovalconspub"
+    },
+    chainName: "hippoprotocol",
+    feeCurrencies: [
+      {
+        coinDenom: "ahp",
+        coinMinimalDenom: "ahp",
+        coinDecimals: 0,
+        gasPriceStep: {
+          low: 4e12,
+          average: 5e12,
+          high: 1e13
+        }
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "ahp",
+      coinMinimalDenom: "ahp",
+      coinDecimals: 0
+    },
+    bip44: {
+      coinType: 118
+    }
+  },
   {
     chainId: "humans_1089-1",
     currencies: [
@@ -10392,6 +10580,11 @@ const _mainnetChains = [
         coinDenom: "sol",
         coinMinimalDenom: "factory/int31zlefkpe3g0vvm9a4h0jf9000lmqutlh99h7fsd/solana-sol",
         coinDecimals: 9
+      },
+      {
+        coinDenom: "xrp",
+        coinMinimalDenom: "factory/int31zlefkpe3g0vvm9a4h0jf9000lmqutlh99h7fsd/xrpl-xrp",
+        coinDecimals: 6
       }
     ],
     rest: "https://api.mainnet.int3face.zone",
@@ -12452,9 +12645,9 @@ const _mainnetChains = [
         coinMinimalDenom: "umfx",
         coinDecimals: 6,
         gasPriceStep: {
-          low: 0.5,
-          average: 1,
-          high: 5
+          low: 1.05,
+          average: 1.1,
+          high: 3
         }
       }
     ],
@@ -17102,6 +17295,11 @@ const _mainnetChains = [
         coinDenom: "sol",
         coinMinimalDenom: "ibc/A1465DD6AF456FCD0D998869608DFEEDA4F4C11EC0A12AF92A994A3F8CBEE546",
         coinDecimals: 9
+      },
+      {
+        coinDenom: "OPHIR",
+        coinMinimalDenom: "ibc/3AF2E322D4B54BB97EEE24760ED25B725842A9B62C759402AB8AADD75915FD14",
+        coinDecimals: 6
       }
     ],
     rest: "https://lcd.osmosis.zone/",
@@ -18471,6 +18669,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:uatom:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pATOM30Jun2025",
+        coinMinimalDenom: "p:uatom:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "pATOM30Sep2025",
+        coinMinimalDenom: "p:uatom:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "pATOM31Dec2025",
         coinMinimalDenom: "p:uatom:31Dec2025",
@@ -18496,6 +18704,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:uosmo:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pOSMO30Jun2025",
+        coinMinimalDenom: "p:uosmo:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "pOSMO30Sep2025",
+        coinMinimalDenom: "p:uosmo:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "pOSMO31Dec2025",
         coinMinimalDenom: "p:uosmo:31Dec2025",
@@ -18521,6 +18739,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:inj:31Mar2025",
         coinDecimals: 18
       },
+      {
+        coinDenom: "pINJ30Jun2025",
+        coinMinimalDenom: "p:inj:30Jun2025",
+        coinDecimals: 18
+      },
+      {
+        coinDenom: "pINJ30Sep2025",
+        coinMinimalDenom: "p:inj:30Sep2025",
+        coinDecimals: 18
+      },
       {
         coinDenom: "pINJ31Dec2025",
         coinMinimalDenom: "p:inj:31Dec2025",
@@ -18546,6 +18774,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:uluna:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pLUNA30Jun2025",
+        coinMinimalDenom: "p:uluna:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "pLUNA30Sep2025",
+        coinMinimalDenom: "p:uluna:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "pLUNA31Dec2025",
         coinMinimalDenom: "p:uluna:31Dec2025",
@@ -18566,6 +18804,11 @@ const _mainnetChains = [
         coinMinimalDenom: "p:uauuu:31Dec2024",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pAUUU30Jun2025",
+        coinMinimalDenom: "p:uauuu:30Jun2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "pAUUU31Dec2025",
         coinMinimalDenom: "p:uauuu:31Dec2025",
@@ -18591,6 +18834,11 @@ const _mainnetChains = [
         coinMinimalDenom: "p:stutia:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pstTIA30Jun2025",
+        coinMinimalDenom: "p:stutia:30Jun2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "pstTIA31Dec2025",
         coinMinimalDenom: "p:stutia:31Dec2025",
@@ -18616,6 +18864,11 @@ const _mainnetChains = [
         coinMinimalDenom: "p:stadydx:31Mar2025",
         coinDecimals: 18
       },
+      {
+        coinDenom: "pstDYDX30Jun2025",
+        coinMinimalDenom: "p:stadydx:30Jun2025",
+        coinDecimals: 18
+      },
       {
         coinDenom: "pstDYDX31Dec2025",
         coinMinimalDenom: "p:stadydx:31Dec2025",
@@ -18661,6 +18914,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:utia:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pTIA30Jun2025",
+        coinMinimalDenom: "p:utia:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "pTIA30Sep2025",
+        coinMinimalDenom: "p:utia:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "pTIA31Dec2025",
         coinMinimalDenom: "p:utia:31Dec2025",
@@ -18691,6 +18954,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:ausdy:31Dec2025",
         coinDecimals: 18
       },
+      {
+        coinDenom: "pUSDY31Mar2026",
+        coinMinimalDenom: "p:ausdy:31Mar2026",
+        coinDecimals: 18
+      },
+      {
+        coinDenom: "pUSDY30Jun2026",
+        coinMinimalDenom: "p:ausdy:30Jun2026",
+        coinDecimals: 18
+      },
       {
         coinDenom: "pPRYZM31Mar2025",
         coinMinimalDenom: "p:upryzm:31Mar2025",
@@ -18711,6 +18984,16 @@ const _mainnetChains = [
         coinMinimalDenom: "p:upryzm:31Dec2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "pPRYZM31Mar2026",
+        coinMinimalDenom: "p:upryzm:31Mar2026",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "pPRYZM30Jun2026",
+        coinMinimalDenom: "p:upryzm:30Jun2026",
+        coinDecimals: 6
+      },
       {
         coinDenom: "psUSDS30Jun2025",
         coinMinimalDenom: "p:asusds:30Jun2025",
@@ -18731,6 +19014,11 @@ const _mainnetChains = [
         coinMinimalDenom: "p:asusds:31Mar2026",
         coinDecimals: 18
       },
+      {
+        coinDenom: "psUSDS30Jun2026",
+        coinMinimalDenom: "p:asusds:30Jun2026",
+        coinDecimals: 18
+      },
       {
         coinDenom: "yATOM30Sep2024",
         coinMinimalDenom: "y:uatom:30Sep2024",
@@ -18746,6 +19034,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:uatom:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "yATOM30Jun2025",
+        coinMinimalDenom: "y:uatom:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "yATOM30Sep2025",
+        coinMinimalDenom: "y:uatom:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "yATOM31Dec2025",
         coinMinimalDenom: "y:uatom:31Dec2025",
@@ -18771,6 +19069,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:uosmo:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "yOSMO30Jun2025",
+        coinMinimalDenom: "y:uosmo:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "yOSMO30Sep2025",
+        coinMinimalDenom: "y:uosmo:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "yOSMO31Dec2025",
         coinMinimalDenom: "y:uosmo:31Dec2025",
@@ -18796,6 +19104,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:inj:31Mar2025",
         coinDecimals: 18
       },
+      {
+        coinDenom: "yINJ30Jun2025",
+        coinMinimalDenom: "y:inj:30Jun2025",
+        coinDecimals: 18
+      },
+      {
+        coinDenom: "yINJ30Sep2025",
+        coinMinimalDenom: "y:inj:30Sep2025",
+        coinDecimals: 18
+      },
       {
         coinDenom: "yINJ31Dec2025",
         coinMinimalDenom: "y:inj:31Dec2025",
@@ -18821,6 +19139,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:uluna:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "yLUNA30Jun2025",
+        coinMinimalDenom: "y:uluna:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "yLUNA30Sep2025",
+        coinMinimalDenom: "y:uluna:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "yLUNA31Dec2025",
         coinMinimalDenom: "y:uluna:31Dec2025",
@@ -18841,6 +19169,11 @@ const _mainnetChains = [
         coinMinimalDenom: "y:uauuu:31Dec2024",
         coinDecimals: 6
       },
+      {
+        coinDenom: "yAUUU30Jun2025",
+        coinMinimalDenom: "y:uauuu:30Jun2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "yAUUU31Dec2025",
         coinMinimalDenom: "y:uauuu:31Dec2025",
@@ -18866,6 +19199,11 @@ const _mainnetChains = [
         coinMinimalDenom: "y:stutia:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "ystTIA30Jun2025",
+        coinMinimalDenom: "y:stutia:30Jun2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "ystTIA31Dec2025",
         coinMinimalDenom: "y:stutia:31Dec2025",
@@ -18891,6 +19229,11 @@ const _mainnetChains = [
         coinMinimalDenom: "y:stadydx:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "ystDYDX30Jun2025",
+        coinMinimalDenom: "y:stadydx:30Jun2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "ystDYDX31Dec2025",
         coinMinimalDenom: "y:stadydx:31Dec2025",
@@ -18936,6 +19279,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:utia:31Mar2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "yTIA30Jun2025",
+        coinMinimalDenom: "y:utia:30Jun2025",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "yTIA30Sep2025",
+        coinMinimalDenom: "y:utia:30Sep2025",
+        coinDecimals: 6
+      },
       {
         coinDenom: "yTIA31Dec2025",
         coinMinimalDenom: "y:utia:31Dec2025",
@@ -18966,6 +19319,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:ausdy:31Dec2025",
         coinDecimals: 18
       },
+      {
+        coinDenom: "yUSDY31Mar2026",
+        coinMinimalDenom: "y:ausdy:31Mar2026",
+        coinDecimals: 18
+      },
+      {
+        coinDenom: "yUSDY30Jun2026",
+        coinMinimalDenom: "y:ausdy:30Jun2026",
+        coinDecimals: 18
+      },
       {
         coinDenom: "yPRYZM31Mar2025",
         coinMinimalDenom: "y:upryzm:31Mar2025",
@@ -18986,6 +19349,16 @@ const _mainnetChains = [
         coinMinimalDenom: "y:upryzm:31Dec2025",
         coinDecimals: 6
       },
+      {
+        coinDenom: "yPRYZM31Mar2026",
+        coinMinimalDenom: "y:upryzm:31Mar2026",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "yPRYZM30Jun2026",
+        coinMinimalDenom: "y:upryzm:30Jun2026",
+        coinDecimals: 6
+      },
       {
         coinDenom: "ysUSDS30Jun2025",
         coinMinimalDenom: "y:asusds:30Jun2025",
@@ -19006,6 +19379,11 @@ const _mainnetChains = [
         coinMinimalDenom: "y:asusds:31Mar2026",
         coinDecimals: 18
       },
+      {
+        coinDenom: "ysUSDS30Jun2026",
+        coinMinimalDenom: "y:asusds:30Jun2026",
+        coinDecimals: 18
+      },
       {
         coinDenom: "lp:6:usdc.axl-usdc",
         coinMinimalDenom: "lp:6:uusdc.axl-uusdc",
@@ -22563,6 +22941,11 @@ const _mainnetChains = [
         coinDenom: "cwlunc",
         coinMinimalDenom: "cw20:terra10fusc7487y4ju2v5uavkauf3jdpxx9h8sc7wsqdqg4rne8t4qyrq8385q6",
         coinDecimals: 6
+      },
+      {
+        coinDenom: "usdc",
+        coinMinimalDenom: "ibc/0BB9D8513E8E8E9AE6A9D211D9136E6DA42288DDE6CFAA453A150A4566054DC5",
+        coinDecimals: 6
       }
     ],
     rest: "https://terra-classic-lcd.publicnode.com",
@@ -23173,7 +23556,7 @@ const _mainnetChains = [
         coinDecimals: 18
       },
       {
-        coinDenom: "usdc",
+        coinDenom: "usdc.noble",
         coinMinimalDenom: "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
         coinDecimals: 6
       },
@@ -23191,6 +23574,26 @@ const _mainnetChains = [
         coinDenom: "usdt",
         coinMinimalDenom: "factory/titan1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucsgehpjy/usdt",
         coinDecimals: 6
+      },
+      {
+        coinDenom: "usdc",
+        coinMinimalDenom: "factory/titan1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucsgehpjy/usdc",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "sol",
+        coinMinimalDenom: "factory/titan1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucsgehpjy/sol",
+        coinDecimals: 9
+      },
+      {
+        coinDenom: "meow",
+        coinMinimalDenom: "factory/titan1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucsgehpjy/meow",
+        coinDecimals: 8
+      },
+      {
+        coinDenom: "oracler",
+        coinMinimalDenom: "factory/titan1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucsgehpjy/oracler",
+        coinDecimals: 6
       }
     ],
     rest: "https://titan-lcd.titanlab.io:443",
@@ -27322,9 +27725,9 @@ const _testnetChains = [
         coinMinimalDenom: "umfx",
         coinDecimals: 6,
         gasPriceStep: {
-          low: 0.5,
-          average: 1,
-          high: 5
+          low: 1.05,
+          average: 1.1,
+          high: 3
         }
       }
     ],
@@ -28631,6 +29034,47 @@ const _testnetChains = [
       coinType: 118
     }
   },
+  {
+    chainId: "qubetics_9029-1",
+    currencies: [
+      {
+        coinDenom: "TICS",
+        coinMinimalDenom: "tics",
+        coinDecimals: 18
+      }
+    ],
+    rest: "https://swagger-testnet.qubetics.work/",
+    rpc: "https://tendermint-testnet.qubetics.work/",
+    bech32Config: {
+      bech32PrefixAccAddr: "qubetics",
+      bech32PrefixAccPub: "qubeticspub",
+      bech32PrefixValAddr: "qubeticsvaloper",
+      bech32PrefixValPub: "qubeticsvaloperpub",
+      bech32PrefixConsAddr: "qubeticsvalcons",
+      bech32PrefixConsPub: "qubeticsvalconspub"
+    },
+    chainName: "qubeticstestnet",
+    feeCurrencies: [
+      {
+        coinDenom: "TICS",
+        coinMinimalDenom: "tics",
+        coinDecimals: 18,
+        gasPriceStep: {
+          low: 2e10,
+          average: 25e9,
+          high: 4e10
+        }
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "TICS",
+      coinMinimalDenom: "tics",
+      coinDecimals: 18
+    },
+    bip44: {
+      coinType: 60
+    }
+  },
   {
     chainId: "rhye-3",
     currencies: [
@@ -29680,7 +30124,7 @@ const _testnetChains = [
         coinDecimals: 18
       },
       {
-        coinDenom: "usdc",
+        coinDenom: "usdc.noble",
         coinMinimalDenom: "ibc/7C0807A56073C4A27B0DE1C21BA3EB75DF75FD763F4AD37BC159917FC01145F0",
         coinDecimals: 6
       },
@@ -29693,6 +30137,21 @@ const _testnetChains = [
         coinDenom: "eth",
         coinMinimalDenom: "factory/titan16gyvmp43st00s220zypex4lgvwqc3ve8l4657rhxj8myeadswmkq75slkc/eth",
         coinDecimals: 18
+      },
+      {
+        coinDenom: "usdc",
+        coinMinimalDenom: "factory/titan16gyvmp43st00s220zypex4lgvwqc3ve8l4657rhxj8myeadswmkq75slkc/usdc",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "sol",
+        coinMinimalDenom: "factory/titan16gyvmp43st00s220zypex4lgvwqc3ve8l4657rhxj8myeadswmkq75slkc/sol",
+        coinDecimals: 9
+      },
+      {
+        coinDenom: "meow",
+        coinMinimalDenom: "factory/titan16gyvmp43st00s220zypex4lgvwqc3ve8l4657rhxj8myeadswmkq75slkc/meow",
+        coinDecimals: 8
       }
     ],
     rest: "https://titan-testnet-lcd.titanlab.io:443",
@@ -29973,6 +30432,42 @@ const _testnetChains = [
       coinType: 118
     }
   },
+  {
+    chainId: "xardev",
+    currencies: [
+      {
+        coinDenom: "stake",
+        coinMinimalDenom: "stake",
+        coinDecimals: 0
+      }
+    ],
+    rest: "https://cosmos01-dev.arcana.network:26650",
+    rpc: "https://cosmos01-dev.arcana.network",
+    bech32Config: {
+      bech32PrefixAccAddr: "arcana",
+      bech32PrefixAccPub: "arcanapub",
+      bech32PrefixValAddr: "arcanavaloper",
+      bech32PrefixValPub: "arcanavaloperpub",
+      bech32PrefixConsAddr: "arcanavalcons",
+      bech32PrefixConsPub: "arcanavalconspub"
+    },
+    chainName: "xarchaintestnet",
+    feeCurrencies: [
+      {
+        coinDenom: "stake",
+        coinMinimalDenom: "stake",
+        coinDecimals: 0
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "stake",
+      coinMinimalDenom: "stake",
+      coinDecimals: 0
+    },
+    bip44: {
+      coinType: 118
+    }
+  },
   {
     chainId: "xion-testnet-2",
     currencies: [
@@ -31011,12 +31506,24 @@ const _explorers = [
         url: "https://explorer.bonynode.online/atomone",
         tx_page: "https://explorer.bonynode.online/atomone/transactions/${txHash}",
         account_page: "https://explorer.bonynode.online/atomone/account/${accountAddress}"
+      },
+      {
+        kind: "Chainroot",
+        url: "https://explorer.chainroot.io/atomone",
+        tx_page: "https://explorer.chainroot.io/atomone/transactions/${txHash}",
+        account_page: "https://explorer.chainroot.io/atomone/accounts/${accountAddress}"
       }
     ]
   },
   {
     chainId: "aura_6322-2",
     explorers: [
+      {
+        kind: "Chainroot",
+        url: "https://explorer.chainroot.io/aura",
+        tx_page: "https://explorer.chainroot.io/aura/transactions/${txHash}",
+        account_page: "https://explorer.chainroot.io/aura/accounts/${accountAddress}"
+      },
       {
         kind: "aurascan",
         url: "https://aurascan.io",
@@ -31640,7 +32147,7 @@ const _explorers = [
         account_page: "https://ezstaking.app/celestia/account/${accountAddress}"
       },
       {
-        kind: "🚀 itrocket 🚀",
+        kind: "itrocket",
         url: "https://mainnet.itrocket.net/celestia",
         tx_page: "https://mainnet.itrocket.net/celestia/transaction/${txHash}",
         account_page: "https://mainnet.itrocket.net/celestia/account/${accountAddress}"
@@ -33383,6 +33890,17 @@ const _explorers = [
       }
     ]
   },
+  {
+    chainId: "hippo-protocol-1",
+    explorers: [
+      {
+        kind: "Hippo River",
+        url: "https://river.hippoprotocol.ai/",
+        tx_page: "https://river.hippoprotocol.ai/hippo-protocol/tx/${txHash}",
+        account_page: "https://river.hippoprotocol.ai/hippo-protocol/account/${accountAddress}"
+      }
+    ]
+  },
   {
     chainId: "humans_1089-1",
     explorers: [
@@ -36940,9 +37458,9 @@ const _explorers = [
         tx_page: "https://thorchain.net/#/txs/${txHash}"
       },
       {
-        kind: "viewblock",
-        url: "https://viewblock.io/thorchain",
-        tx_page: "https://viewblock.io/thorchain/tx/${txHash}"
+        kind: "Runescan",
+        url: "https://runescan.io/",
+        tx_page: "https://runescan.io/txs/${txHash}"
       }
     ]
   },
@@ -37348,7 +37866,7 @@ const _explorers = [
         account_page: "https://cosmotracker.com/airchains/account/${accountAddress}"
       },
       {
-        kind: "IT Rocket",
+        kind: "ITRocket",
         url: "https://testnet.itrocket.net/airchains/",
         tx_page: "https://testnet.itrocket.net/airchains//tx/${txHash}",
         account_page: "https://testnet.itrocket.net/airchains/account/${accountAddress}"
@@ -37592,7 +38110,7 @@ const _explorers = [
         tx_page: "https://mintscan.io/celestia-testnet/txs/${txHash}"
       },
       {
-        kind: "🚀ITRocket🚀",
+        kind: "itrocket",
         url: "https://testnet.itrocket.net/celestia",
         tx_page: "https://testnet.itrocket.net/celestia/tx/${txHash}",
         account_page: "https://testnet.itrocket.net/celestia/account/${accountAddress}"
@@ -37836,7 +38354,7 @@ const _explorers = [
         account_page: "https://testnet.ping.pub/elys/account/${accountAddress}"
       },
       {
-        kind: "itrocket",
+        kind: "ITRocket",
         url: "https://testnet.itrocket.net/elys",
         tx_page: "https://testnet.itrocket.net/elys/staking/tx/${txHash}",
         account_page: "https://testnet.itrocket.net/elys/account/${accountAddress}"
@@ -37876,11 +38394,6 @@ const _explorers = [
         url: "https://explorer.nodestake.top/empower-testnet",
         tx_page: "https://explorer.nodestake.top/empower-testnet/tx/${txHash}"
       },
-      {
-        kind: "ping.pub",
-        url: "https://testnet.itrocket.net/empower/staking",
-        tx_page: "https://testnet.itrocket.net/empower/staking/tx/${txHash}"
-      },
       {
         kind: "ping.pub",
         url: "https://explorer.stavr.tech/empower",
@@ -38171,7 +38684,7 @@ const _explorers = [
         account_page: "https://explorer.nodestake.org/lava-testnet/account/${accountAddress}"
       },
       {
-        kind: "🚀ITRocket🚀",
+        kind: "ITRocket",
         url: "https://testnet.itrocket.net/lava",
         tx_page: "https://testnet.itrocket.net/lava/tx/${txHash}",
         account_page: "https://testnet.itrocket.net/lava/account/${accountAddress}"
@@ -38577,6 +39090,16 @@ const _explorers = [
   {
     chainId: "quasar-test-1"
   },
+  {
+    chainId: "qubetics_9029-1",
+    explorers: [
+      {
+        kind: "Qubetics Explorer",
+        url: "https://testnet.qubetics.work/dashboard",
+        tx_page: "https://testnet.qubetics.work/tx/${txHash}"
+      }
+    ]
+  },
   {
     chainId: "rhye-3",
     explorers: [
@@ -38966,6 +39489,15 @@ const _explorers = [
       }
     ]
   },
+  {
+    chainId: "xardev",
+    explorers: [
+      {
+        kind: "arcana ceries intent explorer",
+        url: "https://explorer.dev.arcana.network"
+      }
+    ]
+  },
   {
     chainId: "xion-testnet-2",
     explorers: [
@@ -40178,51 +40710,36 @@ const transactionHistoryAtom = atomWithStorage(
 );
 const setTransactionHistoryAtom = atom$1(
   null,
-  (get, set, index, historyItem) => {
+  (get, set, historyItem) => {
     const history = get(transactionHistoryAtom);
+    const index = history.findIndex((item) => item.timestamp === historyItem.timestamp);
     const newHistory = [...history];
-    const oldHistoryItem = newHistory[index] ?? {};
-    newHistory[index] = { ...oldHistoryItem, ...historyItem };
+    if (index !== -1) {
+      const oldItem = newHistory[index];
+      newHistory[index] = { ...oldItem, ...historyItem };
+    } else {
+      newHistory.push(historyItem);
+    }
     set(transactionHistoryAtom, newHistory);
   }
 );
-const removeTransactionHistoryItemAtom = atom$1(null, (get, set, index) => {
+const lastTransactionInTimeAtom = atom$1((get) => {
   const history = get(transactionHistoryAtom);
-  if (!history) return;
-  if (index < 0) return;
-  if (index >= history.length) return;
-  const newHistory = history.filter((_2, i) => i !== index);
-  set(transactionHistoryAtom, newHistory);
-});
-atomWithQuery((get) => {
-  const transactionHistory = get(transactionHistoryAtom);
-  const pendingTransactionHistoryItemsFound = transactionHistory.find(
-    (transactionHistoryItem) => transactionHistoryItem.status !== "completed" && transactionHistoryItem.status !== "failed"
-  );
+  if (history.length === 0) return;
+  const sorted = [...history].sort((a, b) => b.timestamp - a.timestamp);
+  const lastTx = sorted[0];
+  const originalIndex = history.findIndex((tx) => tx.timestamp === lastTx.timestamp);
   return {
-    queryKey: ["skipPendingTxHistoryStatus", transactionHistory],
-    queryFn: async () => {
-      const nestedTransactionHistoryPromises = transactionHistory.map(
-        async (transactionHistoryItem) => {
-          var _a;
-          const transactionDetailsPromises = await Promise.all(
-            (_a = transactionHistoryItem.transactionDetails) == null ? void 0 : _a.map(async (transactionDetail) => {
-              if (transactionHistoryItem.status !== "completed" && transactionHistoryItem.status !== "failed") {
-                return await transactionStatus(transactionDetail);
-              }
-              return new Promise((resolve) => resolve(null));
-            })
-          );
-          return transactionDetailsPromises;
-        }
-      );
-      return nestedTransactionHistoryPromises;
-    },
-    enabled: !!pendingTransactionHistoryItemsFound,
-    refetchInterval: 1e3 * 2,
-    keepPreviousData: true
+    transactionHistoryItem: lastTx,
+    index: originalIndex
   };
 });
+const removeTransactionHistoryItemAtom = atom$1(null, (get, set, timestamp) => {
+  const history = get(transactionHistoryAtom);
+  if (!history || isNaN(timestamp)) return;
+  const newHistory = history.filter((item) => item.timestamp !== timestamp);
+  set(transactionHistoryAtom, newHistory);
+});
 function isUserRejectedRequestError(input) {
   if (input instanceof Error) {
     if (
@@ -44148,7 +44665,7 @@ function walletConnect(parameters) {
         const optionalChains = config2.chains.map((x2) => x2.id);
         if (!optionalChains.length)
           return;
-        const { EthereumProvider } = await import("./index.es-CTDaESwK.js");
+        const { EthereumProvider } = await import("./index.es-DsOLl-G-.js");
         return await EthereumProvider.init({
           ...parameters,
           disableProviderPing: true,
@@ -44514,7 +45031,8 @@ const swapExecutionStateAtom = atomWithStorageNoCrossTabSync(
     transactionHistoryIndex: 0,
     overallStatus: "unconfirmed",
     isValidatingGasBalance: void 0,
-    transactionsSigned: 0
+    transactionsSigned: 0,
+    timestamp: -1
   }
 );
 const setOverallStatusAtom = atom$1(null, (_get, set, status) => {
@@ -44559,7 +45077,8 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
     transactionHistoryIndex,
     overallStatus: "unconfirmed",
     isValidatingGasBalance: void 0,
-    transactionsSigned: 0
+    transactionsSigned: 0,
+    timestamp: Date.now()
   });
   set(submitSwapExecutionCallbacksAtom, {
     onTransactionUpdated: (txInfo) => {
@@ -44567,8 +45086,7 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
       track("execute route: transaction updated", { txInfo });
       if (((_a2 = txInfo.status) == null ? void 0 : _a2.status) !== "STATE_COMPLETED") {
         set(setTransactionDetailsAtom, {
-          transactionDetails: txInfo,
-          transactionHistoryIndex
+          transactionDetails: txInfo
         });
       }
     },
@@ -44589,8 +45107,7 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
         txHash: txInfo.txHash
       });
       set(setTransactionDetailsAtom, {
-        transactionDetails: { ...txInfo, explorerLink, status: void 0 },
-        transactionHistoryIndex
+        transactionDetails: { ...txInfo, explorerLink, status: void 0 }
       });
       (_a2 = callbacks == null ? void 0 : callbacks.onTransactionBroadcasted) == null ? void 0 : _a2.call(callbacks, {
         chainId: txInfo.chainId,
@@ -44644,9 +45161,9 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
           transactionsSigned
         };
       });
-      const transactionHistoryItem = get(transactionHistoryAtom)[transactionHistoryIndex];
-      set(setTransactionHistoryAtom, transactionHistoryIndex, {
-        ...transactionHistoryItem,
+      const { timestamp } = get(swapExecutionStateAtom);
+      set(setTransactionHistoryAtom, {
+        timestamp,
         signatures: transactionsSigned
       });
       set(setOverallStatusAtom, "pending");
@@ -44708,7 +45225,7 @@ const setValidatingGasBalanceAtom = atom$1(
 );
 const setTransactionDetailsAtom = atom$1(
   null,
-  (get, set, { transactionDetails, transactionHistoryIndex, status }) => {
+  (get, set, { transactionDetails, status }) => {
     const swapExecutionState = get(swapExecutionStateAtom);
     const { transactionDetailsArray, route: route2 } = swapExecutionState;
     const newTransactionDetailsArray = [...transactionDetailsArray];
@@ -44727,15 +45244,13 @@ const setTransactionDetailsAtom = atom$1(
       ...swapExecutionState,
       transactionDetailsArray: newTransactionDetailsArray
     });
-    const transactionHistoryItem = get(transactionHistoryAtom)[transactionHistoryIndex];
-    set(setTransactionHistoryAtom, transactionHistoryIndex, {
-      ...transactionHistoryItem,
+    set(setTransactionHistoryAtom, {
       route: route2,
       transactionDetails: newTransactionDetailsArray,
       transferEvents: [],
-      timestamp: Date.now(),
       isSettled: false,
       isSuccess: false,
+      timestamp: swapExecutionState == null ? void 0 : swapExecutionState.timestamp,
       ...status && { status }
     });
   }
@@ -45337,6 +45852,23 @@ const StyledContent = dt.div`
   animation: ${({ drawer, open }) => open ? drawer ? fadeInAndSlideUp : fadeInAndZoomOut : drawer ? fadeOutAndSlideDown : fadeOutAndZoomIn}
     150ms cubic-bezier(0.5, 1, 0.89, 1) forwards;
 `;
+const StyledModalInnerContainer = dt(Column)`
+  width: 100%;
+  align-items: center;
+  justify-content: center;
+`;
+const StyledModalContainer = dt(Column)`
+  position: relative;
+  padding: 10px;
+  gap: 10px;
+  width: calc(100% - 20px);
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.modalContainer);
+}};
+  background: ${({ theme }) => theme.primary.background.normal};
+  height: 100%;
+`;
 const ModalRowItem = ({
   leftContent,
   rightContent,
@@ -45366,7 +45898,10 @@ const StyledModalRowItemContainer = dt(Row)`
   position: relative;
   width: 100%;
   height: 60px;
-  border-radius: 12px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.rowItem);
+}};
   padding: 12px 15px;
   margin-top: 5px;
 
@@ -45732,6 +46267,32 @@ const useGroupedAssetByRecommendedSymbol = ({
   }, [assets2, getBalance]);
   return groupedAssetsByRecommendedSymbol;
 };
+const shimmer = mt`
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+`;
+const SkeletonElement = dt.div`
+  ${({ width, height, theme }) => lt`
+    width: ${convertToPxValue(width)};
+    height: ${convertToPxValue(height)};
+    border-radius: 4px;
+    background: linear-gradient(
+      90deg,
+      ${getHexColor(theme.primary.text.normal ?? "") + opacityToHex(10)} 25%,
+      ${getHexColor(theme.primary.text.normal ?? "") + opacityToHex(20)} 50%,
+      ${getHexColor(theme.primary.text.normal ?? "") + opacityToHex(10)} 75%
+    );
+    background-size: 200% 100%;
+    animation: ${shimmer} 2s linear infinite;
+  `}
+`;
+const CircleSkeletonElement = dt(SkeletonElement)`
+  border-radius: 50%;
+`;
 const MAX_NUMBER_OF_IMAGES_TO_CHECK = 6;
 const GroupedAssetImage = ({
   groupedAsset,
@@ -45741,17 +46302,18 @@ const GroupedAssetImage = ({
 }) => {
   var _a;
   const [currentImageIndex, setCurrentImageIndex] = useState(0);
-  if (!(groupedAsset == null ? void 0 : groupedAsset.assets) || groupedAsset.assets.length === 0) {
-    return /* @__PURE__ */ jsx(StyledAssetImage, { height, width, src: "", alt: "No asset" });
-  }
   const allLogoUris = [
-    (_a = groupedAsset.assets.find((asset) => {
+    (_a = groupedAsset == null ? void 0 : groupedAsset.assets.find((asset) => {
       var _a2;
       return (_a2 = asset.logoUri) == null ? void 0 : _a2.includes("chain-registry");
     })) == null ? void 0 : _a.logoUri,
-    ...groupedAsset.assets.map((asset) => asset.logoUri)
+    ...(groupedAsset == null ? void 0 : groupedAsset.assets.map((asset) => asset.logoUri)) ?? []
   ].filter((uri) => !!uri);
   const dedupedLogoUris = Array.from(new Set(allLogoUris));
+  const croppedImage = useCroppedImage(dedupedLogoUris[currentImageIndex]);
+  if (!(groupedAsset == null ? void 0 : groupedAsset.assets) || groupedAsset.assets.length === 0) {
+    return /* @__PURE__ */ jsx(StyledAssetImage, { height, width, src: "", alt: "No asset" });
+  }
   if (dedupedLogoUris.length === 0) {
     return /* @__PURE__ */ jsx(StyledAssetImage, { height, width, src: "", alt: "No valid URIs" });
   }
@@ -45762,18 +46324,21 @@ const GroupedAssetImage = ({
     }
     setCurrentImageIndex((prev2) => prev2 + 1);
   };
-  return /* @__PURE__ */ jsx(
-    StyledAssetImage,
-    {
-      height,
-      width,
-      src: dedupedLogoUris[currentImageIndex],
-      loading: "lazy",
-      onError: handleError,
-      alt: `${groupedAsset.assets[0].recommendedSymbol || ""} logo`,
-      style
-    }
-  );
+  if (croppedImage) {
+    return /* @__PURE__ */ jsx(
+      StyledAssetImage,
+      {
+        height,
+        width,
+        src: croppedImage,
+        loading: "lazy",
+        onError: handleError,
+        alt: `${groupedAsset.assets[0].recommendedSymbol || ""} logo`,
+        style
+      }
+    );
+  }
+  return /* @__PURE__ */ jsx(CircleSkeletonElement, { height: height ?? 0, width: width ?? 0 });
 };
 const StyledAssetImage = dt.img`
   border-radius: 50%;
@@ -45820,6 +46385,7 @@ const SwapExecutionPageRouteDetailedRow = ({
       image: (selectedChainAddress == null ? void 0 : selectedChainAddress.source) === "wallet" && ((_a2 = selectedChainAddress == null ? void 0 : selectedChainAddress.wallet) == null ? void 0 : _a2.walletInfo.logo) || void 0
     };
   }, [chainAddresses, chainId, context]);
+  const walletImage = useCroppedImage(chainAddressWallet.image);
   const renderAddress = useMemo(() => {
     const Container2 = shouldRenderEditDestinationWallet ? ({ children }) => /* @__PURE__ */ jsx(Row, { gap: 5, children }) : o.Fragment;
     if (!chainAddressWallet.address) return;
@@ -45835,15 +46401,15 @@ const SwapExecutionPageRouteDetailedRow = ({
     };
     return /* @__PURE__ */ jsxs(Container2, { children: [
       /* @__PURE__ */ jsxs(AddressPillButton, { onClick: () => copyAddress(chainAddressWallet == null ? void 0 : chainAddressWallet.address), children: [
-        chainAddressWallet.image && /* @__PURE__ */ jsx(
+        walletImage ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: chainAddressWallet.image,
+            src: walletImage,
             style: {
               height: "100%"
             }
           }
-        ),
+        ) : /* @__PURE__ */ jsx(SkeletonElement, { height: 18, width: 18 }),
         renderContent()
       ] }),
       shouldRenderEditDestinationWallet && /* @__PURE__ */ jsx(
@@ -45857,14 +46423,14 @@ const SwapExecutionPageRouteDetailedRow = ({
       )
     ] });
   }, [
-    copyAddress,
-    isMobileScreenSize,
-    isShowingCopyAddressFeedback,
-    onClickEditDestinationWallet,
     shouldRenderEditDestinationWallet,
     chainAddressWallet.address,
-    chainAddressWallet.image,
-    theme.primary.text.lowContrast
+    walletImage,
+    isMobileScreenSize,
+    onClickEditDestinationWallet,
+    theme.primary.text.lowContrast,
+    isShowingCopyAddressFeedback,
+    copyAddress
   ]);
   const renderExplorerLink = useMemo(() => {
     if (!explorerLink) return;
@@ -46093,20 +46659,6 @@ const ModalHeader = ({ title, onClickBackButton, rightContent }) => {
     rightContent
   ] });
 };
-const StyledModalContainer = dt(Column)`
-  position: relative;
-  padding: 10px;
-  gap: 10px;
-  width: calc(100% - 20px);
-  border-radius: 20px;
-  background: ${({ theme }) => theme.primary.background.normal};
-  height: 100%;
-`;
-const StyledModalInnerContainer = dt(Column)`
-  width: 100%;
-  align-items: center;
-  justify-content: center;
-`;
 const StyledHeader = dt(Row)`
   height: 40px;
   margin-top: 10px;
@@ -46115,6 +46667,10 @@ const StyledHeader = dt(Row)`
 const StyledLeftArrowIcon$1 = dt(LeftArrowIcon)`
   opacity: 0.2;
   transform: rotate(180deg);
+  transition: opacity 0.2s;
+  button:hover & {
+    opacity: 1;
+  }
 `;
 const StyledCenteredTitle = dt(Text)`
   position: absolute;
@@ -46130,6 +46686,51 @@ const isMinimalWallet = (wallet) => {
 };
 const ITEM_HEIGHT$3 = 60;
 const ITEM_GAP$2 = 5;
+const WalletRowItem = ({
+  wallet,
+  onClick,
+  rightContent
+}) => {
+  var _a;
+  const name2 = isMinimalWallet(wallet) ? wallet.walletPrettyName ?? wallet.walletName : wallet.walletName;
+  const imageUrl = isMinimalWallet(wallet) ? (_a = wallet.walletInfo) == null ? void 0 : _a.logo : void 0;
+  const isAvailable = isMinimalWallet(wallet) ? wallet.isAvailable : void 0;
+  const croppedImage = useCroppedImage(imageUrl);
+  const renderWalletImage = useMemo(() => {
+    if (!isMinimalWallet(wallet)) return;
+    if (croppedImage) {
+      return /* @__PURE__ */ jsx(
+        "img",
+        {
+          height: 35,
+          width: 35,
+          style: { objectFit: "cover" },
+          src: croppedImage,
+          alt: `${name2}-logo`
+        }
+      );
+    } else {
+      return /* @__PURE__ */ jsx(SkeletonElement, { width: 35, height: 35 });
+    }
+  }, [croppedImage, name2, wallet]);
+  const leftContent = /* @__PURE__ */ jsxs(Row, { style: { width: "100%" }, align: "center", justify: "space-between", children: [
+    /* @__PURE__ */ jsxs(Row, { align: "center", gap: 10, children: [
+      renderWalletImage,
+      /* @__PURE__ */ jsx(Text, { children: name2 })
+    ] }),
+    isAvailable !== void 0 && /* @__PURE__ */ jsx(SmallText, { children: isAvailable ? "Installed" : "Not Installed" })
+  ] });
+  return /* @__PURE__ */ jsx(
+    ModalRowItem,
+    {
+      onClick,
+      style: { marginTop: ITEM_GAP$2 },
+      leftContent,
+      rightContent
+    },
+    name2
+  );
+};
 const RenderWalletList = ({
   title,
   walletList,
@@ -46173,21 +46774,7 @@ const RenderWalletList = ({
   const renderItem = useCallback(
     (wallet) => {
       var _a2;
-      const name2 = isMinimalWallet(wallet) ? wallet.walletPrettyName ?? wallet.walletName : wallet.walletName;
-      const imageUrl = isMinimalWallet(wallet) ? (_a2 = wallet == null ? void 0 : wallet.walletInfo) == null ? void 0 : _a2.logo : void 0;
-      const rightContent = isManualWalletEntry(wallet) ? wallet == null ? void 0 : wallet.rightContent : void 0;
-      const isAvailable = isMinimalWallet(wallet) ? wallet == null ? void 0 : wallet.isAvailable : void 0;
-      const renderedRightContent = (rightContent == null ? void 0 : rightContent()) ?? /* @__PURE__ */ jsx(Fragment, {});
-      const imageElement = imageUrl ? /* @__PURE__ */ jsx(
-        "img",
-        {
-          height: 35,
-          width: 35,
-          style: { objectFit: "cover" },
-          src: imageUrl,
-          alt: `${name2}-logo`
-        }
-      ) : null;
+      const rightContent = isManualWalletEntry(wallet) ? (_a2 = wallet == null ? void 0 : wallet.rightContent) == null ? void 0 : _a2.call(wallet) : void 0;
       const onClickConnectWallet = () => {
         if (!isMinimalWallet(wallet)) {
           wallet.onSelect();
@@ -46200,23 +46787,7 @@ const RenderWalletList = ({
           connectMutation.mutate(wallet);
         }
       };
-      const leftContent = /* @__PURE__ */ jsxs(Row, { style: { width: "100%" }, align: "center", justify: "space-between", children: [
-        /* @__PURE__ */ jsxs(Row, { align: "center", gap: 10, children: [
-          imageElement,
-          /* @__PURE__ */ jsx(Text, { children: name2 })
-        ] }),
-        isAvailable !== void 0 && /* @__PURE__ */ jsx(SmallText, { children: isAvailable ? "Installed" : "Not Installed" })
-      ] });
-      return /* @__PURE__ */ jsx(
-        ModalRowItem,
-        {
-          onClick: onClickConnectWallet,
-          style: { marginTop: ITEM_GAP$2 },
-          leftContent,
-          rightContent: renderedRightContent
-        },
-        name2
-      );
+      return /* @__PURE__ */ jsx(WalletRowItem, { wallet, onClick: onClickConnectWallet, rightContent });
     },
     [connectMutation, onSelectWallet]
   );
@@ -46991,23 +47562,24 @@ const ConnectEcoRow = ({
     });
     onClick == null ? void 0 : onClick();
   };
+  const walletImage = useCroppedImage(account == null ? void 0 : account.wallet.logo);
   return /* @__PURE__ */ jsx(
     ModalRowItem,
     {
       style: { marginTop: ITEM_GAP$1, minHeight: `${ITEM_HEIGHT$2}px` },
       onClick: handleConnectClick,
       leftContent: account ? /* @__PURE__ */ jsxs(Row, { align: "center", gap: 10, children: [
-        (account == null ? void 0 : account.wallet.logo) && /* @__PURE__ */ jsx(
+        walletImage ? /* @__PURE__ */ jsx(
           "img",
           {
             height: STANDARD_ICON_SIZE,
             width: STANDARD_ICON_SIZE,
             style: { objectFit: "cover" },
-            src: account == null ? void 0 : account.wallet.logo,
+            src: walletImage,
             alt: `${account == null ? void 0 : account.wallet.prettyName} logo`,
             title: account == null ? void 0 : account.wallet.prettyName
           }
-        ),
+        ) : /* @__PURE__ */ jsx(SkeletonElement, { height: STANDARD_ICON_SIZE, width: STANDARD_ICON_SIZE }),
         /* @__PURE__ */ jsxs(Row, { align: "baseline", gap: 8, children: [
           /* @__PURE__ */ jsx(Tooltip, { content: account == null ? void 0 : account.address, children: /* @__PURE__ */ jsx(Text, { children: truncatedAddress }) }),
           /* @__PURE__ */ jsx(
@@ -47120,6 +47692,7 @@ const WalletSelectorModal = createModal((modalProps) => {
         return "Connect wallet";
     }
   }, [selectedEcoChain == null ? void 0 : selectedEcoChain.chainType, sourceAssetChain == null ? void 0 : sourceAssetChain.chainType]);
+  const walletIcon = useCroppedImage((selectedEcoChain == null ? void 0 : selectedEcoChain.logoUri) ?? (sourceAssetChain == null ? void 0 : sourceAssetChain.logoUri));
   return /* @__PURE__ */ jsx(
     RenderWalletList,
     {
@@ -47128,14 +47701,7 @@ const WalletSelectorModal = createModal((modalProps) => {
       onClickBackButton: handleOnClickBackButton,
       isConnectEco: fromConnectedWalletModal,
       chainId,
-      headerRightContent: /* @__PURE__ */ jsx(StyledChainLogoContainerRow$1, { align: "center", justify: "center", children: /* @__PURE__ */ jsx(
-        "img",
-        {
-          width: "25px",
-          height: "25px",
-          src: (selectedEcoChain == null ? void 0 : selectedEcoChain.logoUri) ?? (sourceAssetChain == null ? void 0 : sourceAssetChain.logoUri)
-        }
-      ) }),
+      headerRightContent: /* @__PURE__ */ jsx(StyledChainLogoContainerRow$1, { align: "center", justify: "center", children: walletIcon ? /* @__PURE__ */ jsx("img", { width: "25px", height: "25px", src: walletIcon }) : /* @__PURE__ */ jsx(SkeletonElement, { width: 25, height: 25 }) }),
       bottomContent: showOtherEcosytems && /* @__PURE__ */ jsxs(
         Column,
         {
@@ -47407,7 +47973,10 @@ const StyledSettingsOptionLabel = dt(SmallText)`
 
   background: ${({ theme }) => theme.secondary.background.transparent};
   padding: 7px 15px;
-  border-radius: 15px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.selectionButton);
+}};
   height: 40px;
   display: flex;
   align-items: center;
@@ -47597,7 +48166,10 @@ const SwapSettingsDrawer = createModal(() => {
 const StyledSwapPageSettings = dt(Column)`
   width: 100%;
   padding: 20px;
-  border-radius: 20px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.modalContainer);
+}};
   background: ${(props) => props.theme.primary.background.normal};
 `;
 const SwapDetailText = dt(Row).attrs({
@@ -47610,16 +48182,6 @@ const SwapDetailText = dt(Row).attrs({
 const UnderlineText = dt.u`
   text-decoration-line: unset;
 `;
-const SkeletonElement = dt.div`
-  ${({ width, height, theme }) => lt`
-    width: ${width}px;
-    height: ${height}px;
-    background-color: ${getHexColor(theme.primary.text.normal ?? "") + opacityToHex(10)};
-  `};
-`;
-const CircleSkeletonElement = dt(SkeletonElement)`
-  border-radius: 50%;
-`;
 const PRIVILEGED_ASSETS = ["ATOM", "USDC", "USDT", "ETH", "TIA", "OSMO", "NTRN", "INJ"];
 const assetSymbolsSortedToTopAtom = atom$1(PRIVILEGED_ASSETS);
 const EXCLUDED_TOKEN_COMBINATIONS = [{ id: "SOL", chainIDs: ["solana"] }];
@@ -47844,10 +48406,11 @@ const GroupedAssetRow = ({
   );
 };
 const ChainWithAssetRow = ({ item, eureka }) => {
+  const chainImage = useCroppedImage(item == null ? void 0 : item.logoUri);
   return /* @__PURE__ */ jsx(
     RowLayout,
     {
-      image: /* @__PURE__ */ jsx(StyledChainImage, { height: 35, width: 35, src: item == null ? void 0 : item.logoUri, alt: `${item.chainId} logo` }),
+      image: chainImage ? /* @__PURE__ */ jsx(StyledChainImage, { height: 35, width: 35, src: chainImage, alt: `${item.chainId} logo` }) : /* @__PURE__ */ jsx(CircleSkeletonElement, { height: 35, width: 35 }),
       mainText: item.prettyName,
       subText: /* @__PURE__ */ jsx(SmallText, { children: item.chainId }),
       eureka
@@ -47977,6 +48540,7 @@ const ChevronIcon = ({
   color = "currentColor",
   backgroundColor = "transparent",
   noBackground = false,
+  backgroundRx = 10,
   ...props
 }) => /* @__PURE__ */ jsxs(
   "svg",
@@ -47988,7 +48552,7 @@ const ChevronIcon = ({
     xmlns: "http://www.w3.org/2000/svg",
     ...props,
     children: [
-      !noBackground && /* @__PURE__ */ jsx("rect", { width: "40", height: "40", rx: "10", fill: backgroundColor }),
+      !noBackground && /* @__PURE__ */ jsx("rect", { width: "40", height: "40", rx: backgroundRx, fill: backgroundColor }),
       /* @__PURE__ */ jsx(
         "path",
         {
@@ -48028,6 +48592,7 @@ const SwapPageAssetChainInput = ({
   badPriceWarning,
   disabled
 }) => {
+  var _a;
   const theme = nt();
   const [_showPriceChangePercentage, setShowPriceChangePercentage] = useState(false);
   const isMobileScreenSize = useIsMobileScreenSize();
@@ -48040,8 +48605,8 @@ const SwapPageAssetChainInput = ({
   const groupedAssetsByRecommendedSymbol = useGroupedAssetByRecommendedSymbol();
   const groupedAsset = groupedAssetsByRecommendedSymbol == null ? void 0 : groupedAssetsByRecommendedSymbol.find(
     (group) => {
-      var _a;
-      return group.id === ((_a = assetDetails.asset) == null ? void 0 : _a.recommendedSymbol);
+      var _a2;
+      return group.id === ((_a2 = assetDetails.asset) == null ? void 0 : _a2.recommendedSymbol);
     }
   );
   const handleInputChange = (e) => {
@@ -48111,7 +48676,7 @@ const SwapPageAssetChainInput = ({
   }, [priceChangePercentage, theme.error.text, theme.primary.text.normal, theme.success.text]);
   const displayedValue = formatNumberWithCommas(value || "");
   const isLargeNumber = shouldReduceFontSize(value);
-  return /* @__PURE__ */ jsxs(StyledAssetChainInputWrapper, { justify: "space-between", borderRadius: 25, children: [
+  return /* @__PURE__ */ jsxs(StyledAssetChainInputWrapper, { justify: "space-between", children: [
     /* @__PURE__ */ jsxs(Row, { justify: "space-between", children: [
       /* @__PURE__ */ jsx(
         StyledInput$1,
@@ -48158,7 +48723,8 @@ const SwapPageAssetChainInput = ({
           {
             className: "chevron-icon",
             color: theme.primary.text.normal,
-            backgroundColor: theme.secondary.background.normal
+            backgroundColor: theme.secondary.background.normal,
+            backgroundRx: (_a = theme.borderRadius) == null ? void 0 : _a.selectionButton
           }
         )
       ] })
@@ -48215,6 +48781,10 @@ const StyledAssetChainInputWrapper = dt(Column)`
   height: 110px;
   width: 100%;
   background: ${(props) => props.theme.primary.background.normal};
+  border-radius: ${(props) => {
+  var _a;
+  return convertToPxValue((_a = props.theme.borderRadius) == null ? void 0 : _a.main);
+}};
   padding: 20px;
   @media (max-width: 767px) {
     padding: 15px;
@@ -48270,7 +48840,10 @@ const StyledAssetLabel = dt(Row).attrs({
   padding: 8
 })`
   height: 40px;
-  border-radius: 10px;
+  border-radius: ${(props) => {
+  var _a;
+  return convertToPxValue((_a = props.theme.borderRadius) == null ? void 0 : _a.selectionButton);
+}};
   white-space: nowrap;
   position: relative;
 
@@ -48286,7 +48859,10 @@ const StyledAssetLabel = dt(Row).attrs({
     height: 100%;
     background-color: rgba(255, 255, 255, 0);
     pointer-events: none;
-    border-radius: 10px;
+    border-radius: ${(props) => {
+  var _a;
+  return convertToPxValue((_a = props.theme.borderRadius) == null ? void 0 : _a.selectionButton);
+}};
     ${transition(["background-color"], "fast", "easeOut")};
     z-index: 0;
   }
@@ -49115,7 +49691,7 @@ const WarningPageLowInfo = ({
       {
         title: "Warning: Incomplete Price Data",
         description: /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsxs(SmallText, { color: theme.warning.text, textAlign: "center", textWrap: "balance", children: [
+          /* @__PURE__ */ jsx(SmallText, { color: theme.warning.text, textAlign: "center", textWrap: "balance", children: /* @__PURE__ */ jsxs(StyledDescriptionContent, { children: [
             "USD price data is missing for one of the assets, please double check the input and output amounts are acceptable before continuing.",
             /* @__PURE__ */ jsx("br", {}),
             sourceDetails.amount,
@@ -49125,7 +49701,7 @@ const WarningPageLowInfo = ({
             destinationDetails.amount,
             " ",
             destinationDetails.symbol
-          ] }),
+          ] }) }),
           /* @__PURE__ */ jsx(
             SmallTextButton,
             {
@@ -49157,6 +49733,9 @@ const WarningPageLowInfo = ({
     )
   ] });
 };
+const StyledDescriptionContent = dt.div`
+  line-height: 1.5;
+`;
 const ExpectedErrorPageInsufficientGasBalance = ({
   error,
   onClickBack
@@ -49341,6 +49920,12 @@ const SwapExecutionPageRouteSimpleRow = ({
       }
     }
   }, [chainAddresses, context]);
+  const walletImage = useCroppedImage(source.image);
+  const renderWalletImage = useMemo(() => {
+    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]);
   const renderExplorerLink = useMemo(() => {
     if (!explorerLink) return;
     if (isMobileScreenSize) {
@@ -49380,7 +49965,7 @@ const SwapExecutionPageRouteSimpleRow = ({
           assetDetails.chainName
         ] }),
         /* @__PURE__ */ jsxs(Button, { align: "center", gap: 3, onClick: () => copyAddress(source.address), children: [
-          source.image && /* @__PURE__ */ jsx("img", { height: 10, width: 10, src: source.image }),
+          renderWalletImage,
           source.address && /* @__PURE__ */ jsx(SmallText, { monospace: true, title: source.address, textWrap: "nowrap", children: isShowingCopyAddressFeedback ? "Address copied!" : getTruncatedAddress(source.address, isMobileScreenSize) })
         ] }),
         explorerLink ? renderExplorerLink : onClickEditDestinationWallet ? /* @__PURE__ */ jsx(
@@ -49517,7 +50102,10 @@ const StyledBridgeArrowIcon = dt(BridgeArrowIcon)`
 const StyledSwapExecutionPageRoute$1 = dt(Column)`
   padding: 30px;
   background: ${({ theme }) => theme.primary.background.normal};
-  border-radius: 25px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
   min-height: 225px;
 `;
 const SwapExecutionBridgeIcon = ({
@@ -49785,7 +50373,10 @@ const StyledSwapExecutionPageRoute = dt(Column)`
   padding: 25px;
   gap: 20px;
   background: ${({ theme }) => theme.primary.background.normal};
-  border-radius: 25px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
   min-height: 225px;
 `;
 const StyledSwapVenueOrBridgeImage = dt.img`
@@ -49993,7 +50584,7 @@ const useHandleTransactionTimeout = (swapExecutionState) => {
 };
 const useSyncTxStatus = ({
   statusData,
-  historyIndex
+  timestamp
 }) => {
   const transferEvents = statusData == null ? void 0 : statusData.transferEvents;
   const setOverallStatus = useSetAtom(setOverallStatusAtom);
@@ -50004,7 +50595,7 @@ const useSyncTxStatus = ({
     transactionHistoryIndex: currentTransactionHistoryIndex
   } = useAtomValue(swapExecutionStateAtom);
   const setTransactionHistory = useSetAtom(setTransactionHistoryAtom);
-  const txHistory = useAtomValue(transactionHistoryAtom);
+  const transactionHistoryItems = useAtomValue(transactionHistoryAtom);
   const { isPending } = useAtomValue(skipSubmitSwapExecutionAtom);
   const clientOperations = useMemo(() => {
     if (!(route2 == null ? void 0 : route2.operations)) return [];
@@ -50039,16 +50630,18 @@ const useSyncTxStatus = ({
     setOverallStatus
   ]);
   useEffect(() => {
-    if (computedSwapStatus) {
-      const index = historyIndex ?? currentTransactionHistoryIndex;
+    if (computedSwapStatus && timestamp !== void 0) {
+      const index = transactionHistoryItems.findIndex(
+        (txHistoryItem) => txHistoryItem.timestamp === timestamp
+      );
+      const oldTxHistoryItem = transactionHistoryItems[index];
       const newTxHistoryItem = {
-        ...txHistory[index],
+        ...oldTxHistoryItem,
         ...statusData,
         status: computedSwapStatus
       };
-      const oldTxHistoryItem = txHistory[index];
       if (JSON.stringify(newTxHistoryItem) !== JSON.stringify(oldTxHistoryItem)) {
-        setTransactionHistory(index, newTxHistoryItem);
+        setTransactionHistory(newTxHistoryItem);
         setOverallStatus(computedSwapStatus);
       }
     }
@@ -50058,11 +50651,11 @@ const useSyncTxStatus = ({
     computedSwapStatus,
     setOverallStatus,
     transactionDetailsArray.length,
-    txHistory,
+    transactionHistoryItems,
     statusData,
     setTransactionHistory,
-    historyIndex,
-    currentTransactionHistoryIndex
+    currentTransactionHistoryIndex,
+    timestamp
   ]);
 };
 function useSwapExecutionState({
@@ -50357,7 +50950,9 @@ const useHandleTransactionFailed = (error, statusData) => {
     if (sourceClientAsset) {
       track("unexpected error page: transaction reverted", {
         transferAssetRelease: statusData == null ? void 0 : statusData.transferAssetRelease,
-        lastTransaction
+        lastTransaction,
+        error,
+        route: route2
       });
       setErrorWarning({
         errorWarningType: ErrorWarningType.TransactionReverted,
@@ -50374,7 +50969,7 @@ const useHandleTransactionFailed = (error, statusData) => {
         transferAssetRelease: statusData == null ? void 0 : statusData.transferAssetRelease
       });
     } else if (explorerLink) {
-      track("unexpected error page: transaction failed", { lastTransaction });
+      track("unexpected error page: transaction failed", { lastTransaction, error, route: route2 });
       setErrorWarning({
         errorWarningType: ErrorWarningType.TransactionFailed,
         onClickContactSupport: () => window.open("https://skip.build/discord", "_blank"),
@@ -50448,6 +51043,7 @@ var SwapExecutionState = /* @__PURE__ */ ((SwapExecutionState2) => {
   return SwapExecutionState2;
 })(SwapExecutionState || {});
 const SwapExecutionPage = () => {
+  var _a;
   const setCurrentPage = useSetAtom(currentPageAtom);
   const {
     route: route2,
@@ -50457,6 +51053,7 @@ const SwapExecutionPage = () => {
     isValidatingGasBalance,
     transactionsSigned
   } = useAtomValue(swapExecutionStateAtom);
+  const lastTransactionInTime = useAtomValue(lastTransactionInTimeAtom);
   const chainAddresses = useAtomValue(chainAddressesAtom);
   const { connectRequiredChains, isLoading } = useAutoSetAddress();
   const [simpleRoute, setSimpleRoute] = useState(true);
@@ -50471,7 +51068,8 @@ const SwapExecutionPage = () => {
   const lastTxHash = lastTransaction == null ? void 0 : lastTransaction.txHash;
   const lastTxChainId = lastTransaction == null ? void 0 : lastTransaction.chainId;
   useSyncTxStatus({
-    statusData
+    statusData,
+    timestamp: (_a = lastTransactionInTime == null ? void 0 : lastTransactionInTime.transactionHistoryItem) == null ? void 0 : _a.timestamp
   });
   const lastOperation = clientOperations[clientOperations.length - 1];
   const swapExecutionState = useSwapExecutionState({
@@ -50494,12 +51092,12 @@ const SwapExecutionPage = () => {
     }
   }, [swapExecutionState]);
   const secondOperationStatus = useMemo(() => {
-    var _a;
+    var _a2;
     const status = statusData == null ? void 0 : statusData.transferEvents;
     if (swapExecutionState === 6) {
       return "completed";
     }
-    if ((_a = status == null ? void 0 : status[0]) == null ? void 0 : _a.status) {
+    if ((_a2 = status == null ? void 0 : status[0]) == null ? void 0 : _a2.status) {
       return status[0].status;
     }
     if (swapExecutionState === 3 || swapExecutionState === 5) {
@@ -51015,10 +51613,13 @@ const useUpdateAmountWhenRouteChanges = () => {
   const [direction] = useAtom(swapDirectionAtom);
   const [sourceAsset, setSourceAsset] = useAtom(sourceAssetAtom);
   const [destinationAsset, setDestinationAsset] = useAtom(destinationAssetAtom);
+  const prevRoute = useRef(route2.data);
   useEffect(() => {
     if (!route2.data || !sourceAsset || !destinationAsset) return;
-    if ((sourceAsset == null ? void 0 : sourceAsset.amount) === "" && direction === "swap-in") return;
-    if ((destinationAsset == null ? void 0 : destinationAsset.amount) === "" && direction === "swap-out") return;
+    if (route2.data === prevRoute.current) return;
+    prevRoute.current = route2.data;
+    if (sourceAsset.amount === "" && direction === "swap-in") return;
+    if (destinationAsset.amount === "" && direction === "swap-out") return;
     const swapInAmount = convertTokenAmountToHumanReadableAmount(
       route2.data.amountOut,
       destinationAsset.decimals
@@ -51027,26 +51628,18 @@ const useUpdateAmountWhenRouteChanges = () => {
       route2.data.amountIn,
       sourceAsset.decimals
     );
-    const swapInAmountChanged = hasAmountChanged(
-      swapInAmount,
-      (destinationAsset == null ? void 0 : destinationAsset.amount) ?? ""
-    );
-    const swapOutAmountChanged = hasAmountChanged(
-      swapOutAmount,
-      (sourceAsset == null ? void 0 : sourceAsset.amount) ?? ""
-    );
-    if (direction === "swap-in" && swapInAmountChanged) {
+    if (direction === "swap-in") {
       setDestinationAsset((old) => ({
         ...old,
-        amount: swapInAmount
+        amount: removeTrailingZeros(swapInAmount)
       }));
-    } else if (direction === "swap-out" && swapOutAmountChanged) {
+    } else if (direction === "swap-out") {
       setSourceAsset((old) => ({
         ...old,
-        amount: swapOutAmount
+        amount: removeTrailingZeros(swapOutAmount)
       }));
     }
-  }, [route2.data, sourceAsset, destinationAsset, direction, setSourceAsset, setDestinationAsset]);
+  }, [route2.data, direction, sourceAsset, destinationAsset, setSourceAsset, setDestinationAsset]);
 };
 const useShowCosmosLedgerWarning = () => {
   var _a;
@@ -51085,6 +51678,7 @@ const ConnectedWalletContent = () => {
     amount: sourceAsset == null ? void 0 : sourceAsset.amount,
     chainId: sourceAsset == null ? void 0 : sourceAsset.chainId
   });
+  const walletImage = useCroppedImage(sourceAccount == null ? void 0 : sourceAccount.wallet.logo);
   const { data: sourceBalance, isLoading } = useGetSourceBalance();
   const handleMaxButton = useSetMaxAmount();
   const maxAmountTokenMinusFees = useMaxAmountTokenMinusFees();
@@ -51101,7 +51695,6 @@ const ConnectedWalletContent = () => {
     Row,
     {
       style: {
-        paddingRight: 8,
         gap: 1
       },
       children: [
@@ -51115,15 +51708,7 @@ const ConnectedWalletContent = () => {
             align: "center",
             gap: 8,
             children: [
-              (sourceAccount == null ? void 0 : sourceAccount.wallet.logo) && /* @__PURE__ */ jsx(
-                "img",
-                {
-                  style: { objectFit: "cover" },
-                  src: sourceAccount == null ? void 0 : sourceAccount.wallet.logo,
-                  height: 16,
-                  width: 16
-                }
-              ),
+              walletImage ? /* @__PURE__ */ jsx("img", { style: { objectFit: "cover" }, src: walletImage, height: 16, width: 16 }) : /* @__PURE__ */ jsx(SkeletonElement, { height: 16, width: 16 }),
               isLoading ? /* @__PURE__ */ jsx(
                 "div",
                 {
@@ -51164,7 +51749,7 @@ const ConnectedWalletContent = () => {
     }
   );
 };
-const useTxHistory = ({ txHistoryItem, index }) => {
+const useTxHistory = ({ txHistoryItem }) => {
   var _a, _b, _c;
   const { data: chains2 } = useAtomValue(skipChainsAtom);
   const txs = (_a = txHistoryItem == null ? void 0 : txHistoryItem.transactionDetails) == null ? void 0 : _a.map((tx) => ({
@@ -51192,7 +51777,7 @@ const useTxHistory = ({ txHistoryItem, index }) => {
   }
   useSyncTxStatus({
     statusData,
-    historyIndex: index
+    timestamp: txHistoryItem == null ? void 0 : txHistoryItem.timestamp
   });
   const explorerLinks = /* @__PURE__ */ new Set();
   (_c = statusData == null ? void 0 : statusData.transferEvents) == null ? void 0 : _c.forEach((transferEvent) => {
@@ -51272,14 +51857,12 @@ const SwapPageHeader = memo(() => {
   ] });
 });
 const TrackLatestTxHistoryItemStatus = memo(() => {
-  const transactionhistory = useAtomValue(transactionHistoryAtom);
+  const lastTxHistoryItemInTime = useAtomValue(lastTransactionInTimeAtom);
   const setOverallStatus = useSetAtom(setOverallStatusAtom);
   const { transactionsSigned, transactionDetailsArray } = useAtomValue(swapExecutionStateAtom);
   const { isPending } = useAtomValue(skipSubmitSwapExecutionAtom);
-  const lastTxHistoryItem = transactionhistory.at(-1);
   const { transferAssetRelease } = useTxHistory({
-    txHistoryItem: lastTxHistoryItem,
-    index: transactionhistory.length - 1
+    txHistoryItem: lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.transactionHistoryItem
   });
   if (transferAssetRelease && transactionsSigned !== transactionDetailsArray.length && !isPending) {
     setOverallStatus("failed");
@@ -51291,10 +51874,10 @@ const noHistoryItemsAtom = atom$1((get) => {
   return (txHistoryItems == null ? void 0 : txHistoryItems.length) === 0;
 });
 const isFetchingLastTransactionStatusAtom = atom$1((get) => {
-  var _a;
+  var _a, _b, _c;
   const { overallStatus, route: route2, transactionsSigned } = get(swapExecutionStateAtom);
-  const lastTxHistoryItem = get(transactionHistoryAtom).at(-1);
-  return overallStatus === "pending" && transactionsSigned === (route2 == null ? void 0 : route2.txsRequired) || (lastTxHistoryItem == null ? void 0 : lastTxHistoryItem.isSettled) !== true && ((_a = lastTxHistoryItem == null ? void 0 : lastTxHistoryItem.route) == null ? void 0 : _a.txsRequired) === 1;
+  const lastTxHistoryItemInTime = get(lastTransactionInTimeAtom);
+  return overallStatus === "pending" && transactionsSigned === (route2 == null ? void 0 : route2.txsRequired) || ((_a = lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.transactionHistoryItem) == null ? void 0 : _a.isSettled) !== true && ((_c = (_b = lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.transactionHistoryItem) == null ? void 0 : _b.route) == null ? void 0 : _c.txsRequired) === 1;
 });
 const useConnectToMissingCosmosChain = () => {
   const sourceAsset = useAtomValue(sourceAssetAtom);
@@ -51807,14 +52390,23 @@ const TransactionHistoryPageHistoryItemDetails = ({
     ] }),
     /* @__PURE__ */ jsxs(StyledHistoryItemDetailRow, { align: "center", children: [
       /* @__PURE__ */ jsx(StyledDetailsLabel, { children: "Route explorer" }),
-      /* @__PURE__ */ jsxs(Link, { href: skipExplorerLink, target: "_blank", gap: 5, onClick: () => {
-        track("transaction history page: view route explorer - clicked", {
-          txHash: initialTxHash
-        });
-      }, children: [
-        /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, children: getTruncatedAddress(initialTxHash) }),
-        /* @__PURE__ */ jsx(SmallText, { children: /* @__PURE__ */ jsx(ChainIcon, {}) })
-      ] })
+      /* @__PURE__ */ jsxs(
+        Link,
+        {
+          href: skipExplorerLink,
+          target: "_blank",
+          gap: 5,
+          onClick: () => {
+            track("transaction history page: view route explorer - clicked", {
+              txHash: initialTxHash
+            });
+          },
+          children: [
+            /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, children: getTruncatedAddress(initialTxHash) }),
+            /* @__PURE__ */ jsx(SmallText, { children: /* @__PURE__ */ jsx(ChainIcon, {}) })
+          ]
+        }
+      )
     ] }),
     /* @__PURE__ */ jsx(Row, { align: "center", style: { marginTop: 10, padding: "0px 10px" }, children: /* @__PURE__ */ jsxs(Button, { onClick: onClickDelete, gap: 5, align: "center", children: [
       /* @__PURE__ */ jsx(SmallText, { color: theme.error.text, children: "Delete" }),
@@ -52474,121 +53066,118 @@ const FilledWarningIcon = ({
     }
   )
 ] });
-const TransactionHistoryPageHistoryItem = forwardRef(
-  ({ index, txHistoryItem, showDetails, onClickRow }, ref) => {
-    const theme = nt();
-    const isMobileScreenSize = useIsMobileScreenSize();
-    const { status: historyStatus, transferAssetRelease } = useTxHistory({
-      txHistoryItem,
-      index
-    });
-    const removeTransactionHistoryItem = useSetAtom(removeTransactionHistoryItemAtom);
-    const {
-      route: {
-        amountIn,
-        amountOut,
-        sourceAssetDenom,
-        sourceAssetChainId,
-        destAssetDenom,
-        destAssetChainId
-      } = {},
-      timestamp,
-      transactionDetails
-    } = txHistoryItem;
-    const sourceAssetDetails = useGetAssetDetails({
-      assetDenom: sourceAssetDenom,
-      chainId: sourceAssetChainId,
-      tokenAmount: amountIn
-    });
-    const destinationAssetDetails = useGetAssetDetails({
-      assetDenom: destAssetDenom,
-      chainId: destAssetChainId,
-      tokenAmount: amountOut
-    });
-    const source = {
-      amount: sourceAssetDetails.amount,
-      asset: sourceAssetDetails.asset,
-      assetImage: sourceAssetDetails.assetImage ?? "",
-      chainName: sourceAssetDetails.chainName
-    };
-    const destination = {
-      amount: destinationAssetDetails.amount,
-      asset: destinationAssetDetails.asset,
-      assetImage: destinationAssetDetails.assetImage ?? "",
-      chainName: destinationAssetDetails.chainName
-    };
-    const renderStatus = useMemo(() => {
-      switch (historyStatus) {
-        case "unconfirmed":
-        case "pending":
-          return /* @__PURE__ */ jsx(
-            StyledAnimatedBorder,
-            {
-              width: 10,
-              height: 10,
-              backgroundColor: theme.primary.text.normal,
-              status: "pending"
-            }
-          );
-        case "completed":
-          return /* @__PURE__ */ jsx(StyledGreenDot, {});
-        case "incomplete":
-        case "failed": {
-          if (transferAssetRelease) {
-            return /* @__PURE__ */ jsx(FilledWarningIcon, { backgroundColor: theme.warning.text });
-          } else return /* @__PURE__ */ jsx(XIcon, { color: theme.error.text });
-        }
-      }
-    }, [
-      historyStatus,
-      theme.primary.text.normal,
-      theme.error.text,
-      theme.warning.text,
-      transferAssetRelease
-    ]);
-    const absoluteTimeString = useMemo(() => {
-      if (isMobileScreenSize) {
-        return getMobileDateFormat(new Date(timestamp));
-      }
-      return new Date(timestamp).toLocaleString();
-    }, [isMobileScreenSize, timestamp]);
-    const relativeTime = useMemo(() => {
-      if (historyStatus === "pending") {
-        return "In Progress";
-      }
-      if (!timestamp) return "";
-      return formatDistanceStrict(new Date(timestamp), /* @__PURE__ */ new Date(), {
-        addSuffix: true
-      }).replace("minutes", "mins").replace("minute", "min").replace("hours", "hrs").replace("hour", "hr").replace("seconds", "secs").replace("second", "sec").replace("months", "mos").replace("month", "mo").replace("years", "yrs").replace("year", "yr");
-    }, [timestamp, historyStatus]);
-    if (!txHistoryItem.route) return null;
-    return /* @__PURE__ */ jsxs(StyledHistoryContainer, { ref, showDetails, children: [
-      /* @__PURE__ */ jsxs(StyledHistoryItemRow, { align: "center", justify: "space-between", onClick: onClickRow, children: [
-        /* @__PURE__ */ jsxs(Row, { gap: 8, align: "center", children: [
-          /* @__PURE__ */ jsx(RenderAssetAmount, { ...source, sourceAsset: true }),
-          /* @__PURE__ */ jsx(ThinArrowIcon, { color: theme.primary.text.lowContrast, direction: "right" }),
-          /* @__PURE__ */ jsx(RenderAssetAmount, { ...destination })
-        ] }),
-        /* @__PURE__ */ jsxs(Row, { align: "center", gap: 6, children: [
-          /* @__PURE__ */ jsx(SmallText, { children: relativeTime }),
-          /* @__PURE__ */ jsx(Row, { width: 20, align: "center", justify: "center", children: renderStatus })
-        ] })
+const TransactionHistoryPageHistoryItem = forwardRef(({ txHistoryItem, showDetails, onClickRow }, ref) => {
+  const theme = nt();
+  const isMobileScreenSize = useIsMobileScreenSize();
+  const { status: historyStatus, transferAssetRelease } = useTxHistory({
+    txHistoryItem
+  });
+  const removeTransactionHistoryItem = useSetAtom(removeTransactionHistoryItemAtom);
+  const {
+    route: {
+      amountIn,
+      amountOut,
+      sourceAssetDenom,
+      sourceAssetChainId,
+      destAssetDenom,
+      destAssetChainId
+    } = {},
+    timestamp,
+    transactionDetails
+  } = txHistoryItem;
+  const sourceAssetDetails = useGetAssetDetails({
+    assetDenom: sourceAssetDenom,
+    chainId: sourceAssetChainId,
+    tokenAmount: amountIn
+  });
+  const destinationAssetDetails = useGetAssetDetails({
+    assetDenom: destAssetDenom,
+    chainId: destAssetChainId,
+    tokenAmount: amountOut
+  });
+  const source = {
+    amount: sourceAssetDetails.amount,
+    asset: sourceAssetDetails.asset,
+    assetImage: sourceAssetDetails.assetImage ?? "",
+    chainName: sourceAssetDetails.chainName
+  };
+  const destination = {
+    amount: destinationAssetDetails.amount,
+    asset: destinationAssetDetails.asset,
+    assetImage: destinationAssetDetails.assetImage ?? "",
+    chainName: destinationAssetDetails.chainName
+  };
+  const renderStatus = useMemo(() => {
+    switch (historyStatus) {
+      case "unconfirmed":
+      case "pending":
+        return /* @__PURE__ */ jsx(
+          StyledAnimatedBorder,
+          {
+            width: 10,
+            height: 10,
+            backgroundColor: theme.primary.text.normal,
+            status: "pending"
+          }
+        );
+      case "completed":
+        return /* @__PURE__ */ jsx(StyledGreenDot, {});
+      case "incomplete":
+      case "failed": {
+        if (transferAssetRelease) {
+          return /* @__PURE__ */ jsx(FilledWarningIcon, { backgroundColor: theme.warning.text });
+        } else return /* @__PURE__ */ jsx(XIcon, { color: theme.error.text });
+      }
+    }
+  }, [
+    historyStatus,
+    theme.primary.text.normal,
+    theme.error.text,
+    theme.warning.text,
+    transferAssetRelease
+  ]);
+  const absoluteTimeString = useMemo(() => {
+    if (isMobileScreenSize) {
+      return getMobileDateFormat(new Date(timestamp));
+    }
+    return new Date(timestamp).toLocaleString();
+  }, [isMobileScreenSize, timestamp]);
+  const relativeTime = useMemo(() => {
+    if (historyStatus === "pending") {
+      return "In Progress";
+    }
+    if (!timestamp) return "";
+    return formatDistanceStrict(new Date(timestamp), /* @__PURE__ */ new Date(), {
+      addSuffix: true
+    }).replace("minutes", "mins").replace("minute", "min").replace("hours", "hrs").replace("hour", "hr").replace("seconds", "secs").replace("second", "sec").replace("months", "mos").replace("month", "mo").replace("years", "yrs").replace("year", "yr");
+  }, [timestamp, historyStatus]);
+  if (!txHistoryItem.route) return null;
+  return /* @__PURE__ */ jsxs(StyledHistoryContainer, { ref, showDetails, children: [
+    /* @__PURE__ */ jsxs(StyledHistoryItemRow, { align: "center", justify: "space-between", onClick: onClickRow, children: [
+      /* @__PURE__ */ jsxs(Row, { gap: 8, align: "center", children: [
+        /* @__PURE__ */ jsx(RenderAssetAmount, { ...source, sourceAsset: true }),
+        /* @__PURE__ */ jsx(ThinArrowIcon, { color: theme.primary.text.lowContrast, direction: "right" }),
+        /* @__PURE__ */ jsx(RenderAssetAmount, { ...destination })
       ] }),
-      showDetails && /* @__PURE__ */ jsx(
-        TransactionHistoryPageHistoryItemDetails,
-        {
-          status: historyStatus,
-          transactionDetails,
-          sourceChainName: sourceAssetDetails.chainName ?? "--",
-          destinationChainName: destinationAssetDetails.chainName ?? "--",
-          absoluteTimeString,
-          onClickDelete: () => removeTransactionHistoryItem(index),
-          transferAssetRelease
-        }
-      )
-    ] });
-  }
-);
+      /* @__PURE__ */ jsxs(Row, { align: "center", gap: 6, children: [
+        /* @__PURE__ */ jsx(SmallText, { children: relativeTime }),
+        /* @__PURE__ */ jsx(Row, { width: 20, align: "center", justify: "center", children: renderStatus })
+      ] })
+    ] }),
+    showDetails && /* @__PURE__ */ jsx(
+      TransactionHistoryPageHistoryItemDetails,
+      {
+        status: historyStatus,
+        transactionDetails,
+        sourceChainName: sourceAssetDetails.chainName ?? "--",
+        destinationChainName: destinationAssetDetails.chainName ?? "--",
+        absoluteTimeString,
+        onClickDelete: () => removeTransactionHistoryItem(txHistoryItem.timestamp),
+        transferAssetRelease
+      }
+    )
+  ] });
+});
 TransactionHistoryPageHistoryItem.displayName = "TransactionHistoryPageHistoryItem";
 const RenderAssetAmount = ({
   amount,
@@ -52607,7 +53196,7 @@ const RenderAssetAmount = ({
     return verboseString;
   }, [asset, chainName, isMobileScreenSize, sourceAsset]);
   return /* @__PURE__ */ jsxs(Row, { gap: 8, align: "center", children: [
-    /* @__PURE__ */ jsx("img", { height: 30, width: 30, src: assetImage, alt: subtitle }),
+    assetImage ? /* @__PURE__ */ jsx("img", { height: "auto", width: 30, src: assetImage, alt: subtitle }) : /* @__PURE__ */ jsx(CircleSkeletonElement, { height: 30, width: 30 }),
     /* @__PURE__ */ jsxs(Column, { style: sourceAsset ? { width: 50 } : void 0, children: [
       /* @__PURE__ */ jsx(Tooltip, { content: amount, style: { width: "min-content" }, children: /* @__PURE__ */ jsx(Text, { normalTextColor: true, style: { width: "max-content" }, children: formatDisplayAmount(amount, {
         decimals: 2
@@ -52622,7 +53211,10 @@ const StyledHistoryContainer = dt(Column)`
     background: ${({ theme }) => theme.secondary.background.normal};
   }
   min-height: 55px;
-  border-radius: 6px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.rowItem);
+}};
   justify-content: center;
 `;
 const StyledHistoryItemRow = dt(Row)`
@@ -52640,7 +53232,7 @@ const StyledGreenDot = dt.div`
   border-radius: 50%;
 `;
 const TransactionHistoryPage = () => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const theme = nt();
   const setCurrentPage = useSetAtom(currentPageAtom);
   const [itemIndexToShowDetail, setItemIndexToShowDetail] = useState(void 0);
@@ -52689,10 +53281,10 @@ const TransactionHistoryPage = () => {
           }
         ),
         itemKey: (item) => {
-          var _a2, _b2;
-          return ((_b2 = (_a2 = item == null ? void 0 : item.transactionDetails) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.txHash) ?? item.timestamp;
+          var _a2;
+          return (_a2 = item.timestamp) == null ? void 0 : _a2.toString();
         },
-        expandedItemKey: itemIndexToShowDetail ? (_d = (_c = (_b = historyList[itemIndexToShowDetail]) == null ? void 0 : _b.transactionDetails) == null ? void 0 : _c[0]) == null ? void 0 : _d.txHash : void 0
+        expandedItemKey: itemIndexToShowDetail ? (_c = (_b = historyList[itemIndexToShowDetail]) == null ? void 0 : _b.timestamp) == null ? void 0 : _c.toString() : void 0
       },
       txHistory.length
     ) }),
@@ -52704,7 +53296,10 @@ const StyledContainer = dt(Column)`
   padding: 20px;
   width: 100%;
   min-height: 300px;
-  border-radius: 25px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
   background: ${({ theme }) => theme.primary.background.normal};
 `;
 const useKeepWalletStateSynced = () => {
@@ -52871,7 +53466,7 @@ const initSentry = () => {
 };
 const name = "@skip-go/widget";
 const description = "Swap widget";
-const version = "3.11.2";
+const version = "3.12.0";
 const repository = {
   url: "https://github.com/skip-mev/skip-go",
   directory: "packages/widget"
@@ -52879,6 +53474,7 @@ const repository = {
 const type = "module";
 const scripts = {
   dev: "vite --force --host",
+  "dev:visual-test": "VISUAL_TEST=true yarn dev",
   "dev:storybook": "storybook dev -p 6006",
   build: "npm run generate-chains && NODE_OPTIONS=--max-old-space-size=16384 vite build",
   "watch:build": "vite build --watch",
@@ -52892,7 +53488,9 @@ const scripts = {
   post: "git checkout -- package.json",
   "generate-chains": "node scripts/generate-chains.cjs",
   "update-registries": "yarn up @initia/initia-registry chain-registry",
-  test: "yarn playwright test"
+  test: "yarn playwright test",
+  "update-screenshots": "UPDATE_SCREENSHOTS=true yarn playwright test Keplr.test.tsx",
+  "combine-images": "node scripts/combine-images.mjs"
 };
 const exports = {
   ".": {
@@ -52923,13 +53521,14 @@ const devDependencies = {
   "@testing-library/react": "^16.2.0",
   "@types/eslint__js": "^8.42.3",
   "@types/pluralize": "^0.0.33",
+  "@types/pngjs": "^6.0.5",
   "@types/react": "^19.0.10",
   "@types/react-dom": "^19.0.4",
   "@typescript-eslint/eslint-plugin": "^7.15.0",
   "@typescript-eslint/parser": "^7.15.0",
   "@vitejs/plugin-react": "^4.3.1",
   buffer: "^6.0.3",
-  "chain-registry": "^1.69.222",
+  "chain-registry": "^1.69.240",
   download: "^8.0.0",
   eslint: "^9.9.0",
   "eslint-config-prettier": "^9.1.0",
@@ -52938,9 +53537,12 @@ const devDependencies = {
   "fs-extra": "^11.3.0",
   "node-polyfill-webpack-plugin": "^4.0.0",
   "pino-pretty": "^13.0.0",
+  pixelmatch: "^7.1.0",
+  pngjs: "^7.0.0",
   "postcss-loader": "^8.1.1",
   prettier: "^3.4.2",
   process: "^0.11.10",
+  pureimage: "^0.4.18",
   "raw-loader": "^4.0.2",
   react: ">=17.0.0",
   "react-dom": ">=17.0.0",
@@ -53101,6 +53703,12 @@ const useInitWidget = (props) => {
     if (props.brandColor) {
       theme.brandColor = props.brandColor;
     }
+    if (theme.borderRadius !== void 0) {
+      theme.borderRadius = {
+        ...defaultBorderRadius,
+        ...theme.borderRadius
+      };
+    }
     if (((_a2 = props.theme) == null ? void 0 : _a2.brandTextColor) === void 0 && typeof document !== "undefined") {
       theme.brandTextColor = getBrandButtonTextColor(theme.brandColor);
     }