Merge pull request #2747 from daostack/CW-fix-confliсе

Fix merge conflict
daostack · Oct 15, 2024 · 440575f · 440575f
2 parents 5e01307 + 6ed41ac
commit 440575f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/src/pages/OldCommon/hooks/useCommonMembers.ts b/src/pages/OldCommon/hooks/useCommonMembers.ts
@@ -1,6 +1,5 @@
 import { useCallback, useRef, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { trace } from "firebase/performance";
 import { CommonService, Logger, UserService } from "@/services";
 import { store } from "@/shared/appConfig";
 import { LoadingState } from "@/shared/interfaces";
@@ -11,7 +10,6 @@ import {
   selectUserStates,
 } from "@/store/states";
 import { useDeepCompareEffect } from "react-use";
-import { perf } from "@/shared/utils/firebase";
 
 interface Options {
   commonId?: string;
@@ -113,9 +111,6 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
 
     (async () => {
       try {
-        const useCommonMembersTrace = trace(perf, 'useCommonMembers');
-        useCommonMembersTrace.start();
-
         const cachedUserStates = selectUserStates()(store.getState());
         const hasUsersFromCache = commonMembers.some(
           ({ userId }) => cachedUserStates[userId]?.data,
@@ -188,7 +183,6 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
           };
         });
         dispatch(cacheActions.updateUserStates(fetchedUsers));
-        useCommonMembersTrace.stop();
       } catch (err) {
         Logger.error(err);
         setState((prevState) => ({

diff --git a/src/pages/PrivacyPolicy/index.ts b/src/pages/PrivacyPolicy/index.ts
@@ -1 +1 @@
-export * from "./PrivacyPolicy";
+export * from "./PrivacyPolicy";
diff --git a/...monTabPanels/components/AboutTab/components/CommonProjects/components/Project/Project.tsx b/...monTabPanels/components/AboutTab/components/CommonProjects/components/Project/Project.tsx
@@ -17,13 +17,7 @@ interface ProjectProps {
 }
 
 const Project: FC<ProjectProps> = (props) => {
-  const {
-    title,
-    url,
-    imageURL,
-    imageAlt,
-    tooltipContent,
-  } = props;
+  const { title, url, imageURL, imageAlt, tooltipContent } = props;
 
   const contentEl = (
     <div className={styles.item}>

diff --git a/src/shared/hooks/useCases/useDiscussionMessagesById.ts b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
@@ -1,7 +1,6 @@
 import { useState, useCallback, useEffect, useRef } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { useDeepCompareEffect, useUpdateEffect } from "react-use";
-import { trace } from "firebase/performance";
 import {
   DiscussionMessageService,
   MESSAGES_NUMBER_IN_BATCH,
@@ -21,7 +20,7 @@ import {
   User,
 } from "@/shared/models";
 import { InternalLinkData } from "@/shared/utils";
-import firebase, { perf } from "@/shared/utils/firebase";
+import firebase from "@/shared/utils/firebase";
 import {
   cacheActions,
   selectDiscussionMessagesStateByDiscussionId,
@@ -156,10 +155,7 @@ export const useDiscussionMessagesById = ({
 
   const fetchRepliedMessages = useCallback(
     async (messageId: string, endDate: Date): Promise<void> => {
-      const fetchRepliedMessagesTrace = trace(perf, 'fetchRepliedMessagesTrace');
       try {
-        fetchRepliedMessagesTrace.start();
-
         if (state.data?.find((item) => item.id === messageId)) {
           return Promise.resolve();
         }
@@ -213,9 +209,8 @@ export const useDiscussionMessagesById = ({
             updatedDiscussionMessages: discussionsWithText,
           }),
         );
-        fetchRepliedMessagesTrace.stop();
       } catch(err) {
-        fetchRepliedMessagesTrace.stop();
+        // console.log(err);
       }
     },
     [
@@ -250,9 +245,6 @@ export const useDiscussionMessagesById = ({
     }
 
     try {
-      const fetchDiscussionMessagesTrace = trace(perf, 'fetchDiscussionMessages');
-      fetchDiscussionMessagesTrace.start();
-
       unsubscribeRef.current = DiscussionMessageService.subscribeToDiscussionMessagesByDiscussionId(
         discussionId,
         lastVisible && lastVisible[discussionId],
@@ -322,8 +314,7 @@ export const useDiscussionMessagesById = ({
           setIsBatchLoading(false);
         },
       );
-      fetchDiscussionMessagesTrace.stop();
-    } catch (err) {
+    } catch(err) {
       setIsBatchLoading(false);
     }
   }, [

diff --git a/...ents/Header/components/Breadcrumbs/components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx b/...ents/Header/components/Breadcrumbs/components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx
@@ -67,7 +67,7 @@ const FeedItemBreadcrumbs: FC<FeedItemBreadcrumbsProps> = ({
     });
 
     return () => {
-      unsubscribe();
+      unsubscribe && unsubscribe();
     };
   }, [breadcrumbs.activeItem?.id]);