Merge pull request #1321 from kleros/fix(web,subgraph)/stakes-balance…

…s-bug fix(web,subgraph): fix staking balances bug
kleros · Nov 8, 2023 · 347cbcd · 347cbcd
2 parents fd9862b + d279014
commit 347cbcd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/subgraph/src/entities/JurorTokensPerCourt.ts b/subgraph/src/entities/JurorTokensPerCourt.ts
@@ -38,7 +38,7 @@ export function updateJurorStake(jurorAddress: string, courtID: string, contract
   const jurorBalance = contract.getJurorBalance(Address.fromString(jurorAddress), BigInt.fromString(courtID));
   const previousStake = jurorTokens.staked;
   const previousTotalStake = juror.totalStake;
-  jurorTokens.staked = jurorBalance.value0;
+  jurorTokens.staked = jurorBalance.value2;
   jurorTokens.locked = jurorBalance.value1;
   jurorTokens.save();
   const stakeDelta = getDelta(previousStake, jurorTokens.staked);
@@ -47,7 +47,7 @@ export function updateJurorStake(jurorAddress: string, courtID: string, contract
   court.stake = court.stake.plus(stakeDelta);
   updateStakedPNK(stakeDelta, timestamp);
   const activeJurorsDelta = getActivityDelta(previousTotalStake, newTotalStake);
-  const stakedJurorsDelta = getActivityDelta(previousStake, jurorBalance.value0);
+  const stakedJurorsDelta = getActivityDelta(previousStake, jurorBalance.value2);
   court.numberStakedJurors = court.numberStakedJurors.plus(stakedJurorsDelta);
   updateActiveJurors(activeJurorsDelta, timestamp);
   juror.save();

diff --git a/web/src/components/Popup/Description/StakeWithdraw.tsx b/web/src/components/Popup/Description/StakeWithdraw.tsx
@@ -88,7 +88,7 @@ const StakeWithdraw: React.FC<IStakeWithdraw> = ({ pnkStaked, courtName, isStake
 
       <TotalStakeContainer>
         <StyledKlerosLogo /> <MyStakeContainer>My Stake:</MyStakeContainer>{" "}
-        <AmountContainer>{`${formatUnits(jurorBalance?.[0] ?? BigInt(0), 18)} PNK`} </AmountContainer>
+        <AmountContainer>{`${formatUnits(jurorBalance?.[2] ?? BigInt(0), 18)} PNK`} </AmountContainer>
       </TotalStakeContainer>
     </Container>
   );

diff --git a/web/src/pages/Courts/CourtDetails/StakePanel/InputDisplay.tsx b/web/src/pages/Courts/CourtDetails/StakePanel/InputDisplay.tsx
@@ -83,7 +83,7 @@ const InputDisplay: React.FC<IInputDisplay> = ({
     args: [address, id],
     watch: true,
   });
-  const parsedStake = formatPNK(jurorBalance?.[0] || 0n, 0, true);
+  const parsedStake = formatPNK(jurorBalance?.[2] || 0n, 0, true);
   const isStaking = action === ActionType.stake;
 
   return (

diff --git a/web/src/pages/Courts/CourtDetails/StakePanel/JurorStakeDisplay.tsx b/web/src/pages/Courts/CourtDetails/StakePanel/JurorStakeDisplay.tsx
@@ -58,7 +58,7 @@ const useCalculateJurorOdds = (
       return "0.00%";
     }
 
-    return bigIntRatioToPercentage(jurorBalance[0], BigInt(stakedByAllJurors));
+    return bigIntRatioToPercentage(jurorBalance[2], BigInt(stakedByAllJurors));
   }, [jurorBalance, stakedByAllJurors, loading]);
 };
 
@@ -78,10 +78,10 @@ const JurorBalanceDisplay = () => {
   const [previousStakedByAllJurors, setPreviousStakedByAllJurors] = useState<bigint | undefined>(undefined);
 
   useEffect(() => {
-    if (previousJurorBalance !== undefined && jurorBalance?.[0] !== previousJurorBalance) {
+    if (previousJurorBalance !== undefined && jurorBalance?.[2] !== previousJurorBalance) {
       setLoading(true);
     }
-    setPreviousJurorBalance(jurorBalance?.[0]);
+    setPreviousJurorBalance(jurorBalance?.[2]);
   }, [jurorBalance, previousJurorBalance]);
 
   useEffect(() => {
@@ -99,7 +99,7 @@ const JurorBalanceDisplay = () => {
     {
       icon: PNKIcon,
       name: "My Stake",
-      value: `${format(jurorBalance?.[0])} PNK`,
+      value: `${format(jurorBalance?.[2])} PNK`,
     },
     {
       icon: LockerIcon,

diff --git a/web/src/pages/Courts/CourtDetails/StakePanel/StakeWithdrawButton.tsx b/web/src/pages/Courts/CourtDetails/StakePanel/StakeWithdrawButton.tsx
@@ -68,9 +68,9 @@ const StakeWithdrawButton: React.FC<IActionButton> = ({
       if (isAllowance) {
         return parsedAmount;
       } else if (isStaking) {
-        return jurorBalance[0] + parsedAmount;
+        return jurorBalance[2] + parsedAmount;
       } else {
-        return jurorBalance[0] - parsedAmount;
+        return jurorBalance[2] - parsedAmount;
       }
     }
     return 0n;
@@ -121,7 +121,7 @@ const StakeWithdrawButton: React.FC<IActionButton> = ({
     },
     [ActionType.withdraw]: {
       text: "Withdraw",
-      checkDisabled: () => !jurorBalance || parsedAmount > jurorBalance[0],
+      checkDisabled: () => !jurorBalance || parsedAmount > jurorBalance[2],
       onClick: handleStake,
     },
   };