diff --git a/app/src/components/ui/collaboration/Messages.tsx b/app/src/components/ui/collaboration/Messages.tsx index b0bfae4..69f9669 100644 --- a/app/src/components/ui/collaboration/Messages.tsx +++ b/app/src/components/ui/collaboration/Messages.tsx @@ -3,14 +3,7 @@ import { getAvatarColor } from "../../../modules/collaboration/functions/getAvat import { KebabIcon } from "../../icons/ExportCommonIcons"; interface MessageProps { - val: { - userName: string; - userId: string; - message: string; - creationTime: string; - idEdited: boolean; - modifiedTime: string; - }; + val: Reply; i: number; } @@ -18,22 +11,25 @@ const Messages: React.FC = ({ val, i }) => { const [isEditing, setIsEditing] = useState(false); const [openOptions, setOpenOptions] = useState(false); const currentUser = "1"; + + const UserName = "username"; + return ( <> {isEditing ? ( <>
- {val.userName[0]} + {UserName[0]}
-
{val.userName}
-
{val.creationTime}
+
{UserName}
+
{val.createdAt}
- {val.userId === currentUser && ( + {val.creatorId === currentUser && (
{messages.map((val, i) => ( - + ))}
diff --git a/app/src/types/collaborationTypes.d.ts b/app/src/types/collaborationTypes.d.ts index 26295d5..151ee58 100644 --- a/app/src/types/collaborationTypes.d.ts +++ b/app/src/types/collaborationTypes.d.ts @@ -10,7 +10,7 @@ interface CommentSchema { replies: Reply[]; } -export interface Reply { +interface Reply { replyId: string; creatorId: string; createdAt: string;