diff --git a/frontend/src/App/TopNavbar/index.tsx b/frontend/src/App/TopNavbar/index.tsx index f771421..bfb883d 100644 --- a/frontend/src/App/TopNavbar/index.tsx +++ b/frontend/src/App/TopNavbar/index.tsx @@ -2,6 +2,7 @@ import React, { useState } from 'react'; import TopNavbar, { MenuItem } from 'shared/components/TopNavbar'; import LoggedOutNavbar from 'shared/components/TopNavbar/LoggedOut'; import { ProfileMenu } from 'shared/components/DropdownMenu'; +import polling from 'shared/utils/polling'; import { useHistory, useRouteMatch } from 'react-router'; import { useCurrentUser } from 'App/context'; import { @@ -16,7 +17,6 @@ import cache from 'App/cache'; import NotificationPopup, { NotificationItem } from 'shared/components/NotifcationPopup'; import theme from 'App/ThemeStyles'; import ProjectFinder from './ProjectFinder'; -import polling from 'shared/utils/polling'; // TODO: Move to context based navbar? diff --git a/frontend/src/Projects/index.tsx b/frontend/src/Projects/index.tsx index f6ccb34..3dc8dde 100644 --- a/frontend/src/Projects/index.tsx +++ b/frontend/src/Projects/index.tsx @@ -9,6 +9,7 @@ import { GetProjectsDocument, GetProjectsQuery, } from 'shared/generated/graphql'; +import FormInput from 'shared/components/FormInput'; import { Link } from 'react-router-dom'; import NewProject from 'shared/components/NewProject'; @@ -23,7 +24,6 @@ import NOOP from 'shared/utils/noop'; import theme from 'App/ThemeStyles'; import polling from 'shared/utils/polling'; import { mixin } from '../shared/utils/styles'; -import FormInput from 'shared/components/FormInput'; type CreateTeamData = { name: string }; diff --git a/frontend/src/shared/components/NotifcationPopup/index.tsx b/frontend/src/shared/components/NotifcationPopup/index.tsx index 7f72a61..859f992 100644 --- a/frontend/src/shared/components/NotifcationPopup/index.tsx +++ b/frontend/src/shared/components/NotifcationPopup/index.tsx @@ -366,7 +366,7 @@ const Notification: React.FC = ({ causedBy, createdAt, data, {causedBy ? causedBy.fullname : 'Removed user'} , ); - prefix.push(assigned you to the task "{dataMap.get('TaskName')}"); + prefix.push(assigned you to the task "e;{dataMap.get('TaskName')}"e;); link = `/p/${dataMap.get('ProjectID')}/board/c/${dataMap.get('TaskID')}`; break; case ActionType.DueDateReminder: