Merge 357b74da59 into 673f907ea4

fix: Correct merge logic for state updates in sync utility
2025-10-01 15:46:39 +08:00 · 2025-06-27 09:32:44 +08:00 · 2025-02-21 14:09:57 +00:00
1 changed files with 2 additions and 2 deletions
--- a/app/utils/sync.ts
+++ b/app/utils/sync.ts
@ -153,9 +153,9 @@ export function mergeWithUpdate<T extends { lastUpdateTime?: number }>(
  remoteState: T,
 ) {
  const localUpdateTime = localState.lastUpdateTime ?? 0;
-  const remoteUpdateTime = localState.lastUpdateTime ?? 1;
+  const remoteUpdateTime = remoteState.lastUpdateTime ?? 1;

-  if (localUpdateTime < remoteUpdateTime) {
+  if (localUpdateTime > remoteUpdateTime) {
    merge(remoteState, localState);
    return { ...remoteState };
  } else {
Author	SHA1	Message	Date
alex	2384457355	Merge `357b74da59` into `673f907ea4`	2025-06-27 09:32:44 +08:00
michaelia	357b74da59	fix: Correct merge logic for state updates in sync utility	2025-02-21 14:09:57 +00:00