Merge branch 'dev'

kleros · Oct 20, 2023 · 928d23b · 928d23b
2 parents 3626a8e + 0ff85f8
commit 928d23b
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/web/src/hooks/useClassicAppealContext.tsx b/web/src/hooks/useClassicAppealContext.tsx
@@ -99,11 +99,15 @@ export const useFundingContext = () => useContext(FundingContext);
 export const useOptionsContext = () => useContext(OptionsContext);
 
 const getCurrentLocalRound = (dispute?: ClassicAppealQuery["dispute"]) => {
-  const period = dispute?.period;
-  const currentLocalRoundIndex = dispute?.disputeKitDispute?.currentLocalRoundIndex;
-  return getLocalRounds(dispute?.disputeKitDispute)[
-    ["appeal", "execution"].includes(period ?? "") ? currentLocalRoundIndex : currentLocalRoundIndex - 1
-  ];
+  if (!dispute) return undefined;
+
+  const period = dispute.period;
+  const currentLocalRoundIndex = dispute.disputeKitDispute?.currentLocalRoundIndex;
+  const adjustedRoundIndex = ["appeal", "execution"].includes(period)
+    ? currentLocalRoundIndex
+    : currentLocalRoundIndex - 1;
+
+  return getLocalRounds(dispute.disputeKitDispute)[adjustedRoundIndex];
 };
 
 const getPaidFees = (dispute?: ClassicAppealQuery["dispute"]) => {