diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab26f74..56c7440 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [main] + branches: [main, develop] pull_request: - branches: [main] + branches: [main, develop] jobs: build: diff --git a/src/components/ImportConflictModal.tsx b/src/components/ImportConflictModal.tsx new file mode 100644 index 0000000..6e98bf7 --- /dev/null +++ b/src/components/ImportConflictModal.tsx @@ -0,0 +1,71 @@ +import { type ImportResult } from '@/lib/stealthLabels'; + +interface ImportConflictModalProps { + conflicts: ImportResult['conflicts']; + onResolve: (action: 'keep-all' | 'overwrite-all') => void; + onClose: () => void; +} + +export function ImportConflictModal({ conflicts, onResolve, onClose }: ImportConflictModalProps) { + return ( +
+ {conflicts.length} label{conflicts.length !== 1 ? 's' : ''} already exist with different + values. +
+ +
+ {c.stealthAddress}
+
+ {c.existingLabel || '(empty)'}
+{c.incomingLabel || '(empty)'}
++ Labels are stored only in this browser. Clear browser data = lose labels. Wraith never + sees them. +
+{error}
} + {/* Search, filter, and toolbar */} + {hasScanned && matchCount > 0 && ( +{importMessage}
} + + {allTags && allTags.length > 0 && ( ++ No matching transfers +
++ Try adjusting your search or filters. +
+@@ -166,6 +357,15 @@ export function StellarReceiveView({