From 149cb0b81ca069106eb8cff4e33116e9f17bd8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ti=E1=BA=BFn=20Nguy=E1=BB=85n=20Kh=E1=BA=AFc?= Date: Fri, 1 Mar 2024 15:14:54 +1300 Subject: [PATCH 1/3] chore: disable Polkadot Asset Hub due to potential issue of losing fund https://github.com/paritytech/polkadot-sdk/issues/3050#issuecomment-1971375971 --- apps/web/src/domains/bridge/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/web/src/domains/bridge/index.ts b/apps/web/src/domains/bridge/index.ts index 0959c2cd5..4e96fdf28 100644 --- a/apps/web/src/domains/bridge/index.ts +++ b/apps/web/src/domains/bridge/index.ts @@ -14,7 +14,7 @@ export const bridgeState = selector({ .filter((x): x is NonNullable => x !== undefined) .map(x => x.adapter), disabledRouters: [ - // temportatily disable Kusama routes + // Temporarily disable Kusama routes // due to: https://github.com/paritytech/polkadot-sdk/issues/3050 { from: 'altair' }, { from: 'kusama' }, @@ -39,6 +39,8 @@ export const bridgeState = selector({ { from: 'robonomics' }, { from: 'tinkernet' }, { from: 'statemine' }, + // Disable Asset Hub due to similarly reported issue + { from: 'statemint' }, ], }) await bridge.isReady From b8e684308ad0765ea94cdc3e34073e5f1cfebf23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ti=E1=BA=BFn=20Nguy=E1=BB=85n=20Kh=E1=BA=AFc?= Date: Fri, 1 Mar 2024 15:42:51 +1300 Subject: [PATCH 2/3] fix: routes reversible even if one is disabled --- .../components/widgets/dex/TransportForm.tsx | 20 +++++-------------- .../ui/src/atoms/IconButton/IconButton.tsx | 1 + 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/apps/web/src/components/widgets/dex/TransportForm.tsx b/apps/web/src/components/widgets/dex/TransportForm.tsx index 5448c7561..5f60f1221 100644 --- a/apps/web/src/components/widgets/dex/TransportForm.tsx +++ b/apps/web/src/components/widgets/dex/TransportForm.tsx @@ -7,23 +7,23 @@ import { type Account, } from '@domains/accounts' import { bridgeAdapterState, bridgeState } from '@domains/bridge' +import { tokenPriceState } from '@domains/chains' import { useExtrinsic } from '@domains/common' import { type SubmittableExtrinsic } from '@polkadot/api/types' import { type ISubmittableResult } from '@polkadot/types/types' import { type Chain, type InputConfig } from '@polkawallet/bridge' import * as Sentry from '@sentry/react' +import { useTokens as useBalancesLibTokens } from '@talismn/balances-react' import { Decimal } from '@talismn/math' import { CircularProgressIndicator, toast } from '@talismn/ui' import { Maybe } from '@util/monads' -import { isEmpty, uniqBy } from 'lodash' +import { uniqBy } from 'lodash' import { useCallback, useEffect, useMemo, useState } from 'react' import { RecoilLoadable, constSelector, useRecoilValue, useRecoilValueLoadable, type Loadable } from 'recoil' import { Observable } from 'rxjs' import { useAccountSelector } from '../AccountSelector' -import TokenSelectorButton from '../TokenSelectorButton' -import { tokenPriceState } from '@domains/chains' -import { useTokens as useBalancesLibTokens } from '@talismn/balances-react' import AnimatedFiatNumber from '../AnimatedFiatNumber' +import TokenSelectorButton from '../TokenSelectorButton' const TransportForm = () => { const bridge = useRecoilValue(bridgeState) @@ -75,16 +75,6 @@ const TransportForm = () => { } }, [sender, setRecipient]) - const filterParams = >(object: T) => { - const params = Object.fromEntries(Object.entries(object).filter(([_, value]) => value !== undefined)) - - if (isEmpty(params)) { - return undefined - } - - return params - } - const routes = useMemo( () => bridge.router @@ -125,7 +115,7 @@ const TransportForm = () => { ) const routeReversible = useMemo(() => { - const routes = bridge.router.getRouters(filterParams({ token })) + const routes = bridge.router.getAvailableRouters().filter(x => x.token === token) if (fromChain === undefined && toChain === undefined) { return false diff --git a/packages/ui/src/atoms/IconButton/IconButton.tsx b/packages/ui/src/atoms/IconButton/IconButton.tsx index 58b4abb3d..04d025a2c 100644 --- a/packages/ui/src/atoms/IconButton/IconButton.tsx +++ b/packages/ui/src/atoms/IconButton/IconButton.tsx @@ -21,6 +21,7 @@ const BaseIconButtonFactory = const theme = useTheme() return ( Date: Fri, 1 Mar 2024 15:45:53 +1300 Subject: [PATCH 3/3] style: fix input label & supporting text padding --- packages/ui/src/molecules/TextInput/TextInput.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/molecules/TextInput/TextInput.tsx b/packages/ui/src/molecules/TextInput/TextInput.tsx index 402e25321..3b126dd42 100644 --- a/packages/ui/src/molecules/TextInput/TextInput.tsx +++ b/packages/ui/src/molecules/TextInput/TextInput.tsx @@ -62,7 +62,7 @@ const TextInput = Object.assign( justifyContent: 'space-between', alignItems: 'center', marginBottom: '0.8rem', - '> *:empty::after': { + 'label:empty::after': { content: `"\u200B"`, }, }} @@ -119,7 +119,7 @@ const TextInput = Object.assign( justifyContent: 'space-between', alignItems: 'center', marginTop: '0.8rem', - '> *:empty::after': { + 'label:empty::after': { content: `"\u200B"`, }, }}