Skip to content

xp leaderboard#5729

Draft
AmarTrebinjac wants to merge 16 commits intomainfrom
ENG-544-leaderboards
Draft

xp leaderboard#5729
AmarTrebinjac wants to merge 16 commits intomainfrom
ENG-544-leaderboards

Conversation

@AmarTrebinjac
Copy link
Contributor

@AmarTrebinjac AmarTrebinjac commented Mar 15, 2026

Changes

Events

Did you introduce any new tracking events?

Experiment

Did you introduce any new experiments?

Manual Testing

Caution

Please make sure existing components are not breaking/affected by this PR

Preview domain

https://eng-544-leaderboards.preview.app.daily.dev

AmarTrebinjac and others added 14 commits February 24, 2026 22:39
- Merge RequestKey enum additions (QuestDashboard + Arena/TopSentimentEntities/ShowcaseAchievements)
- Merge DropdownMenuContent props (scrollableClassName from ENG-544 + variant/scrollFadeRef/sideOffset/collisionPadding from main)

Co-authored-by: Amar Trebinjac <AmarTrebinjac@users.noreply.github.com>
@vercel
Copy link

vercel bot commented Mar 15, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
daily-webapp Ready Ready Preview Mar 16, 2026 0:41am
1 Skipped Deployment
Project Deployment Actions Updated (UTC)
storybook Ignored Ignored Mar 16, 2026 0:41am

Request Review

Base automatically changed from ENG-544 to main March 16, 2026 08:19
@AmarTrebinjac
Copy link
Contributor Author

@claude Please resolve the merge conflicts if they are trivial. If not, alert me instead and I will handle it

@claude
Copy link
Contributor

claude bot commented Mar 16, 2026

Claude finished @AmarTrebinjac's task in 9m 23s —— View job


Merge Conflicts Resolved ✓

  • Check for merge conflicts — found 6 conflicting files
  • Analyze complexity of conflicts
  • Resolve featureManagement.ts — kept questsFeature default as true (PR intent to enable quests)
  • Resolve graphql/quests.ts — took main's version: removed plusOnly field, added QuestRotationUpdate types and QUEST_ROTATION_UPDATE_SUBSCRIPTION
  • Resolve quest/index.ts — kept both exports including QuestLevelProgressCircle (required by UserTopList.tsx)
  • Resolve QuestButton.tsx — took main's version (has inline level progress, QUEST_ROTATION_UPDATE_SUBSCRIPTION, and all logging changes from da917aa)
  • Resolve QuestButton.spec.tsx — took main's version (removes plusOnly from test data, adds subscription invalidation test)
  • Resolve ProfileButton.tsx — took main's version: removed the duplicate nested reputationCounterRef span introduced by the merge, kept the tooltip wrapping ProfilePictureWithIndicator
  • Commit and push — d81e380

The branch is now up to date with main. All 6 conflicts were resolvable — they were primarily caused by the quests (#5721) PR that was merged to main after this branch diverged.

Note: QuestButton.tsx now uses the inline level progress SVG (main's approach) rather than the QuestLevelProgressCircle component. The component is still used by UserTopList.tsx for the XP leaderboard.

Resolve conflicts:
- featureManagement.ts: keep questsFeature default true (PR intent)
- ProfileButton.tsx: take main's tooltip structure, remove duplicate nested span
- quest/index.ts: keep QuestLevelProgressCircle export (used by UserTopList)
- QuestButton.tsx: take main's version (inline level progress, QUEST_ROTATION_UPDATE_SUBSCRIPTION)
- QuestButton.spec.tsx: take main's version (removes plusOnly, adds subscription test)
- quests.ts: take main's version (removes plusOnly, adds QuestRotationUpdate types)

Co-authored-by: Amar Trebinjac <AmarTrebinjac@users.noreply.github.com>
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.

1 participant