Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: better appeal loading mechanism #1841

Merged
merged 3 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions web/src/hooks/useClassicAppealContext.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo, useState, createContext, useContext } from "react";
import React, { useMemo, createContext, useContext, useState } from "react";

import { useParams } from "react-router-dom";

Expand All @@ -7,6 +7,7 @@ import { Periods } from "consts/periods";
import { usePopulatedDisputeData } from "hooks/queries/usePopulatedDisputeData";
import { useCountdown } from "hooks/useCountdown";
import { getLocalRounds } from "utils/getLocalRounds";
import { isUndefined } from "utils/index";

import { useAppealCost } from "queries/useAppealCost";
import { useClassicAppealQuery, ClassicAppealQuery } from "queries/useClassicAppealQuery";
Expand All @@ -15,6 +16,7 @@ import { useDisputeKitClassicMultipliers } from "queries/useDisputeKitClassicMul
interface ICountdownContext {
loserSideCountdown?: number;
winnerSideCountdown?: number;
isLoading?: boolean;
}
const CountdownContext = createContext<ICountdownContext>({});

Expand Down Expand Up @@ -73,6 +75,8 @@ export const ClassicAppealProvider: React.FC<{
dispute?.court.timesPerPeriod[Periods.appeal]
);

const isLoading = useMemo(() => isUndefined(dispute) || isUndefined(multipliers), [dispute, multipliers]);

const { loserRequiredFunding, winnerRequiredFunding } = useMemo(
() => ({
loserRequiredFunding: getRequiredFunding(appealCost, multipliers?.loser_stake_multiplier),
Expand All @@ -85,7 +89,10 @@ export const ClassicAppealProvider: React.FC<{

return (
<CountdownContext.Provider
value={useMemo(() => ({ loserSideCountdown, winnerSideCountdown }), [loserSideCountdown, winnerSideCountdown])}
value={useMemo(
() => ({ loserSideCountdown, winnerSideCountdown, isLoading }),
[loserSideCountdown, winnerSideCountdown, isLoading]
)}
>
<SelectedOptionContext.Provider
value={useMemo(() => ({ selectedOption, setSelectedOption }), [selectedOption, setSelectedOption])}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from "react";
import styled from "styled-components";

import { useCountdownContext } from "hooks/useClassicAppealContext";
import { isUndefined } from "utils/index";

import { StyledSkeleton } from "components/StyledSkeleton";

Expand All @@ -18,13 +17,20 @@ interface IOptions {
}

const Options: React.FC<IOptions> = ({ setAmount }) => {
const { loserSideCountdown } = useCountdownContext();
return !isUndefined(loserSideCountdown) ? (
const { loserSideCountdown, isLoading } = useCountdownContext();

return (
<Container>
{loserSideCountdown > 0 ? <StageOne setAmount={setAmount} /> : <StageTwo setAmount={setAmount} />}
{!isLoading ? (
loserSideCountdown > 0 ? (
<StageOne setAmount={setAmount} />
) : (
<StageTwo setAmount={setAmount} />
)
) : (
<StyledSkeleton />
)}
</Container>
) : (
<StyledSkeleton />
);
};

Expand Down
Loading