Skip to content

Commit

Permalink
Merge branch 'staging' into jw/forma
Browse files Browse the repository at this point in the history
  • Loading branch information
thal0x committed May 30, 2024
2 parents 9f5b4cc + e7b49c0 commit d247497
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 10 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/components/AssetSelect/AssetSelectContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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]);

Expand Down
2 changes: 1 addition & 1 deletion src/components/EmbedDialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const EmbedDialog = ({ embedLink }: { embedLink: string }) => {
<strong>Note: </strong>You can customize the default swap route by modifying the query parameters for
more information visit the{" "}
<a
href="https://api-docs.skip.money/docs"
href="https://api-docs.skip.money/docs/embed-a-swap-widget"
target="_blank"
rel="noreferrer"
className="text-[#FF486E]"
Expand Down
7 changes: 6 additions & 1 deletion src/components/PreviewRoute/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/components/SwapWidget/useSwapWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit d247497

Please sign in to comment.