Skip to content

Commit

Permalink
Merge pull request #1216 from mars-protocol/hotfix/deposit-issue
Browse files Browse the repository at this point in the history
Asset Deposit Hotfix
  • Loading branch information
linkielink authored Nov 7, 2024
2 parents 4e16262 + f50f5e7 commit ce82458
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/components/Modals/AssetsSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export default function AssetsSelect(props: Props) {
const markets = useMarkets()
const whitelistedAssets = useWhitelistedAssets()
const balances = useStore((s) => s.balances)
const filteredWhitelistedAsset = useMemo(
() => whitelistedAssets.filter((asset) => !asset.isDeprecated),
[whitelistedAssets],
)

const [sorting, setSorting] = useState<SortingState>([
{ id: isBorrow ? 'asset.borrowRate' : 'value', desc: !isBorrow },
Expand Down Expand Up @@ -55,14 +59,14 @@ export default function AssetsSelect(props: Props) {
return createTableData(assets)
}

const whitelistedTableData = whitelistedAssets.filter((asset) =>
const whitelistedTableData = filteredWhitelistedAsset.filter((asset) =>
balances.some((balance) => balance.denom === asset.denom && balance.amount !== '0'),
)
const whitelistedData = createTableData(whitelistedTableData)
const nonCollateralData = createTableData(nonCollateralTableAssets)

return { whitelistedData, nonCollateralData }
}, [assets, nonCollateralTableAssets, whitelistedAssets, balances, createTableData])
}, [assets, nonCollateralTableAssets, filteredWhitelistedAsset, balances, createTableData])

const [initialSelected, initialNonCollateralSelected] = useMemo(() => {
const selectionState = (
Expand Down Expand Up @@ -103,7 +107,7 @@ export default function AssetsSelect(props: Props) {
)
.map((asset) => asset.denom)
} else {
const whitelistedAssets = assets.filter((asset) =>
const filteredWhitelistedAsset = assets.filter((asset) =>
tableData.whitelistedData.some(
(row, index) => row.asset.denom === asset.denom && whitelistedSelected[index],
),
Expand All @@ -115,11 +119,10 @@ export default function AssetsSelect(props: Props) {
),
) || []

newSelectedDenoms = [...whitelistedAssets, ...nonCollateralAssets]
newSelectedDenoms = [...filteredWhitelistedAsset, ...nonCollateralAssets]
.sort((a, b) => a.symbol.localeCompare(b.symbol))
.map((asset) => asset.denom)
}

if (
selectedDenoms.length === newSelectedDenoms.length &&
newSelectedDenoms.every((denom) => selectedDenoms.includes(denom))
Expand Down

0 comments on commit ce82458

Please sign in to comment.