diff --git a/web/src/pages/Cases/CasesFetcher.tsx b/web/src/pages/Cases/CasesFetcher.tsx index 80f8cc762..693d87f02 100644 --- a/web/src/pages/Cases/CasesFetcher.tsx +++ b/web/src/pages/Cases/CasesFetcher.tsx @@ -61,6 +61,10 @@ const CasesFetcher: React.FC = () => { () => calculateStats(isCourtFilter, courtData?.court, counterData?.counter, decodedFilter), [isCourtFilter, courtData?.court, counterData?.counter, decodedFilter] ); + const totalPages = useMemo( + () => (!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1), + [totalCases, casesPerPage] + ); return ( { numberClosedDisputes={ruledCases} currentPage={pageNumber} setCurrentPage={(newPage: number) => navigate(`${location}/${newPage}/${order}/${filter}`)} - totalPages={!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1} + totalPages={totalPages} {...{ casesPerPage }} /> ); diff --git a/web/src/pages/Courts/CourtDetails/Stats.tsx b/web/src/pages/Courts/CourtDetails/Stats.tsx index e910bae51..532f8a1be 100644 --- a/web/src/pages/Courts/CourtDetails/Stats.tsx +++ b/web/src/pages/Courts/CourtDetails/Stats.tsx @@ -87,7 +87,7 @@ const stats: IStat[] = [ }, { title: "In Progress", - getText: (data) => data?.numberDisputes, + getText: (data) => data?.numberDisputes - data?.numberClosedDisputes, color: "orange", icon: BalanceIcon, }, diff --git a/web/src/pages/Dashboard/index.tsx b/web/src/pages/Dashboard/index.tsx index 2684b38cc..ee8408029 100644 --- a/web/src/pages/Dashboard/index.tsx +++ b/web/src/pages/Dashboard/index.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useMemo } from "react"; import styled from "styled-components"; import { useNavigate, useParams } from "react-router-dom"; import { useAccount } from "wagmi"; @@ -6,6 +6,7 @@ import { OrderDirection } from "src/graphql/graphql"; import { DisputeDetailsFragment, useMyCasesQuery } from "queries/useCasesQuery"; import { useUserQuery } from "queries/useUser"; import { decodeURIFilter, useRootPath } from "utils/uri"; +import { isUndefined } from "utils/index"; import CasesDisplay from "components/CasesDisplay"; import ConnectWallet from "components/ConnectWallet"; import JurorInfo from "./JurorInfo"; @@ -54,6 +55,10 @@ const Dashboard: React.FC = () => { ); const { data: userData } = useUserQuery(address, decodedFilter); const totalCases = userData?.user?.disputes.length; + const totalPages = useMemo( + () => (!isUndefined(totalCases) ? Math.ceil(totalCases / casesPerPage) : 1), + [totalCases, casesPerPage] + ); return ( @@ -63,10 +68,10 @@ const Dashboard: React.FC = () => { navigate(`${location}/${newPage}/${order}/${filter}`)} {...{ casesPerPage }}