Skip to content

Commit

Permalink
fix: source chain asset query parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
codingki committed Jun 11, 2024
1 parent c6705d3 commit b0a5187
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion chain-registry
Submodule chain-registry updated 71 files
+30 −0 _IBC/archway-composable.json
+31 −0 _IBC/cosmoshub-joltify.json
+31 −0 _IBC/joltify-noble.json
+9 −7 _non-cosmos/ethereum/assetlist.json
+10 −11 _non-cosmos/penumbra/assetlist.json
+30 −1 _non-cosmos/solana/assetlist.json
+ _non-cosmos/solana/images/whine.png
+5 −13 agoric/chain.json
+20 −0 agoric/versions.json
+2 −4 althea/assetlist.json
+5 −2 andromeda/chain.json
+27 −65 aura/chain.json
+44 −0 aura1/assetlist.json
+488 −0 aura1/chain.json
+32 −0 berachain/assetlist.json
+ berachain/images/bera.png
+25 −6 chihuahua/chain.json
+46 −2 composable/assetlist.json
+27 −7 dydx/chain.json
+2 −1 dymension/chain.json
+62 −16 evmos/chain.json
+30 −12 fxcore/assetlist.json
+0 −8 gitopia/chain.json
+32 −0 initia/assetlist.json
+ initia/images/INIT.png
+11 −0 initia/images/INIT.svg
+55 −7 injective/assetlist.json
+ injective/images/talis.png
+ injective/images/xtalis.png
+127 −0 joltify/assetlist.json
+131 −0 joltify/chain.json
+ joltify/images/jolt.png
+0 −4 lava/chain.json
+33 −9 lumnetwork/chain.json
+48 −0 migaloo/assetlist.json
+1 −18 migaloo/chain.json
+12 −0 neutron/chain.json
+6 −1 nibiru/assetlist.json
+11 −29 nibiru/chain.json
+1 −18 nois/chain.json
+2 −2 omniflixhub/chain.json
+3 −5 onomy/chain.json
+2,297 −533 osmosis/assetlist.json
+ osmosis/images/SHITMOS.png
+ osmosis/images/shitmos.png
+65 −0 osmosis/images/shitmos.svg
+30 −3 persistence/chain.json
+3 −12 pundix/assetlist.json
+42 −1 quicksilver/assetlist.json
+14 −0 sei/chain.json
+22 −6 sge/chain.json
+7 −3 shido/chain.json
+3 −3 source/chain.json
+4 −4 stride/chain.json
+9 −9 terra2/chain.json
+30 −0 testnets/_IBC/archwaytestnet-jackaltestnet2.json
+32 −0 testnets/blockxtestnet/assetlist.json
+20 −0 testnets/blockxtestnet/chain.json
+ testnets/blockxtestnet/images/blockx.png
+1 −1 testnets/celestiatestnet3/chain.json
+43 −0 testnets/jackaltestnet2/assetlist.json
+83 −0 testnets/jackaltestnet2/chain.json
+5 −13 testnets/nibirudevnet/chain.json
+41 −0 testnets/soarchaintestnet/assetlist.json
+202 −0 testnets/soarchaintestnet/chain.json
+ testnets/soarchaintestnet/images/soarchain.png
+15 −0 testnets/soarchaintestnet/images/soarchain.svg
+2 −2 testnets/swisstroniktestnet/assetlist.json
+25 −4 testnets/swisstroniktestnet/chain.json
+2 −35 titan/chain.json
+20 −4 zetachain/chain.json
2 changes: 1 addition & 1 deletion initia-registry
Submodule initia-registry updated 31 files
+0 −78 .github/workflows/mahalo-watcher.yml
+1 −1 _packages/initia-registry/package.json
+2 −0 _packages/initia-registry/src/testnet/assets.ts
+4 −4 _packages/initia-registry/src/testnet/blackwing/assets.ts
+5 −0 _packages/initia-registry/src/testnet/blackwing/chain.ts
+2 −0 _packages/initia-registry/src/testnet/chains.ts
+37 −0 _packages/initia-registry/src/testnet/civitia/assets.ts
+92 −0 _packages/initia-registry/src/testnet/civitia/chain.ts
+5 −0 _packages/initia-registry/src/testnet/civitia/index.ts
+1 −0 _packages/initia-registry/src/testnet/index.ts
+4 −4 _packages/initia-registry/src/testnet/init_ai/assets.ts
+5 −0 _packages/initia-registry/src/testnet/init_ai/chain.ts
+87 −0 _packages/initia-registry/src/testnet/initia/assets.ts
+20 −14 _packages/initia-registry/src/testnet/initia/chain.ts
+4 −4 _packages/initia-registry/src/testnet/minimove/assets.ts
+4 −4 _packages/initia-registry/src/testnet/miniwasm/assets.ts
+32 −4 _packages/initia-registry/src/testnet/noon/assets.ts
+13 −0 _packages/initia-registry/src/testnet/noon/chain.ts
+4 −4 _packages/initia-registry/src/testnet/tucana/assets.ts
+6 −0 _packages/initia-registry/src/testnet/tucana/chain.ts
+35 −0 testnets/civitia/assetlist.json
+104 −0 testnets/civitia/chain.json
+ testnets/civitia/images/INIT.png
+11 −0 testnets/civitia/images/INIT.svg
+ testnets/civitia/images/civitia.png
+9 −0 testnets/civitia/images/civitia.svg
+12 −0 testnets/initia/chain.json
+28 −0 testnets/noon/assetlist.json
+7 −0 testnets/noon/chain.json
+ testnets/noon/images/NOON.png
+4 −14 testnets/noon/images/NOON.svg
16 changes: 9 additions & 7 deletions src/components/SwapWidget/useSwapWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export function useSwapWidget() {
* - if not, select first available asset
*/
const onSourceChainChange = useCallback(
async (chain: Chain) => {
async (chain: Chain, injectAsset?: Asset) => {
let feeAsset: Asset | undefined = undefined;
if (chain.chainType === "cosmos") {
feeAsset = await getFeeAsset(chain.chainID);
Expand All @@ -253,7 +253,7 @@ export function useSwapWidget() {

useSwapWidgetStore.setState({
sourceChain: chain,
sourceAsset: asset,
sourceAsset: injectAsset ? injectAsset : asset,
sourceFeeAsset: feeAsset,
sourceGasPrice: undefined,
gasRequired: undefined,
Expand Down Expand Up @@ -661,14 +661,17 @@ export function useSwapWidget() {
if (srcChainQP) {
const findChain = chains.find((x) => x.chainID.toLowerCase() === decodeURI(srcChainQP).toLowerCase());
if (findChain) {
onSourceChainChange(findChain);
if (srcAssetQP) {
const assets = assetsByChainID(findChain.chainID);
const findAsset = assets.find((x) => x.denom.toLowerCase() === decodeURI(srcAssetQP).toLowerCase());
if (findAsset) {
onSourceAssetChange(findAsset);
onSourceChainChange(findChain, findAsset);
setSrcChainQP(null);
setSrcAssetQP(null);
return;
}
}
onSourceChainChange(findChain);
}
toast.success("URL parameters processed successfully", {
id: toastId,
Expand Down Expand Up @@ -798,7 +801,6 @@ export function useSwapWidget() {
* {@link onSourceChainChange} to sync source asset
*/
useEffect(() => {
if (srcChainQP) return;
return useSwapWidgetStore.subscribe(
(state) => [state.sourceChain, state.sourceAsset] as const,
([chain, asset]) => {
Expand All @@ -807,7 +809,7 @@ export function useSwapWidget() {
return chainID === DEFAULT_SRC_CHAIN_ID;
});
}
if (chain && !asset) {
if (chain && !asset && (!srcChainQP || !srcAssetQP)) {
onSourceChainChange(chain);
}
},
Expand All @@ -816,7 +818,7 @@ export function useSwapWidget() {
fireImmediately: true,
},
);
}, [chains, onSourceChainChange, srcChainQP]);
}, [chains, onSourceChainChange, srcChainQP, srcAssetQP]);
/////////////////////////////////////////////////////////////////////////////

return {
Expand Down

0 comments on commit b0a5187

Please sign in to comment.