Skip to content

Sync main into beta#84

Merged
coder13 merged 9 commits into
betafrom
agent/sync-main-into-beta
Jul 11, 2026
Merged

Sync main into beta#84
coder13 merged 9 commits into
betafrom
agent/sync-main-into-beta

Conversation

@coder13

@coder13 coder13 commented Jul 11, 2026

Copy link
Copy Markdown
Owner

Summary

  • merge current production main back into beta
  • preserve Worlds free-form assignments as parse-safe other-misc activities and keep extra-only schedule days
  • preserve NAC/FMC fixes that limit synthesized attempts to the competitor's assigned activity
  • use one venue-resolved timezone for schedule-day grouping and assignment dates

Why

The existing betamain deploy PR conflicted in Personal Schedule logic. A mechanical choice of either side would regress either Worlds assignments or the production FMC fixes. The extra-only-day behavior also exposed inconsistent timezone resolution that could make an assignment disappear near a UTC date boundary.

Impact

beta now contains all current production fixes, the deploy conflict is resolved, and Worlds/FMC-only schedule days remain visible on the correct venue-local date.

Validation

  • TZ=UTC yarn test --runInBand src/containers/PersonalSchedule/utils.test.ts (6 tests)
  • yarn test --runInBand (35 suites, 164 tests)
  • yarn check:type
  • yarn lint (0 errors; 4 pre-existing warnings)
  • yarn build

coder13 and others added 9 commits May 29, 2026 17:15
Deploy beta to production
Change shortName for Megaminx from 'Minx' to 'Mega'
…atch assignment to persons actual assignment
Preserve the Worlds extra-assignment behavior alongside the NAC/FMC fixes. Use venue-consistent schedule dates and add reconciliation coverage before production release.
@netlify

netlify Bot commented Jul 11, 2026

Copy link
Copy Markdown

Deploy Preview for competition-groups ready!

Name Link
🔨 Latest commit ecafb30
🔍 Latest deploy log https://app.netlify.com/projects/competition-groups/deploys/6a5292d182dabc0008687342
😎 Deploy Preview https://deploy-preview-84--competition-groups.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
Lighthouse
Lighthouse
1 paths audited
Performance: 67
Accessibility: 84
Best Practices: 100
SEO: 96
PWA: 90
View the detailed breakdown and full score reports

To edit notification comments on pull requests, go to your Netlify project configuration.

@coder13 coder13 merged commit 19aa90f into beta Jul 11, 2026
7 checks passed
@coder13 coder13 deleted the agent/sync-main-into-beta branch July 11, 2026 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants