Resolve merge conflicts

frontend/src/hooks/api/serverDetails/index.ts

@@ -0,0 +1 @@
+export { useFetchServerStatus } from './queries'

frontend/src/hooks/api/serverDetails/queries.tsx

@@ -0,0 +1,19 @@
+import {useQuery } from '@tanstack/react-query';
+
+import { apiRequest } from '@app/config/request';
+
+import { ServerStatus } from './types';
+
+// cache key
+const serverStatusKeys = {
+  serverStatus: ['serverStatus'] as const
+};
+
+const fetchServerStatus = async () => {
+  const {data} = await apiRequest.get<ServerStatus>('/api/status');
+  return data;
+};
+
+export const useFetchServerStatus= () => {
+  return useQuery({ queryKey: serverStatusKeys.serverStatus, queryFn: fetchServerStatus });
+}

frontend/src/hooks/api/serverDetails/types.ts

@@ -0,0 +1,5 @@
+export type ServerStatus = {
+  date: string;
+  message: string;
+  emailConfigured: boolean;
+};

frontend/src/hooks/api/users/queries.tsx

@@ -83,8 +83,14 @@ export const useAddUserToWs = () => {
 
 export const useAddUserToOrg = () => {
   const queryClient = useQueryClient();
+  type Response  = {
+    data: {
+      message: string, 
+      completeInviteLink: string | undefined
+    }
+  }
 
-  return useMutation<{}, {}, AddUserToOrgDTO>({
+  return useMutation<Response, {}, AddUserToOrgDTO>({
     mutationFn: (dto) => apiRequest.post(`/api/v1/invite-org/signup`, dto),
     onSuccess: (_, { organizationId }) => {
       queryClient.invalidateQueries(userKeys.getOrgUsers(organizationId));