fix: cosmetic and rabbit review

Author: jaybuidl

web/src/consts/index.ts

@@ -44,8 +44,8 @@ export const RPC_ERROR = `RPC Error: Unable to fetch dispute data. Please avoid
 export const spamEvidencesIds: string[] = (import.meta.env.REACT_APP_SPAM_EVIDENCES_IDS ?? "").split(",");
 
 export enum DisputeKits {
-  Classic = "Classic Dispute Kit",
-  Shutter = "Shutter Dispute Kit",
-  Gated = "Gated Dispute Kit",
-  GatedShutter = "Gated Shutter Dispute Kit",
+  Classic = "Classic",
+  Shutter = "Shutter",
+  Gated = "Token Gated",
+  GatedShutter = "Token Gated Shutter",
 }

web/src/pages/Resolver/Parameters/Court.tsx

@@ -115,6 +115,11 @@ const Court: React.FC = () => {
     return disputeData.disputeKitId ?? -1;
   }, [disputeKitOptions, disputeData.disputeKitId]);
 
+  const isGatedDisputeKit = useMemo(() => {
+    const options = disputeKitOptions.find((dk) => String(dk.value) === String(selectedDisputeKitId));
+    return options?.gated ?? false;
+  }, [disputeKitOptions, selectedDisputeKitId]);
+
   const handleCourtChange = (courtId: string) => {
     if (disputeData.courtId !== courtId) {
       setDisputeData({ ...disputeData, courtId, disputeKitId: undefined });
@@ -123,23 +128,18 @@ const Court: React.FC = () => {
 
   const handleDisputeKitChange = (newValue: string | number) => {
     const options = disputeKitOptions.find((dk) => String(dk.value) === String(newValue));
-    const isNewValueGated = options?.gated ?? false;
-    const gatedDisputeKitData: IGatedDisputeData | undefined = isNewValueGated
-      ? {
-          type: "gated",
-          tokenGate: "",
-          isERC1155: false,
-          tokenId: "0",
-        }
-      : undefined;
+    const gatedDisputeKitData: IGatedDisputeData | undefined =
+      (options?.gated ?? false)
+        ? {
+            type: "gated",
+            tokenGate: "",
+            isERC1155: false,
+            tokenId: "0",
+          }
+        : undefined;
     setDisputeData({ ...disputeData, disputeKitId: Number(newValue), disputeKitData: gatedDisputeKitData });
   };
 
-  const isGatedDisputeKit = useMemo(() => {
-    const options = disputeKitOptions.find((dk) => String(dk.value) === String(selectedDisputeKitId));
-    return options?.gated ?? false;
-  }, [disputeKitOptions, selectedDisputeKitId]);
-
   const handleTokenAddressChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const currentData = disputeData.disputeKitData as IGatedDisputeData;
     setDisputeData({

web/src/utils/prepareArbitratorExtradata.ts

@@ -10,9 +10,15 @@ import { IDisputeKitData, IGatedDisputeData, ISomeFutureDisputeData } from "cont
 const encodeGatedDisputeData = (data: IGatedDisputeData): string => {
   // Packing of tokenGate and isERC1155
   // uint88 (padding 11 bytes) + bool (1 byte) + address (20 bytes) = 32 bytes
-  const packed = ethers.utils.solidityPack(["uint88", "bool", "address"], [0, data.isERC1155, data.tokenGate]);
-  if (!data.tokenId || !data.isERC1155) data.tokenId = "0";
-  return ethers.utils.defaultAbiCoder.encode(["bytes32", "uint256"], [packed, data.tokenId]);
+  const normalizedData = {
+    ...data,
+    tokenId: !data.tokenId || !data.isERC1155 ? "0" : data.tokenId,
+  };
+  const packed = ethers.utils.solidityPack(
+    ["uint88", "bool", "address"],
+    [0, normalizedData.isERC1155, normalizedData.tokenGate]
+  );
+  return ethers.utils.defaultAbiCoder.encode(["bytes32", "uint256"], [packed, normalizedData.tokenId]);
 };
 
 /**
@@ -45,7 +51,7 @@ export const prepareArbitratorExtradata = (
   disputeKit: number = 1,
   disputeKitData?: IDisputeKitData
 ) => {
-  let extraData = ethers.utils.defaultAbiCoder.encode(
+  const extraData = ethers.utils.defaultAbiCoder.encode(
     ["uint256", "uint256", "uint256"],
     [subcourtID, noOfVotes, disputeKit]
   ) as `0x{string}`;
@@ -58,6 +64,5 @@ export const prepareArbitratorExtradata = (
     throw new Error(`Unknown dispute kit data type: ${disputeKitData.type}`);
   }
   const encodedDisputeKitData = encoder(disputeKitData as any);
-  extraData = ethers.utils.hexConcat([extraData, encodedDisputeKitData]) as `0x{string}`;
-  return extraData;
+  return ethers.utils.hexConcat([extraData, encodedDisputeKitData]) as `0x{string}`;
 };