Merge branch 'add-boundary-preset' into lock-asset-feature

ohcnetwork · Aug 30, 2023 · 6d71f33 · 6d71f33
2 parents 31f3ecf + e7f36b5
commit 6d71f33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx
@@ -23,7 +23,7 @@ const RecordMeta = ({ time, user, prefix, className }: Props) => {
   let child = (
     <div className="tooltip">
       <span className="underline">{relativeTime(time)}</span>
-      <span className="tooltip-text flex gap-1 text-xs font-medium tracking-wider">
+      <span className="tooltip-text tooltip-bottom flex -translate-x-1/2 gap-1 text-xs font-medium tracking-wider">
         {formatDateTime(time)}
         {user && (
           <>

diff --git a/src/Components/Notifications/NoticeBoard.tsx b/src/Components/Notifications/NoticeBoard.tsx
@@ -7,7 +7,7 @@ import { formatDateTime } from "../../Utils/utils";
 import { useTranslation } from "react-i18next";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 
-export const NoticeBoard: any = () => {
+export const NoticeBoard = () => {
   const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(true);
   const [data, setData] = useState<any[]>([]);
@@ -16,7 +16,10 @@ export const NoticeBoard: any = () => {
   useEffect(() => {
     setIsLoading(true);
     dispatch(
-      getNotifications({ offset: 0, event: "MESSAGE", medium_sent: "SYSTEM" })
+      getNotifications(
+        { offset: 0, event: "MESSAGE", medium_sent: "SYSTEM" },
+        new Date().getTime().toString()
+      )
     )
       .then((res: any) => {
         if (res && res.data) {

diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
@@ -684,8 +684,8 @@ export const partialUpdateExternalResult = (id: number, params: object) => {
 };
 
 // Notifications
-export const getNotifications = (params: object) => {
-  return fireRequest("getNotifications", [], params);
+export const getNotifications = (params: object, altKey?: string) => {
+  return fireRequest("getNotifications", [], params, {}, altKey);
 };
 
 export const getNotificationData = (pathParam: object) => {