Skip to content

Commit

Permalink
fix: mobile filter / sort onChange
Browse files Browse the repository at this point in the history
  • Loading branch information
@chambaz
chambaz committed Nov 24, 2023
1 parent 41e5901 commit cd1d55a
Showing 1 changed file with 45 additions and 31 deletions.
76 changes: 45 additions & 31 deletions apps/marginfi-v2-ui/src/components/mobile/MobileAssetsList/MobileAssetsList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ import { useMrgnlendStore, useUiStore } from "~/store";
import { useWalletContext } from "~/hooks/useWalletContext";

import { MrgnTooltip } from "~/components/common";
import { LSTDialog, LSTDialogVariants, AssetListFilters, sortApRate, sortTvl } from "~/components/common/AssetList";
import {
LSTDialog,
LSTDialogVariants,
AssetListFilters,
sortApRate,
sortTvl,
STABLECOINS,
LSTS,
} from "~/components/common/AssetList";
import { AssetCard } from "~/components/mobile/MobileAssetsList/AssetCard";

import { LendingModes } from "~/types";
Expand Down Expand Up @@ -90,24 +98,28 @@ export const MobileAssetsList = () => {
{isStoreInitialized && globalBanks ? (
globalBanks.length > 0 ? (
<div className="flex flew-row flex-wrap gap-5 justify-center items-center pt-2">
{globalBanks.map((bank) => (
<AssetCard
key={bank.meta.tokenSymbol}
nativeSolBalance={nativeSolBalance}
bank={bank}
isInLendingMode={isInLendingMode}
isConnected={connected}
marginfiAccount={selectedAccount}
inputRefs={inputRefs}
showLSTDialog={(variant: LSTDialogVariants, onClose?: () => void) => {
setLSTDialogVariant(variant);
setIsLSTDialogOpen(true);
if (onClose) {
setLSTDialogCallback(() => onClose);
}
}}
/>
))}
{globalBanks.map((bank) => {
if (poolFilter === "stable" && !STABLECOINS.includes(bank.meta.tokenSymbol)) return null;
if (poolFilter === "lst" && !LSTS.includes(bank.meta.tokenSymbol)) return null;
return (
<AssetCard
key={bank.meta.tokenSymbol}
nativeSolBalance={nativeSolBalance}
bank={bank}
isInLendingMode={isInLendingMode}
isConnected={connected}
marginfiAccount={selectedAccount}
inputRefs={inputRefs}
showLSTDialog={(variant: LSTDialogVariants, onClose?: () => void) => {
setLSTDialogVariant(variant);
setIsLSTDialogOpen(true);
if (onClose) {
setLSTDialogCallback(() => onClose);
}
}}
/>
);
})}
</div>
) : (
<Typography color="#868E95" className="font-aeonik font-[300] text-sm flex gap-1" gutterBottom>
Expand All @@ -129,7 +141,7 @@ export const MobileAssetsList = () => {
)}
</div>
)}
{poolFilter === "isolated" && (
{poolFilter !== "stable" && poolFilter !== "lst" && (
<div className="w-full">
<Typography className="font-aeonik font-normal flex gap-2 items-center text-2xl text-white pt-2 pb-3">
Isolated pools
Expand All @@ -153,17 +165,19 @@ export const MobileAssetsList = () => {
{isStoreInitialized && globalBanks ? (
isolatedBanks.length > 0 ? (
<div className="flex flew-row flex-wrap gap-6 justify-center items-center pt-2">
{isolatedBanks.map((bank, i) => (
<AssetCard
key={bank.meta.tokenSymbol}
nativeSolBalance={nativeSolBalance}
bank={bank}
isInLendingMode={isInLendingMode}
isConnected={connected}
marginfiAccount={selectedAccount}
inputRefs={inputRefs}
/>
))}
{isolatedBanks.map((bank, i) => {
return (
<AssetCard
key={bank.meta.tokenSymbol}
nativeSolBalance={nativeSolBalance}
bank={bank}
isInLendingMode={isInLendingMode}
isConnected={connected}
marginfiAccount={selectedAccount}
inputRefs={inputRefs}
/>
);
})}
</div>
) : (
<Typography color="#868E95" className="font-aeonik font-[300] text-sm flex gap-1" gutterBottom>
Expand Down

1 comment on commit cd1d55a

@vercel
Copy link

@vercel vercel bot commented on cd1d55a Nov 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

marginfi-v2-ui – ./apps/marginfi-v2-ui

marginfi-v2-ui-git-production-mrgn.vercel.app
marginfi-v2-ui-mrgn.vercel.app
mrgn-ts-marginfi-v2-ui.vercel.app
app.marginfi.com
www.mfi.gg
mfi.gg

Please sign in to comment.