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.

Sign up for GitHub

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

Fixed ships awaiting payout #1117

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixed ships awaiting payout #1117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8182cf3
Fixed ships awaiting payout
BudzioT Jan 19, 2025
a0541a1
Let's do it differently
BudzioT Jan 19, 2025
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
2 changes: 2 additions & 0 deletions src/app/utils/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export interface Ship extends EditableShipFields {
yswsType: YswsType
feedback: string | null
isInYswsBase: boolean
hidden: boolean
}
export interface EditableShipFields {
title: string
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/ship-pill-cluster.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ? (
<Pill
classes={`${transparent && 'bg-white/15 text-white'} ${size === 'small' ? 'text-xs' : ''}`}
msg={pluralize(roundedPayout, 'doubloon', true)}
Expand Down
Loading