Removed duplicate code errors from rebasing

unfoldingWord · Sep 27, 2023 · 11a08cb · 11a08cb
1 parent 43e2fcd
commit 11a08cb
Show file tree

Hide file tree

Showing 3 changed files with 397 additions and 53 deletions.
diff --git a/src/components/ResourceCard.js b/src/components/ResourceCard.js
@@ -70,11 +70,6 @@ export default function ResourceCard({
   }
   const [content, setContent] = useState('')
   const [saved, setSaved] = useState(true)
-  const [fetchConfig, setFetchConfig] = useState({
-    basicReference,
-    config: HTTP_CONFIG,
-    readyToFetch: false,
-  })
   const [isSaving, setIsSaving] = useState(false)
   const [fetchConfig, setFetchConfig] = useState({
     basicReference,
@@ -136,18 +131,6 @@ export default function ResourceCard({
     useUserLocalStorage,
   })
 
-  useEffect(() => {
-    if (cardResourceId) {
-      updateMergeState(
-        cardResourceId,
-        mergeFromMaster,
-        mergeToMaster,
-        mergeFromMasterIntoUserBranch,
-        mergeToMasterFromUserBranch,
-      )
-    }
-  },[cardResourceId, mergeFromMaster, mergeToMaster])
-
   // update fetch configuration if changed
   useEffect(() => {
     const config = usingUserBranch ? RESOURCE_HTTP_CONFIG : HTTP_CONFIG
@@ -470,11 +453,9 @@ export default function ResourceCard({
         selectedQuote={selectedQuote}
         setContent={setContent}
         setCurrentCheck={setCurrentCheck}
+        showSaveChangesPrompt={showSaveChangesPrompt}
         updateTaDetails={updateTaDetails}
         viewMode={viewMode}
-        showSaveChangesPrompt={showSaveChangesPrompt}
-        errorMessage={isEditing ? 'Saving Resource...' : message || errorMessage}
-        markdown={(cardResourceId == 'ta' || cardResourceId == 'tw') && content.length > 0 ? content : markdown}// Adding content value to maintain edit changes even when switching between markdown and html views on tA.
       />
     </Card>
   )

diff --git a/src/components/WorkspaceContainer.js b/src/components/WorkspaceContainer.js
@@ -584,12 +584,7 @@ function WorkspaceContainer() {
       ref: appRef,
     },
     resourceLink: origResourceLink,
-    config: {
-      ...config,
-      server: origServer,
-    },
     wholeBook: true,
-    readyForFetch: !!bookId,
   })
 
   useEffect(() => {