Fix loading issues (#110)

* Fix translation list loading * Fix accounts list loading
vocdoni · Aug 23, 2024 · 81ac870 · 81ac870 · github-actions · Aug 23, 2024
1 parent 6a1b53f
commit 81ac870
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/src/components/Accounts/Card.tsx b/src/components/Accounts/Card.tsx
@@ -29,12 +29,12 @@ export const AccountCard = ({ id, ...rest }: IAccountCardProps) => {
   )
 }
 
-const AccountCardSkeleton = ({ electionCount: ec, ...rest }: IAccountCardProps) => {
+const AccountCardSkeleton = ({ electionCount: ec, id, ...rest }: IAccountCardProps) => {
   const { organization, loading } = useOrganization()
   const { t } = useTranslation()
 
   const electionCount = ec ?? organization?.electionIndex
-  const pid = organization?.address
+  const pid = id ?? organization?.address
 
   if (!pid) return null
 

diff --git a/src/components/Accounts/List.tsx b/src/components/Accounts/List.tsx
@@ -71,8 +71,8 @@ export const AccountsList = () => {
 
   return (
     <>
-      {orgs?.organizations.map((org) => (
-        <AccountCard key={org.organizationID} id={org.organizationID} electionCount={org.electionCount} />
+      {orgs?.organizations.map((org, i) => (
+        <AccountCard key={i} id={org.organizationID} electionCount={org.electionCount} />
       ))}
       <RoutedPagination pagination={orgs.pagination} />
     </>

diff --git a/src/components/Process/ProcessList.tsx b/src/components/Process/ProcessList.tsx
@@ -135,7 +135,6 @@ export const PaginatedProcessList = () => {
 }
 
 const ProcessList = () => {
-  const { t } = useTranslation()
   const { page }: { page?: number } = useRoutedPagination()
   const { queryParams: processFilters } = useQueryParams<FilterQueryParams>()
 

diff --git a/src/components/Transactions/TransactionList.tsx b/src/components/Transactions/TransactionList.tsx
@@ -58,9 +58,7 @@ export const PaginatedTransactionList = () => {
 }
 const TransactionsList = () => {
   const { page }: { page?: number } = useRoutedPagination()
-  const { data: count, isLoading: isLoadingCount } = useTransactionsCount()
-
-  const totalPages = Math.ceil(count / PaginationItemsPerPage)
+  const { isLoading: isLoadingCount } = useTransactionsCount()
 
   const {
     data,
@@ -122,16 +120,13 @@ const TransactionsListCards = ({
   height?: number
 }) => {
   const { t } = useTranslation()
-  if (!data || (data && data.transactions.length <= 0)) {
-    return <NoResultsError msg={t('blocks.no_txs_on_block', { defaultValue: 'There are no transactions' })} />
-  }
 
   if (isLoading) {
     return <LoadingCards spacing={4} />
   }
 
-  if (data?.pagination.totalItems === 0) {
-    return <NoResultsError />
+  if (data && data.transactions.length <= 0) {
+    return <NoResultsError msg={t('blocks.no_txs_on_block', { defaultValue: 'There are no transactions' })} />
   }
 
   if (isError || !data) {