Merge pull request #1376 from kleros/feat/add-court-jump-notification

feat(web): court-jump-indicator
kleros · Jan 2, 2024 · 0e75b6b · 0e75b6b
2 parents 2b6d97a + 4fbd067
commit 0e75b6b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/subgraph/core/schema.graphql b/subgraph/core/schema.graphql
@@ -181,6 +181,7 @@ type Round @entity {
   penalties: BigInt!
   drawnJurors: [Draw!]! @derivedFrom(field: "round")
   dispute: Dispute!
+  court: Court!
   feeToken: FeeToken
 }
 

diff --git a/subgraph/core/src/KlerosCore.ts b/subgraph/core/src/KlerosCore.ts
@@ -78,7 +78,7 @@ export function handleDisputeCreation(event: DisputeCreation): void {
   court.save();
   createDisputeFromEvent(event);
   const roundInfo = contract.getRoundInfo(disputeID, ZERO);
-  createRoundFromRoundInfo(disputeID, ZERO, roundInfo);
+  createRoundFromRoundInfo(KlerosCore.bind(event.address), disputeID, ZERO, roundInfo);
   const arbitrable = event.params._arbitrable.toHexString();
   updateArbitrableCases(arbitrable, ONE);
   updateCases(ONE, event.block.timestamp);
@@ -163,7 +163,7 @@ export function handleAppealDecision(event: AppealDecision): void {
   dispute.currentRound = roundID;
   dispute.save();
   const roundInfo = contract.getRoundInfo(disputeID, newRoundIndex);
-  createRoundFromRoundInfo(disputeID, newRoundIndex, roundInfo);
+  createRoundFromRoundInfo(KlerosCore.bind(event.address), disputeID, newRoundIndex, roundInfo);
 }
 
 export function handleCourtJump(event: CourtJump): void {

diff --git a/subgraph/core/src/entities/Round.ts b/subgraph/core/src/entities/Round.ts
@@ -1,8 +1,9 @@
 import { BigInt } from "@graphprotocol/graph-ts";
-import { KlerosCore__getRoundInfoResultValue0Struct } from "../../generated/KlerosCore/KlerosCore";
+import { KlerosCore, KlerosCore__getRoundInfoResultValue0Struct } from "../../generated/KlerosCore/KlerosCore";
 import { Round } from "../../generated/schema";
 
 export function createRoundFromRoundInfo(
+  contract: KlerosCore,
   disputeID: BigInt,
   roundIndex: BigInt,
   roundInfo: KlerosCore__getRoundInfoResultValue0Struct
@@ -19,5 +20,7 @@ export function createRoundFromRoundInfo(
   round.repartitions = roundInfo.repartitions;
   round.penalties = roundInfo.pnkPenalties;
   round.dispute = disputeID.toString();
+  const courtID = contract.disputes(disputeID).value0.toString();
+  round.court = courtID;
   round.save();
 }
diff --git a/web/src/components/Verdict/DisputeTimeline.tsx b/web/src/components/Verdict/DisputeTimeline.tsx
@@ -87,7 +87,7 @@ const useItems = (disputeDetails?: DisputeDetailsQuery, arbitrable?: `0x${string
           acc.push({
             title: `Jury Decision - Round ${index + 1}`,
             party: isOngoing ? "Voting is ongoing" : getVoteChoice(parsedRoundChoice, answers),
-            subtitle: eventDate,
+            subtitle: `${eventDate} / ${votingHistory?.dispute?.rounds.at(index)?.court.name}`,
             rightSided: true,
             variant: theme.secondaryPurple,
             Icon: icon !== "" ? icon : undefined,

diff --git a/web/src/hooks/queries/useVotingHistory.ts b/web/src/hooks/queries/useVotingHistory.ts
@@ -10,6 +10,10 @@ const votingHistoryQuery = graphql(`
       id
       rounds {
         nbVotes
+        court {
+          id
+          name
+        }
       }
       disputeKitDispute {
         localRounds {

diff --git a/web/src/pages/Cases/CaseDetails/Voting/VotingHistory.tsx b/web/src/pages/Cases/CaseDetails/Voting/VotingHistory.tsx
@@ -133,7 +133,8 @@ const VotingHistory: React.FC<{ arbitrable?: `0x${string}`; isQuestion: boolean
                 ? "All jurors voted"
                 : localRounds.at(currentTab)?.totalVoted.toString() +
                   ` vote${localRounds.at(currentTab)?.totalVoted.toString() === "1" ? "" : "s"} cast out of ` +
-                  rounds.at(currentTab)?.nbVotes}
+                  rounds.at(currentTab)?.nbVotes}{" "}
+              - {rounds.at(currentTab)?.court.name}
             </p>
           </StyledBox>
           <StyledAccordion
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,10 @@ const votingHistoryQuery = graphql(` @@
           id
           rounds {
             nbVotes
+            court {
+              id
+              name
+            }
           }
           disputeKitDispute {
             localRounds {
@@ Expand Down @@