remove getRootCommon duplication

daostack · Sep 26, 2023 · cfbc6da · cfbc6da
1 parent 4033e3d
commit cfbc6da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/pages/commonFeed/hooks/useCommonData/index.ts b/src/pages/commonFeed/hooks/useCommonData/index.ts
@@ -5,8 +5,8 @@ import {
   CommonService,
   GovernanceService,
 } from "@/services";
+import { getRootCommon } from "@/shared/hooks/useCases/useFullCommonData";
 import { useCommonSubscription } from "@/shared/hooks/useCases/useFullCommonData/useCommonSubscription";
-import { Common } from "@/shared/models";
 import { State, CombinedState } from "./types";
 import { useGovernanceSubscription } from "./useGovernanceSubscription";
 
@@ -20,17 +20,6 @@ interface Return extends CombinedState {
   resetCommonData: () => void;
 }
 
-const getRootCommon = async (
-  parentCommon?: Common | null,
-  rootCommonId?: string,
-): Promise<Common | null> => {
-  if (parentCommon && parentCommon.id === rootCommonId) {
-    return parentCommon;
-  }
-
-  return rootCommonId ? CommonService.getCommonById(rootCommonId) : null;
-};
-
 export const useCommonData = (userId?: string): Return => {
   const [state, setState] = useState<State>({
     loading: false,

diff --git a/src/shared/hooks/useCases/useFullCommonData/index.ts b/src/shared/hooks/useCases/useFullCommonData/index.ts
@@ -15,10 +15,13 @@ interface Return extends CombinedState {
   resetCommonData: () => void;
 }
 
-const getRootCommon = async (
+export const getRootCommon = async (
   parentCommon?: Common | null,
   rootCommonId?: string,
 ): Promise<Common | null> => {
+  if (!rootCommonId) {
+    return null;
+  }
   if (parentCommon && parentCommon.id === rootCommonId) {
     return parentCommon;
   }