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.

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: load more blocks #1289

Merged
merged 1 commit into from
Sep 22, 2023
Merged
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
35 changes: 21 additions & 14 deletions src/app/components/BlockList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { useGlobalContext } from '@/common/context/useAppContext';
import { AnimatedBlockAndMicroblocksItem } from '@/app/components/BlockList/AnimatedBlockAndMicroblocksItem';
import { EnhancedBlock } from '@/app/components/BlockList/types';
import { DEFAULT_LIST_LIMIT } from '@/common/constants';
import { BlockAndMicroblocksItem } from '@/app/components/BlockList/BlockAndMicroblocksItem';

const BlocksListBase: React.FC<{
limit?: number;
Expand Down Expand Up @@ -97,21 +98,27 @@ const BlocksListBase: React.FC<{
}
>
<Accordion allowMultiple>
{allBlocks?.map(block => (
<AnimatedBlockAndMicroblocksItem
block={block}
key={block.hash}
onAnimationExit={() => removeOldBlock(block)}
/>
))}
{allBlocks?.map(block =>
isLive ? (
<AnimatedBlockAndMicroblocksItem
block={block}
key={block.hash}
onAnimationExit={() => removeOldBlock(block)}
/>
) : (
<BlockAndMicroblocksItem block={block} key={block.hash} />
)
)}
</Accordion>
<SectionFooterAction
isLoading={isFetchingNextPage}
hasNextPage={hasNextPage}
href={limit ? '/blocks' : undefined}
fetchNextPage={limit ? undefined : fetchNextPage}
label={'blocks'}
/>
{!isLive && (
<SectionFooterAction
isLoading={isFetchingNextPage}
hasNextPage={hasNextPage}
href={limit ? '/blocks' : undefined}
fetchNextPage={limit ? undefined : fetchNextPage}
label={'blocks'}
/>
)}
</Section>
);
};
Expand Down
Loading