From 8182cf33e93cf84eb48ee738db922292ebb3d1d5 Mon Sep 17 00:00:00 2001 From: BudzioT Date: Sun, 19 Jan 2025 11:48:25 +0100 Subject: [PATCH 1/2] Fixed ships awaiting payout --- src/app/utils/data.ts | 2 ++ src/components/ui/ship-pill-cluster.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/utils/data.ts b/src/app/utils/data.ts index 01193408..fcfe4a89 100644 --- a/src/app/utils/data.ts +++ b/src/app/utils/data.ts @@ -60,6 +60,7 @@ export interface Ship extends EditableShipFields { yswsType: YswsType feedback: string | null isInYswsBase: boolean + hidden: boolean } export interface EditableShipFields { title: string @@ -142,6 +143,7 @@ export async function fetchShips( yswsType: r.fields.yswsType, feedback: r.fields.ai_feedback_summary, isInYswsBase: Boolean(r.fields.has_ysws_submission_id), + hidden: Boolean(r.fields.hidden), } return ship diff --git a/src/components/ui/ship-pill-cluster.tsx b/src/components/ui/ship-pill-cluster.tsx index 294fcf42..6721c447 100644 --- a/src/components/ui/ship-pill-cluster.tsx +++ b/src/components/ui/ship-pill-cluster.tsx @@ -56,7 +56,7 @@ export default function ShipPillCluster({ {chain[0].shipStatus === 'shipped' ? ( <> {allShipsHaveVoteRequirementMet ? ( - chain.at(-1)?.doubloonPayout != null ? ( + chain.at(-1)?.matchups_count >= 10 || chain.at(-1)?.hidden ? ( Date: Sun, 19 Jan 2025 17:02:30 +0100 Subject: [PATCH 2/2] Let's do it differently --- src/app/utils/data.ts | 2 -- src/components/ui/ship-pill-cluster.tsx | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/utils/data.ts b/src/app/utils/data.ts index fcfe4a89..01193408 100644 --- a/src/app/utils/data.ts +++ b/src/app/utils/data.ts @@ -60,7 +60,6 @@ export interface Ship extends EditableShipFields { yswsType: YswsType feedback: string | null isInYswsBase: boolean - hidden: boolean } export interface EditableShipFields { title: string @@ -143,7 +142,6 @@ export async function fetchShips( yswsType: r.fields.yswsType, feedback: r.fields.ai_feedback_summary, isInYswsBase: Boolean(r.fields.has_ysws_submission_id), - hidden: Boolean(r.fields.hidden), } return ship diff --git a/src/components/ui/ship-pill-cluster.tsx b/src/components/ui/ship-pill-cluster.tsx index 6721c447..d9158c3d 100644 --- a/src/components/ui/ship-pill-cluster.tsx +++ b/src/components/ui/ship-pill-cluster.tsx @@ -56,7 +56,7 @@ export default function ShipPillCluster({ {chain[0].shipStatus === 'shipped' ? ( <> {allShipsHaveVoteRequirementMet ? ( - chain.at(-1)?.matchups_count >= 10 || chain.at(-1)?.hidden ? ( + chain.at(-1).paidOut == true ? (