Skip to content

Commit

Permalink
Merge pull request #1570 from oasisprotocol/mz/fixEventsHeader
Browse files Browse the repository at this point in the history
Fix duplicated events cards headers
  • Loading branch information
buberdds authored Oct 10, 2024
2 parents b37cbad + 69057ab commit e671fb3
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 32 deletions.
1 change: 1 addition & 0 deletions .changelog/1570.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix duplicated events cards headers
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,20 @@ export const ConsensusAccountEventsList: FC<ConsensusAccountDetailsContext> = ({
}

return (
<LinkableCardLayout containerId={eventsContainerId} title={t('common.events')}>
<ConsensusEventsList
scope={scope}
events={events}
isLoading={isLoading}
isError={isError}
pagination={{
selectedPage: pagination.selectedPage,
linkToPage: pagination.linkToPage,
totalCount: data?.data.total_count,
isTotalCountClipped: data?.data.is_total_count_clipped,
rowsPerPage: limit,
}}
showTxHash
/>
</LinkableCardLayout>
<ConsensusEventsList
scope={scope}
events={events}
isLoading={isLoading}
isError={isError}
pagination={{
selectedPage: pagination.selectedPage,
linkToPage: pagination.linkToPage,
totalCount: data?.data.total_count,
isTotalCountClipped: data?.data.is_total_count_clipped,
rowsPerPage: limit,
}}
showTxHash
/>
)
}

Expand Down
30 changes: 14 additions & 16 deletions src/app/pages/ConsensusBlockDetailPage/ConsensusBlockEventsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,20 @@ const ConsensusBlockEventsList: FC<ConsensusBlockDetailsContext> = ({ scope, blo
}

return (
<LinkableCardLayout containerId={eventsContainerId} title={t('common.events')}>
<ConsensusEventsList
scope={scope}
events={events}
isLoading={isLoading}
isError={isError}
pagination={{
selectedPage: pagination.selectedPage,
linkToPage: pagination.linkToPage,
totalCount: data?.data.total_count,
isTotalCountClipped: data?.data.is_total_count_clipped,
rowsPerPage: limit,
}}
showTxHash
/>
</LinkableCardLayout>
<ConsensusEventsList
scope={scope}
events={events}
isLoading={isLoading}
isError={isError}
pagination={{
selectedPage: pagination.selectedPage,
linkToPage: pagination.linkToPage,
totalCount: data?.data.total_count,
isTotalCountClipped: data?.data.is_total_count_clipped,
rowsPerPage: limit,
}}
showTxHash
/>
)
}

Expand Down

0 comments on commit e671fb3

Please sign in to comment.