diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx b/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx index 7446823b..8ed027d1 100644 --- a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx +++ b/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx @@ -33,10 +33,11 @@ export const MessageContainer = ({ messages, status, category, created_at }) => }; const WithTranslatedMessages = ({ messages }) => { + const translated_data = Array.isArray(messages.translated) ? messages.translated : [messages.translated]; return ( <>

{messages.original}

- {messages.translated.map((message, index) => ( + {translated_data.map((message, index) => (

{message}

))} diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/useMessage.js index ebdb1b19..089a72b4 100644 --- a/src-ui/logics/useMessage.js +++ b/src-ui/logics/useMessage.js @@ -32,7 +32,7 @@ export const useMessage = () => { updateSentMessageLog: (payload) => { const data = payload.data; - updateMessageLogsStatus(updateItemById(data.id)); + updateMessageLogsStatus(updateItemById(data.id, data.translation)); }, addSentMessageLog: (payload) => { const data = payload.data; @@ -63,16 +63,17 @@ const generateMessageObject = (data, category) => { status: "ok", messages: { original: data.message, - translated: [], + translated: data.translation, }, }; }; -const updateItemById = (id) => (prev_items) => { +const updateItemById = (id, translated_data) => (prev_items) => { return prev_items.map(item => { if (item.id === id) { item.status = "ok"; + item.messages.translated = translated_data; } return item; });