Repository navigation
fix: resolve mangled merge artifacts and add notification summary cards - #931
Merged
Abd-Standard merged 2 commits intoOct 6, 2026
Merged
Conversation
- Fix 11+ mangled files from botched merge (App.tsx, EmptyState.tsx, EventExplorerTable.tsx, EventListPanel.tsx, NotificationTimelineView.tsx, WebhookDeliveryChart.tsx, WebhookFailedTable.tsx, ExportHistorySkeleton.tsx, NotificationSearchPage.tsx, NotificationSearchPage.test.tsx, ExportHistoryPage.tsx, ActivityFeed.tsx, EventExplorerCard.tsx, eventStore.ts, TemplatesPage.tsx, EventExplorerPage.tsx, SyncStatus.test.tsx, notificationExport.test.ts, NotificationSearchBar.test.tsx, ExportHistoryPage.test.tsx) - Deduplicate EmptyState component: keep canonical API with message/title/icon props - Remove duplicate App() definitions, restore single functional component - Fix duplicate contractStatuses prop in EventExplorerCard - Fix duplicate setStatusFilter in eventStore - Add 'channels' to Tab type in MobileNavDrawer - Remove duplicate imports and old API EmptyState calls - Fix test expectations for sort order and async data loading - Add notification delivery summary cards with loading skeleton - Add NotificationSummaryCards, NotificationSummaryPanel, useNotificationSummary - 24 tests passing, all 236 dashboard tests passing, tsc/eslint/prettier clean
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.
Overview
Related Issue
Closes #499
Changes
Verification
How to Test
Checklist
maincargo fmt --allrun (if Rust changes)npm run lintpasses (if TypeScript changes)