Skip to content

feat(#660): Implement offline-first conflict resolution for concurrent edits #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RUKAYAT-CODER merged 1 commit into from
Jun 28, 2026
Merged

feat(#660): Implement offline-first conflict resolution for concurrent edits #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
import { CacheStatusOverlay, MemoryProfilerOverlay } from '../components/DevTools';
import { RetryErrorBoundary } from '../components/ErrorBoundary/RetryErrorBoundary';
import '../global.css'; // NativeWind CSS
import { AnalyticsProvider, ErrorBoundary, OfflineIndicatorProvider } from '../src/components';

Check failure on line 11 in app/_layout.tsx

View workflow job for this annotation

GitHub Actions / Syntax & Type Check 

Module '"../src/components"' has no exported member 'AnalyticsProvider'.
import AppLifecycleManager from '../src/components/AppLifecycleManager';
import { ConflictResolutionModal } from '../src/components/common/ConflictResolutionModal';
import { KeyboardDelegateProvider } from '../src/components/common/KeyboardDelegateProvider';
import { UpdateNotificationModal } from '../src/components/common/UpdateNotificationModal';
import { useAnalytics } from '../src/hooks';
Expand Down Expand Up @@ -100,7 +101,7 @@
const router = useRouter();

const handleDeepLink = useCallback(
deepLink => {

Check failure on line 104 in app/_layout.tsx

View workflow job for this annotation

GitHub Actions / Syntax & Type Check 

Parameter 'deepLink' implicitly has an 'any' type.
const path = getPathFromDeepLink(deepLink);
if (path) {
router.replace(path);
Expand Down Expand Up @@ -173,6 +174,7 @@
<ScreenTracker />
<ThemeSync />
<UpdateChecker />
<ConflictResolutionModal />
<AppLifecycleManager />
<GestureHandlerRootView style={{ flex: 1 }}>
<OfflineIndicatorProvider>
Expand Down
Loading
Loading