Skip to content

fix(source-control): remove Conflict filter chip and dedupe sync time in header - #151

Merged
ClaudiaFang merged 1 commit into
mainfrom
claude/remove-conflict-filter-and-dedupe-sync-time
Sep 1, 2026
Merged

ClaudiaFang merged 1 commit into
mainfrom
claude/remove-conflict-filter-and-dedupe-sync-time

Conversation

@ClaudiaFang

Copy link
Copy Markdown
Member

Summary

  • Remove the "Conflict" filter chip from the Source Control panel filter row (now All / Needs Sync / Incoming / Synced) — conflicts remain visible via Needs Sync / All.
  • Dedupe the header's sync time display: it previously showed both "Last sync" and "Last checked", which read as duplicated; kept "Last checked" and dropped "Last sync" and its now-unused lastSyncTime plumbing.
  • Removed the now-dead i18n keys (sourceControl.filter.conflict, sourceControl.info.lastSync, sourceControl.info.neverSynced) across en/zh-tw/zh-cn.

Test plan

  • npx eslint . — 0 errors
  • npm run build — passes, incl. Obsidian 1.11.0 compat typecheck
  • npx vitest run — 862/862 passed

… in header

The header showed both "Last sync" and "Last checked" times, which read as
duplicated; keep only "Last checked" and drop the now-unused Conflict filter
chip (conflicts remain reachable via the default Needs Sync / All views).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@sonarqubecloud

sonarqubecloud Bot commented Sep 1, 2026

Copy link
Copy Markdown

@ClaudiaFang
ClaudiaFang merged commit e2015cc into main Sep 1, 2026
14 of 24 checks passed
@ClaudiaFang
ClaudiaFang deleted the claude/remove-conflict-filter-and-dedupe-sync-time branch September 1, 2026 03:47
@ClaudiaFang

Copy link
Copy Markdown
Member Author

🎉 This PR is included in version 1.6.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant