Skip to content

Commit

Permalink
feat: revert "fix: add a loading state to the asset dropdown (#5846)"
Browse files Browse the repository at this point in the history
This reverts commit dbbd6c4.
  • Loading branch information
gomesalexandre committed Dec 13, 2023
1 parent ffbd40d commit d0b199c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 42 deletions.
Expand Up @@ -94,8 +94,7 @@ export const AssetChainDropdown: React.FC<ChainDropdownProps> = ({
borderRadius='full'
color='text.base'
isDisabled
isLoading={isLoading}
variant={!isLoading ? 'ghost' : undefined}
variant='ghost'
_disabled={disabled}
_hover={hover}
{...buttonProps}
Expand Down
11 changes: 2 additions & 9 deletions src/components/MultiHopTrade/components/AssetSelection.tsx
Expand Up @@ -31,7 +31,6 @@ const TradeAssetAwaitingAsset = () => {
type TradeAssetSelectProps = {
assetId?: AssetId
isReadOnly?: boolean
isLoading: boolean
onAssetClick?: () => void
onAssetChange: (asset: Asset) => void
}
Expand All @@ -41,16 +40,11 @@ export const TradeAssetSelectWithAsset: React.FC<TradeAssetSelectProps> = ({
onAssetChange,
assetId,
isReadOnly,
isLoading,
}) => {
const assets = useAppSelector(selectAssets)
const asset = useAppSelector(state => selectAssetById(state, assetId ?? ''))

const {
data,
isLoading: isRelatedAssetsLoading,
isError,
} = useGetRelatedAssetIdsQuery(assetId ?? '')
const { data, isLoading, isError } = useGetRelatedAssetIdsQuery(assetId ?? '')

const handleAssetChange = useCallback(
(assetId: AssetId) => {
Expand Down Expand Up @@ -86,7 +80,6 @@ export const TradeAssetSelectWithAsset: React.FC<TradeAssetSelectProps> = ({
isDisabled={isReadOnly}
_disabled={disabledStyle}
rightIcon={rightIcon}
isLoading={isLoading || isRelatedAssetsLoading}
>
{icon}
{asset?.symbol}
Expand All @@ -96,7 +89,7 @@ export const TradeAssetSelectWithAsset: React.FC<TradeAssetSelectProps> = ({
assetIds={data}
assetId={assetId}
onClick={handleAssetChange}
isLoading={isLoading || isRelatedAssetsLoading}
isLoading={isLoading}
isError={isError}
/>
</Flex>
Expand Down
Expand Up @@ -557,10 +557,9 @@ export const TradeInput = memo(() => {
assetId={sellAsset.assetId}
onAssetClick={handleSellAssetClick}
onAssetChange={setSellAsset}
isLoading={isSupportedAssetsLoading}
/>
),
[handleSellAssetClick, isSupportedAssetsLoading, sellAsset.assetId, setSellAsset],
[handleSellAssetClick, sellAsset.assetId, setSellAsset],
)

const buyTradeAssetSelect = useMemo(
Expand All @@ -569,10 +568,9 @@ export const TradeInput = memo(() => {
assetId={buyAsset.assetId}
onAssetClick={handleBuyAssetClick}
onAssetChange={setBuyAsset}
isLoading={isSupportedAssetsLoading}
/>
),
[buyAsset.assetId, handleBuyAssetClick, isSupportedAssetsLoading, setBuyAsset],
[buyAsset.assetId, handleBuyAssetClick, setBuyAsset],
)

return (
Expand Down
14 changes: 3 additions & 11 deletions src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx
Expand Up @@ -95,8 +95,7 @@ export const BorrowInput = ({
const translate = useTranslate()
const history = useHistory()

const { data: borrowAssets, isLoading: isLendingSupportedAssetsLoading } =
useLendingSupportedAssets({ type: 'borrow' })
const { data: borrowAssets } = useLendingSupportedAssets({ type: 'borrow' })

const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))

Expand Down Expand Up @@ -347,26 +346,19 @@ export const BorrowInput = ({
onAssetClick={noop}
onAssetChange={handleAssetChange}
isReadOnly
isLoading={isLendingSupportedAssetsLoading}
/>
)
}, [collateralAssetId, handleAssetChange, isLendingSupportedAssetsLoading])
}, [collateralAssetId, handleAssetChange])

const borrowAssetSelectComponent = useMemo(() => {
return (
<TradeAssetSelect
assetId={borrowAsset?.assetId ?? ''}
onAssetClick={handleBorrowAssetClick}
onAssetChange={handleAssetChange}
isLoading={isLendingSupportedAssetsLoading}
/>
)
}, [
borrowAsset?.assetId,
handleAssetChange,
handleBorrowAssetClick,
isLendingSupportedAssetsLoading,
])
}, [borrowAsset?.assetId, handleAssetChange, handleBorrowAssetClick])

const quoteErrorTranslation = useMemo(() => {
if (_isSmartContractAddress) return 'trade.errors.smartContractWalletNotSupported'
Expand Down
19 changes: 3 additions & 16 deletions src/pages/Lending/Pool/components/Repay/RepayInput.tsx
Expand Up @@ -126,8 +126,7 @@ export const RepayInput = ({

const swapIcon = useMemo(() => <ArrowDownIcon />, [])

const { data: lendingSupportedAssets, isLoading: isLendingSupportedAssetsLoading } =
useLendingSupportedAssets({ type: 'borrow' })
const { data: lendingSupportedAssets } = useLendingSupportedAssets({ type: 'borrow' })

useEffect(() => {
if (!(lendingSupportedAssets && collateralAsset)) return
Expand Down Expand Up @@ -160,15 +159,9 @@ export const RepayInput = ({
// Users have the possibility to repay in any supported asset, not only their collateral/borrowed asset
// https://docs.thorchain.org/thorchain-finance/lending#loan-repayment-closeflow
isReadOnly={false}
isLoading={isLendingSupportedAssetsLoading}
/>
)
}, [
handleAssetChange,
handleRepaymentAssetClick,
isLendingSupportedAssetsLoading,
repaymentAsset?.assetId,
])
}, [handleAssetChange, handleRepaymentAssetClick, repaymentAsset?.assetId])

const collateralAssetSelectComponent = useMemo(() => {
return (
Expand All @@ -177,15 +170,9 @@ export const RepayInput = ({
onAssetClick={handleRepaymentAssetClick}
onAssetChange={handleAssetChange}
isReadOnly
isLoading={isLendingSupportedAssetsLoading}
/>
)
}, [
collateralAssetId,
handleAssetChange,
handleRepaymentAssetClick,
isLendingSupportedAssetsLoading,
])
}, [collateralAssetId, handleAssetChange, handleRepaymentAssetClick])

const handleSeenNotice = useCallback(() => setSeenNotice(true), [])

Expand Down

0 comments on commit d0b199c

Please sign in to comment.