Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(portfolio): ordering favorites #3857

Merged
merged 3 commits into from
Sep 26, 2024
Merged

fix(portfolio): ordering favorites #3857

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
226aafa
fix(portfolio): ordering favorites, update withdraw / deposit button …
mattupham Sep 26, 2024
728e619
fix(portfolio): update table to collapse asset actions less than 1024px
mattupham Sep 26, 2024
bc73f3e
build(asset-balances): remove ts-expect-error
mattupham Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions packages/web/components/table/asset-balances.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,22 +156,29 @@ export const AssetBalancesTable: FunctionComponent<{
[assetPagesData]
);

const { watchListDenoms, toggleWatchAssetDenom } = useUserWatchlist();

const filteredAssetsData = useMemo(() => {
return assetsData
.map((asset) => {
const isDust = asset?.usdValue?.toDec()?.lte(DUST_THRESHOLD);
if (hideDust && isDust) return null;
return asset;
})
.filter((asset) => asset !== null);
}, [assetsData, hideDust]);
.filter((asset): asset is AssetRow => asset !== null)
.sort((a, b) => {
const aIsFavorite = watchListDenoms.includes(a.coinDenom);
const bIsFavorite = watchListDenoms.includes(b.coinDenom);
if (aIsFavorite && !bIsFavorite) return -1;
if (!aIsFavorite && bIsFavorite) return 1;
return 0;
});
}, [assetsData, hideDust, watchListDenoms]);

const hiddenDustCount = assetsData.length - filteredAssetsData.length;

const noSearchResults = Boolean(searchQuery) && !filteredAssetsData.length;

const { watchListDenoms, toggleWatchAssetDenom } = useUserWatchlist();

// Define columns
const columns = useMemo(() => {
const columnHelper = createColumnHelper<AssetRow>();
Expand Down Expand Up @@ -243,8 +250,10 @@ export const AssetBalancesTable: FunctionComponent<{
/** Columns collapsed for screen size responsiveness. */
const collapsedColumns = useMemo(() => {
const collapsedColIds: string[] = [];
if (width < Breakpoint.lg) collapsedColIds.push("price");
if (width < Breakpoint.md) collapsedColIds.push("assetActions");
if (width < Breakpoint.lg) {
collapsedColIds.push("price");
collapsedColIds.push("assetActions");
}
return columns.filter(({ id }) => id && !collapsedColIds.includes(id));
}, [columns, width]);

Expand Down
Loading