Draft
Conversation
- 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>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Author
|
@claude Please resolve the merge conflicts if they are trivial. If not, alert me instead and I will handle it |
Contributor
|
Claude finished @AmarTrebinjac's task in 9m 23s —— View job Merge Conflicts Resolved ✓
The branch is now up to date with
|
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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