Merge pull request #278 from skip-mev/staging

skip-mev · May 29, 2024 · a516ebc · a516ebc
2 parents 50165c2 + 2418a7b
commit a516ebc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/chain-registry b/chain-registry
diff --git a/initia-registry b/initia-registry
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
  "@radix-ui/react-switch": "^1.0.3",
  "@radix-ui/react-tooltip": "^1.0.7",
  "@sentry/nextjs": "^7.99.0",
- "@skip-router/core": "4.0.0",
+ "@skip-router/core": "4.1.1",
  "@solana/spl-token": "^0.4.1",
  "@solana/wallet-adapter-react": "^0.15.35",
  "@solana/wallet-adapter-wallets": "^0.19.31",

diff --git a/src/components/AssetSelect/AssetSelectContent.tsx b/src/components/AssetSelect/AssetSelectContent.tsx
@@ -52,7 +52,7 @@ function AssetSelectContent({ assets = [], balances, onChange, onClose, showChai
  const filteredAssets = useMemo(() => {
  if (!searchValue) return sortedAssets;
  return matchSorter(sortedAssets || [], searchValue, {
- keys: ["symbol", "denom"],
+ keys: ["recommendedSymbol", "symbol", "denom"],
  });
  }, [searchValue, sortedAssets]);
 

diff --git a/src/components/PreviewRoute/index.tsx b/src/components/PreviewRoute/index.tsx
@@ -173,7 +173,12 @@ export const PreviewRoute = ({
  await skipClient.executeRoute({
  route,
  userAddresses,
- validateGasBalance: route.txsRequired === 1,
+ validateGasBalance: true,
+ getFallbackGasAmount: async (chainID, chainType) => {
+ if (chainType === "cosmos") {
+ return Number(useSettingsStore.getState().customGasAmount);
+ }
+ },
  slippageTolerancePercent: useSettingsStore.getState().slippage,
  onTransactionTracked: async (txStatus) => {
  const makeExplorerUrl = await getExplorerUrl(txStatus.chainID);

diff --git a/src/components/SwapWidget/useSwapWidget.ts b/src/components/SwapWidget/useSwapWidget.ts
@@ -506,7 +506,7 @@ export function useSwapWidget() {
  return denom === srcFeeAsset?.denom;
  });
 
- if (!feeDenomPrices) {
+ if (!feeDenomPrices || !feeDenomPrices.gasPrice) {
  toast.error(`Unable to find gas prices for ${srcFeeAsset.denom} on ${srcChain.chainName}`);
  return;
  }