diff --git a/web/src/components/DisputeCard/DisputeInfo.tsx b/web/src/components/DisputeCard/DisputeInfo.tsx index 0371db5bf..0b3568097 100644 --- a/web/src/components/DisputeCard/DisputeInfo.tsx +++ b/web/src/components/DisputeCard/DisputeInfo.tsx @@ -1,10 +1,10 @@ import React from "react"; import styled from "styled-components"; import { Periods } from "consts/periods"; -import LawBalanceIcon from "svgs/icons/law-balance.svg"; import BookmarkIcon from "svgs/icons/bookmark.svg"; -import PileCoinsIcon from "svgs/icons/pile-coins.svg"; import CalendarIcon from "svgs/icons/calendar.svg"; +import LawBalanceIcon from "svgs/icons/law-balance.svg"; +import PileCoinsIcon from "svgs/icons/pile-coins.svg"; import Field from "../Field"; const Container = styled.div` @@ -13,7 +13,7 @@ const Container = styled.div` gap: 8px; `; -const getPeriodPhrase = (period: Periods) => { +const getPeriodPhrase = (period: Periods): string => { switch (period) { case Periods.evidence: return "Voting Starts"; @@ -35,36 +35,14 @@ export interface IDisputeInfo { date?: number; } -const DisputeInfo: React.FC = ({ - courtId, - court, - category, - rewards, - period, - date, -}) => { +const DisputeInfo: React.FC = ({ courtId, court, category, rewards, period, date }) => { return ( - {category && ( - - )} - {court && courtId && ( - - )} - {rewards && ( - - )} + {category && } + {court && courtId && } + {rewards && } {typeof period !== "undefined" && date && ( - + )} ); diff --git a/web/src/components/DisputeCard/PeriodBanner.tsx b/web/src/components/DisputeCard/PeriodBanner.tsx index 7e1ee779f..0990cf47c 100644 --- a/web/src/components/DisputeCard/PeriodBanner.tsx +++ b/web/src/components/DisputeCard/PeriodBanner.tsx @@ -54,7 +54,7 @@ const Container = styled.div>` }}; `; -const getPeriodLabel = (period: Periods) => { +const getPeriodLabel = (period: Periods): string => { switch (period) { case Periods.appeal: return "Crowdfunding Appeal"; diff --git a/web/src/hooks/queries/useCasesQuery.ts b/web/src/hooks/queries/useCasesQuery.ts index 082ee7b53..44b120e4b 100644 --- a/web/src/hooks/queries/useCasesQuery.ts +++ b/web/src/hooks/queries/useCasesQuery.ts @@ -5,12 +5,7 @@ export type { CasesPageQuery }; const casesQuery = gql` query CasesPage($skip: Int) { - disputes( - first: 3 - skip: $skip - orderBy: lastPeriodChange - orderDirection: desc - ) { + disputes(first: 3, skip: $skip, orderBy: lastPeriodChange, orderDirection: desc) { id arbitrated { id @@ -30,7 +25,7 @@ const casesQuery = gql` } `; -export const useCasesQuery = (skip: number) => { +export const useCasesQuery = (skip: number): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR({ query: casesQuery, variables: { skip: skip }, diff --git a/web/src/hooks/queries/useClassicAppealQuery.ts b/web/src/hooks/queries/useClassicAppealQuery.ts index f330ffa7a..dea83950f 100644 --- a/web/src/hooks/queries/useClassicAppealQuery.ts +++ b/web/src/hooks/queries/useClassicAppealQuery.ts @@ -29,7 +29,9 @@ const classicAppealQuery = gql` } `; -export const useClassicAppealQuery = (id?: string | number) => { +export const useClassicAppealQuery = ( + id?: string | number +): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR(() => typeof id !== "undefined" ? { diff --git a/web/src/hooks/queries/useCourtDetails.ts b/web/src/hooks/queries/useCourtDetails.ts index 225957102..f3616f7d3 100644 --- a/web/src/hooks/queries/useCourtDetails.ts +++ b/web/src/hooks/queries/useCourtDetails.ts @@ -18,7 +18,7 @@ const courtDetailsQuery = gql` } `; -export const useCourtDetails = (id?: string) => { +export const useCourtDetails = (id?: string): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR( id ? { diff --git a/web/src/hooks/queries/useCourtPolicyURI.ts b/web/src/hooks/queries/useCourtPolicyURI.ts index 0cd406af9..ea7324704 100644 --- a/web/src/hooks/queries/useCourtPolicyURI.ts +++ b/web/src/hooks/queries/useCourtPolicyURI.ts @@ -11,7 +11,7 @@ const courtPolicyURIQuery = gql` } `; -export const useCourtPolicyURI = (id?: string | number) => { +export const useCourtPolicyURI = (id?: string | number): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWRImmutable(() => typeof id !== "undefined" ? { @@ -20,8 +20,6 @@ export const useCourtPolicyURI = (id?: string | number) => { } : false ); - const result = data - ? (data.court.policy as CourtPolicyUriQuery.court.policy) - : undefined; + const result = data ? (data.court.policy as CourtPolicyUriQuery.court.policy) : undefined; return { data: result, error, isValidating }; }; diff --git a/web/src/hooks/queries/useCourtTree.ts b/web/src/hooks/queries/useCourtTree.ts index eb321c7c6..2c46134f4 100644 --- a/web/src/hooks/queries/useCourtTree.ts +++ b/web/src/hooks/queries/useCourtTree.ts @@ -32,7 +32,7 @@ const courtTreeQuery = gql` } `; -export const useCourtTree = () => { +export const useCourtTree = (): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR({ query: courtTreeQuery, }); diff --git a/web/src/hooks/queries/useDisputeDetailsQuery.ts b/web/src/hooks/queries/useDisputeDetailsQuery.ts index 0e1bc8f96..7e0c0511e 100644 --- a/web/src/hooks/queries/useDisputeDetailsQuery.ts +++ b/web/src/hooks/queries/useDisputeDetailsQuery.ts @@ -22,7 +22,9 @@ const disputeDetailsQuery = gql` } `; -export const useDisputeDetailsQuery = (id?: string | number) => { +export const useDisputeDetailsQuery = ( + id?: string | number +): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR(() => typeof id !== "undefined" ? { diff --git a/web/src/hooks/queries/useDisputeKitClassicMultipliers.ts b/web/src/hooks/queries/useDisputeKitClassicMultipliers.ts index c586a0ccf..007723090 100644 --- a/web/src/hooks/queries/useDisputeKitClassicMultipliers.ts +++ b/web/src/hooks/queries/useDisputeKitClassicMultipliers.ts @@ -8,12 +8,9 @@ export const useDisputeKitClassicMultipliers = () => { () => (disputeKitClassic ? `Multipliers` : false), async () => { if (!disputeKitClassic) return; - const winner_stake_multiplier = - await disputeKitClassic.WINNER_STAKE_MULTIPLIER(); - const loser_stake_multiplier = - await disputeKitClassic.LOSER_STAKE_MULTIPLIER(); - const loser_appeal_period_multiplier = - await disputeKitClassic.LOSER_APPEAL_PERIOD_MULTIPLIER(); + const winner_stake_multiplier = await disputeKitClassic.WINNER_STAKE_MULTIPLIER(); + const loser_stake_multiplier = await disputeKitClassic.LOSER_STAKE_MULTIPLIER(); + const loser_appeal_period_multiplier = await disputeKitClassic.LOSER_APPEAL_PERIOD_MULTIPLIER(); return { winner_stake_multiplier, loser_stake_multiplier, diff --git a/web/src/hooks/queries/useDrawQuery.ts b/web/src/hooks/queries/useDrawQuery.ts index f789d95ff..e4e6ca9df 100644 --- a/web/src/hooks/queries/useDrawQuery.ts +++ b/web/src/hooks/queries/useDrawQuery.ts @@ -11,7 +11,10 @@ const drawQuery = gql` } `; -export const useDrawQuery = (address?: string | null, disputeID?: string) => { +export const useDrawQuery = ( + address?: string | null, + disputeID?: string +): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR({ query: drawQuery, variables: { address, disputeID }, diff --git a/web/src/hooks/queries/useEvidences.ts b/web/src/hooks/queries/useEvidences.ts index 2f92c8c30..19f5b7871 100644 --- a/web/src/hooks/queries/useEvidences.ts +++ b/web/src/hooks/queries/useEvidences.ts @@ -5,11 +5,7 @@ export type { EvidencesQuery }; const evidencesQuery = gql` query Evidences($evidenceGroup: String) { - evidences( - where: { evidenceGroup: $evidenceGroup } - orderBy: id - orderDirection: asc - ) { + evidences(where: { evidenceGroup: $evidenceGroup }, orderBy: id, orderDirection: asc) { id evidence sender { @@ -19,7 +15,7 @@ const evidencesQuery = gql` } `; -export const useEvidences = (evidenceGroup?: string) => { +export const useEvidences = (evidenceGroup?: string): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR(() => typeof evidenceGroup !== "undefined" ? { diff --git a/web/src/hooks/queries/useHomePageQuery.ts b/web/src/hooks/queries/useHomePageQuery.ts index f7f44c657..bf14b2e31 100644 --- a/web/src/hooks/queries/useHomePageQuery.ts +++ b/web/src/hooks/queries/useHomePageQuery.ts @@ -19,7 +19,7 @@ const homePageQuery = gql` } `; -export const useHomePageQuery = (timeframe: number) => { +export const useHomePageQuery = (timeframe: number): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR({ query: homePageQuery, variables: { timeframe: timeframe.toString() }, diff --git a/web/src/hooks/queries/useJurorBalance.ts b/web/src/hooks/queries/useJurorBalance.ts index a2e2a30a9..60f523f7a 100644 --- a/web/src/hooks/queries/useJurorBalance.ts +++ b/web/src/hooks/queries/useJurorBalance.ts @@ -2,14 +2,10 @@ import useSWR from "swr"; import { KlerosCore } from "@kleros/kleros-v2-contracts/typechain-types/src/arbitration/KlerosCore"; import { useConnectedContract } from "../useConnectedContract"; -export const useJurorBalance = ( - user?: string | null, - courtId?: string | undefined -) => { +export const useJurorBalance = (user?: string | null, courtId?: string | undefined) => { const klerosCore = useConnectedContract("KlerosCore") as KlerosCore; return useSWR( - () => - klerosCore && user && courtId ? `JurorBalance{address}{courtId}` : false, + () => (klerosCore && user && courtId ? `JurorBalance${user}${courtId}` : false), async () => { if (klerosCore && user && courtId) { return await klerosCore.getJurorBalance(user, courtId); diff --git a/web/src/hooks/queries/usePNKAllowance.ts b/web/src/hooks/queries/usePNKAllowance.ts index 8e082bbba..fdb0ffe4f 100644 --- a/web/src/hooks/queries/usePNKAllowance.ts +++ b/web/src/hooks/queries/usePNKAllowance.ts @@ -6,13 +6,10 @@ import { CONTRACTS } from "utils/getContract"; export const usePNKAllowance = (user?: string | null) => { const pnkContract = useConnectedContract("PNK") as PNK; return useSWR( - () => (pnkContract && user ? `PNKAllowance{user}` : false), + () => (pnkContract && user ? `PNKAllowance${user}` : false), async () => { if (pnkContract && user) { - return await pnkContract.allowance( - user, - CONTRACTS["KlerosCore"].address - ); + return await pnkContract.allowance(user, CONTRACTS["KlerosCore"].address); } else { return undefined; } diff --git a/web/src/hooks/queries/useVotingHistory.ts b/web/src/hooks/queries/useVotingHistory.ts index 9bff562fc..a819b87c0 100644 --- a/web/src/hooks/queries/useVotingHistory.ts +++ b/web/src/hooks/queries/useVotingHistory.ts @@ -31,7 +31,7 @@ const votingHistoryQuery = gql` } `; -export const useVotingHistory = (disputeID?: string) => { +export const useVotingHistory = (disputeID?: string): { data: typeof result; error: any; isValidating: boolean } => { const { data, error, isValidating } = useSWR(() => typeof disputeID !== "undefined" ? { diff --git a/web/src/hooks/useParsedAmount.ts b/web/src/hooks/useParsedAmount.ts index d3b522710..103f658f9 100644 --- a/web/src/hooks/useParsedAmount.ts +++ b/web/src/hooks/useParsedAmount.ts @@ -1,9 +1,6 @@ import { useMemo } from "react"; import { BigNumber, utils } from "ethers"; -export function useParsedAmount(amount: string) { - return useMemo( - () => (amount === "" ? BigNumber.from(0) : utils.parseUnits(amount, 18)), - [amount] - ); +export function useParsedAmount(amount: string): BigNumber { + return useMemo(() => (amount === "" ? BigNumber.from(0) : utils.parseUnits(amount, 18)), [amount]); } diff --git a/web/src/pages/Cases/CaseDetails/Evidence/SubmitEvidenceModal.tsx b/web/src/pages/Cases/CaseDetails/Evidence/SubmitEvidenceModal.tsx index 64b22a583..d8243f774 100644 --- a/web/src/pages/Cases/CaseDetails/Evidence/SubmitEvidenceModal.tsx +++ b/web/src/pages/Cases/CaseDetails/Evidence/SubmitEvidenceModal.tsx @@ -1,9 +1,9 @@ import React, { useState } from "react"; import styled from "styled-components"; import Modal from "react-modal"; -import { Textarea, Button } from "@kleros/ui-components-library"; -import { DisputeKitClassic } from "@kleros/kleros-v2-contracts/typechain-types/src/arbitration/dispute-kits/DisputeKitClassic"; import { wrapWithToast } from "utils/wrapWithToast"; +import { Button, Textarea } from "@kleros/ui-components-library"; +import { DisputeKitClassic } from "@kleros/kleros-v2-contracts/typechain-types/src/arbitration/dispute-kits/DisputeKitClassic"; import { useConnectedContract } from "hooks/useConnectedContract"; import { uploadFormDataToIPFS } from "utils/uploadFormDataToIPFS"; @@ -12,26 +12,15 @@ const SubmitEvidenceModal: React.FC<{ evidenceGroup: string; close: () => void; }> = ({ isOpen, evidenceGroup, close }) => { - const disputeKit = useConnectedContract( - "DisputeKitClassic" - ) as DisputeKitClassic; + const disputeKit = useConnectedContract("DisputeKitClassic") as DisputeKitClassic; const [isSending, setIsSending] = useState(false); const [message, setMessage] = useState(""); return (

Submit New Evidence

- setMessage(e.target.value)} - placeholder="Your Arguments" - /> + setMessage(e.target.value)} placeholder="Your Arguments" /> -