Resolve PR #90 merge conflicts in homepage championship logic and tests#91
Conversation
Agent-Logs-Url: https://github.com/dai/o-sumo/sessions/59a07f3d-5499-45e2-a8a5-9c7a8a45b6e1 Co-authored-by: dai <12391+dai@users.noreply.github.com>
cebee2a
into
codex/fix-changes-not-reflecting-after-merging-pr83-c7w2kr
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ec8df54006
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| const championshipLabel = currentDay === 14 | ||
| ? t('home.championshipLabelDay14') | ||
| : t('home.championshipLabelDay', { day: currentDay }); |
There was a problem hiding this comment.
Base championship label on published results day
championshipLabel is derived from currentDay, but buildChampionshipLeaders only aggregates resultDays where status === 'published'. In the common case where the next day exists as pending, getCurrentDay() can advance to that day while leader stats are still from the prior published day, so the heading shows a newer day label than the standings actually represent. Derive the label from the same published-day source used for championshipLeaders (or return that day from the builder) to keep the UI consistent.
Useful? React with 👍 / 👎.
PR #90 diverged from
maininapp/page.tsxandapp/page.test.tsx, leaving unresolved conflicts around championship day labeling and leader-link rendering. This change reconciles both lines of work so the homepage keeps the newer dynamic leader behavior while preserving stabilized current-day calculation.Conflict resolution: homepage day calculation + championship rendering
main(buildChampionshipLeaders, result anchor links).getCurrentDay()to preserve the branch’s stabilized day derivation logic:resultUpdatedAtreference datetoday.makuuchi.dayHometo usegetCurrentDay()as the single source for championship visibility/label computation.Conflict resolution: test expectations
十四日目終了時点at day 14, otherwise${day}日目) viagetCurrentDay().