Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 22 additions & 7 deletions src/sections/achievements/components/leaderboard-table.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { FC, useMemo } from 'react';
import {
Box, Card, CardContent, CardHeader, CircularProgress,
Box, Card, CardContent, CardHeader, Skeleton,
Table, TableBody, TableCell, TableContainer, TableRow,
Typography, Alert, Tooltip, IconButton
Typography, Alert, Tooltip, IconButton,
} from '@mui/material';
import { styled, useTheme } from '@mui/material/styles';
import { m } from 'framer-motion';
Expand Down Expand Up @@ -50,7 +50,7 @@ const LeaderboardTable: FC = () => {
variables: { limit: 50 },
fetchPolicy: 'network-only',
});
const { data, loading, error } = useStaleWhileLoading(raw);
const { data, isInitialLoad, error } = useStaleWhileLoading(raw);
const table = useTable({ defaultOrder: 'asc', defaultOrderBy: 'rank', defaultRowsPerPage: 5 });
const myAddress = session?.user?.address?.toLowerCase() ?? '';
const users: User[] = data?.getLeaderboard ?? [];
Expand Down Expand Up @@ -91,10 +91,25 @@ const LeaderboardTable: FC = () => {
</Alert>
)}

{loading ? (
<Box sx={{ display: 'flex', justifyContent: 'center', p: 3 }}>
<CircularProgress size={32} />
</Box>
{isInitialLoad ? (
<CardContent sx={{ pt: 1, pl: 0, pr: 0 }}>
<TableContainer>
<Table size="medium">
<TableHeadCustom headLabel={HEAD} order="asc" orderBy="rank" />
<TableBody>
{[...Array(5)].map((_, i) => (
<TableRow key={i}>
{HEAD.map(h => (
<TableCell key={h.id} align={h.align || 'left'}>
<Skeleton variant="text" width={h.width || '80%'} />
</TableCell>
))}
</TableRow>
))}
</TableBody>
</Table>
</TableContainer>
</CardContent>
) : (
<CardContent sx={{ pt: 1, pl: 0, pr: 0 }}>
<TableContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const UserSidebarRanks: FC = () => {
const rawRanks = useGetRanksCatalogQuery({
fetchPolicy: 'network-only',
});
const { data: ranksData, loading: ranksLoading } = useStaleWhileLoading(rawRanks);
const { data: ranksData, isInitialLoad: ranksLoading } = useStaleWhileLoading(rawRanks);

const currentRankId = achData?.getAchievements.currentRank.id ?? 'watcher';

Expand Down
Loading