Prepare for release & hander server race condition (#1573)

* bump up version * handle-server-race-condition * added comment
unfoldingWord · Apr 28, 2023 · ddccb35 · ddccb35
1 parent b3cfe08
commit ddccb35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/public/build_number b/public/build_number
@@ -1 +1 @@
-255-e6e5da8
+257-de3d3b0
diff --git a/src/hooks/useContentUpdateProps.js b/src/hooks/useContentUpdateProps.js
@@ -25,9 +25,17 @@ export function useContentUpdateProps({isLoading: _isLoading = false, isSaving =
     if(isSaving & !isLoading) {
       setIsLoading(true);
     }
-    if(!isSaving & isLoading) {
-      checkUpdateStatus();
-      setIsLoading(false);
+    if (!isSaving & isLoading) {
+      // There is a race condition with server returning
+      // a conflict while processing the last commit
+      // the setTimeout tries to make sure we don't get a false conflict
+      setTimeout(() => {
+        checkUpdateStatus().then((status) => {
+          if (status.conflict)
+            checkUpdateStatus();
+        });
+        setIsLoading(false);
+      },1000)
     }
   },[isSaving,isLoading,checkUpdateStatus])