Skip to content

feat: surface sync conflicts in status indicator#119

Merged
tomymaritano merged 1 commit into
developfrom
feature/conflict-ui-polish
Mar 11, 2026
Merged

feat: surface sync conflicts in status indicator#119
tomymaritano merged 1 commit into
developfrom
feature/conflict-ui-polish

Conversation

@tomymaritano

Copy link
Copy Markdown
Collaborator

Summary

  • Add conflict state to SyncStatusIndicator with amber warning icon and conflict count
  • Conflicts take priority over idle state so users discover them without navigating to Settings
  • Export ConflictResolver from sync components barrel (index.ts)

Test plan

  • Lint clean
  • Format clean
  • Manual: trigger sync conflict → verify amber triangle icon appears in status indicator
  • Manual: resolve conflict in Settings → verify indicator returns to green idle state

🤖 Generated with Claude Code

Add conflict state to SyncStatusIndicator with amber warning icon
and count. Conflicts now take priority over idle state so users
discover them without navigating to Settings.

Also export ConflictResolver from sync components barrel.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@tomymaritano tomymaritano merged commit 26bccb5 into develop Mar 11, 2026
3 checks passed
@tomymaritano tomymaritano deleted the feature/conflict-ui-polish branch March 11, 2026 13:10
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