fix: change the way of initializing analytics server on web (#325)

paralect · Oct 1, 2024 · 8713a83 · 8713a83
1 parent 28eb6ce
commit 8713a83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/template/apps/web/src/pages/_app/PageConfig/index.tsx b/template/apps/web/src/pages/_app/PageConfig/index.tsx
@@ -1,4 +1,4 @@
-import React, { FC, Fragment, ReactElement } from 'react';
+import React, { FC, Fragment, ReactElement, useEffect } from 'react';
 import { useRouter } from 'next/router';
 
 import { accountApi } from 'resources/account';
@@ -30,15 +30,15 @@ interface PageConfigProps {
 
 const PageConfig: FC<PageConfigProps> = ({ children }) => {
   const { route, push } = useRouter();
-  const { data: account, isLoading: isAccountLoading } = accountApi.useGet({
-    onSettled: () => {
-      if (!config.MIXPANEL_API_KEY) return;
 
-      analyticsService.init();
+  const { data: account, isLoading: isAccountLoading, isSuccess, isError } = accountApi.useGet();
 
-      analyticsService.setUser(account);
-    },
-  });
+  useEffect(() => {
+    if ((!isSuccess && !isError) || !config.MIXPANEL_API_KEY) return;
+
+    analyticsService.init();
+    analyticsService.setUser(account);
+  }, [isSuccess, isError]);
 
   if (isAccountLoading) return null;
 

diff --git a/template/apps/web/src/resources/account/account.api.ts b/template/apps/web/src/resources/account/account.api.ts
@@ -1,4 +1,4 @@
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery, UseQueryOptions } from '@tanstack/react-query';
 
 import { apiService } from 'services';
 
@@ -56,7 +56,7 @@ export const useResendEmail = <T = ResendEmailParams>() =>
     mutationFn: (data: T) => apiService.post('/account/resend-email', data),
   });
 
-export const useGet = (options = {}) =>
+export const useGet = (options: Partial<UseQueryOptions<User>> = {}) =>
   useQuery<User>({
     queryKey: ['account'],
     queryFn: () => apiService.get('/account'),