fix

goodjoblife · Sep 12, 2023 · 0a8b71e · 0a8b71e
1 parent 8ba7128
commit 0a8b71e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/src/components/ExperienceDetail/hooks/useTrace.js b/src/components/ExperienceDetail/hooks/useTrace.js
@@ -1,10 +1,6 @@
 import { useEffect } from 'react';
 import ReactPixel from 'react-facebook-pixel';
-<<<<<<< HEAD
-import PIXEL_CONTENT_CATEGORY from '../../../constants/pixelConstants';
-=======
 import PIXEL_CONTENT_CATEGORY from 'constants/pixelConstants';
->>>>>>> upstream/dev
 import { useViewExperiences } from 'hooks/viewLog';
 
 const useTrace = experienceId => {

diff --git a/src/components/common/facebook/FacebookWrapper.js b/src/components/common/facebook/FacebookWrapper.js
@@ -7,11 +7,7 @@ const FacebookWrapper = ({ children }) => {
   const container = useRef(null);
 
   useEffect(() => {
-<<<<<<< HEAD
-    if (FB && container) {
-=======
     if (FB && container.current) {
->>>>>>> upstream/dev
       FB.XFBML.parse(container.current);
     }
   });

diff --git a/src/hooks/usePermission.js b/src/hooks/usePermission.js
@@ -1,19 +1,15 @@
 import { useContext, useCallback } from 'react';
 import PermissionContext from 'common/permission-context/PermissionContext';
 import { useToken } from 'hooks/auth';
-<<<<<<< HEAD
 import { getHasSearchPermission } from 'apis/me';
-=======
-import api from '../apis';
 
 const useGetSearchPermission = ({ token }) => {
   return useCallback(async () => {
     if (token === null) return false;
     // Get permission only when token available
-    return await api.me.getHasSearchPermission({ token });
+    return await getHasSearchPermission({ token });
   }, [token]);
 };
->>>>>>> upstream/master
 
 export default () => {
   const token = useToken();