Skip to content

Commit 44577ef

Browse files
authored
fix: filtering out non-native assets for auto-select on Transfer (#2125)
1 parent 87c3155 commit 44577ef

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

apps/namadillo/src/App/Ibc/IbcTransfer.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { allDefaultAccountsAtom } from "atoms/accounts";
1010
import {
1111
assetBalanceAtomFamily,
1212
availableChainsAtom,
13+
enabledIbcAssetsDenomFamily,
1314
ibcChannelsFamily,
1415
} from "atoms/integrations";
1516
import BigNumber from "bignumber.js";
@@ -61,8 +62,10 @@ export const IbcTransfer = (): JSX.Element => {
6162
walletAddress: sourceAddress,
6263
})
6364
);
64-
const { trackEvent } = useFathomTracker();
6565

66+
const { trackEvent } = useFathomTracker();
67+
const { data: enabledAssets, isLoading: isLoadingEnabledAssets } =
68+
useAtomValue(enabledIbcAssetsDenomFamily(ibcChannels?.namadaChannel));
6669
const [shielded, setShielded] = useState<boolean>(true);
6770
const [selectedAssetAddress, setSelectedAssetAddress] = useUrlState(
6871
params.asset
@@ -84,15 +87,17 @@ export const IbcTransfer = (): JSX.Element => {
8487
selectedAssetAddress ? userAssets?.[selectedAssetAddress] : undefined;
8588

8689
const availableAssets = useMemo(() => {
87-
if (!userAssets) return undefined;
90+
if (!enabledAssets || !userAssets) return undefined;
91+
8892
const output: AddressWithAssetAndAmountMap = {};
8993
for (const key in userAssets) {
90-
if (registry?.assets.assets.find((a) => a.base === key)?.base) {
94+
if (enabledAssets.includes(userAssets[key].asset.base)) {
9195
output[key] = { ...userAssets[key] };
9296
}
9397
}
98+
9499
return output;
95-
}, [userAssets]);
100+
}, [enabledAssets, userAssets]);
96101

97102
// Manage the history of transactions
98103
const { storeTransaction } = useTransactionActions();
@@ -193,7 +198,7 @@ export const IbcTransfer = (): JSX.Element => {
193198
</div>
194199
<TransferModule
195200
source={{
196-
isLoadingAssets: isLoadingBalances,
201+
isLoadingAssets: isLoadingBalances || isLoadingEnabledAssets,
197202
availableAssets,
198203
selectedAssetAddress,
199204
availableAmount,

0 commit comments

Comments
 (0)