diff --git a/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo b/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo
index 01d79aa4..0e7a2eb3 100644
Binary files a/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo and b/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo differ
diff --git a/oarepo_requests/translations/cs/LC_MESSAGES/messages.po b/oarepo_requests/translations/cs/LC_MESSAGES/messages.po
index 89ccdca9..f525554f 100644
--- a/oarepo_requests/translations/cs/LC_MESSAGES/messages.po
+++ b/oarepo_requests/translations/cs/LC_MESSAGES/messages.po
@@ -602,28 +602,28 @@ msgid ""
 msgstr "Tato akce je nevratná. Opravdu si přejete tuto žádost přijmout?"
 
 msgid "requestCreated"
-msgstr "{{creatorLabel}} vytvořil(a) tuto žádost"
+msgstr "vytvořil(a) tuto žádost"
 
 msgid "requestSubmitted"
-msgstr "{{creatorLabel}} odeslal(a) tuto žádost"
+msgstr "odeslal(a) tuto žádost"
 
 msgid "requestCancelled"
-msgstr "{{creatorLabel}} zrušil(a) tuto žádost"
+msgstr "zrušil(a) tuto žádost"
 
 msgid "requestAccepted"
-msgstr "{{creatorLabel}} přijal(a) tuto žádost"
+msgstr "přijal(a) tuto žádost"
 
 msgid "requestDeclined"
-msgstr "{{creatorLabel}} odmítl(a) tuto žádost"
+msgstr "odmítl(a) tuto žádost"
 
 msgid "Request expired."
 msgstr "Žádost vypršela"
 
 msgid "requestDeleted"
-msgstr "{{creatorLabel}} smazal(a) tuto žádost"
+msgstr "smazal(a) tuto žádost"
 
 msgid "requestCommented"
-msgstr "{{creatorLabel}} komentoval(a)"
+msgstr "komentoval(a)"
 
 #: /home/ron/prace/oarepo-requests/oarepo_requests/actions/delete_published_record.py:9
 msgid "Permanently delete"
@@ -668,3 +668,61 @@ msgstr "Nemáte právo smazat záznam."
 #: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:161
 msgid "You do not have permission to update the record."
 msgstr "Nemáte právo zažádat o aktualizaci záznamu."
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:45
+msgid "Edit metadata"
+msgstr "Upravit metadata"
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:69
+msgid "Keep files:"
+msgstr "Ponechat soubory:"
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:71
+msgid ""
+"If you choose yes, the current record's files will be linked to the new "
+"version of the record. Then you will be able to add/remove files in the "
+"form."
+msgstr ""
+"Pokud zvolíte ano, soubory aktuálního záznamu budou propojeny s novou verzí "
+"záznamu. Poté budete moci přidávat/odstraňovat soubory ve formuláři."
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:74
+msgid "No"
+msgstr "Ne"
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:75
+msgid "Yes"
+msgstr "Ano"
+
+msgid "Comment was not submitted successfully. Please try again in a moment."
+msgstr "Komentář nebyl úspěšně odeslán. Zkuste to prosím za chvíli znovu."
+
+msgid "User avatar"
+msgstr "Uživatelský avatar"
+
+msgid "Actions"
+msgstr "Akce"
+
+msgid "Edit"
+msgstr "Upravit"
+
+msgid "Comment was not edited successfully. Please try again in a moment."
+msgstr "Komentář nebyl úspěšně upraven. Zkuste to prosím za chvíli znovu."
+
+msgid "Comment was not deleted successfully. Please try again in a moment."
+msgstr "Komentář nebyl úspěšně smazán. Zkuste to prosím za chvíli znovu."
+
+msgid "Edited"
+msgstr "Upraveno"
+
+msgid "Delete comment"
+msgstr "Smazat komentář"
+
+msgid "Are you sure you want to delete this comment?"
+msgstr "Opravdu chcete tento komentář smazat?"
+
+msgid "deleted comment"
+msgstr "smazal(a) komentář"
+
+msgid "Remaining characters: "
+msgstr "Zbývající znaky: "
diff --git a/oarepo_requests/translations/en/LC_MESSAGES/messages.mo b/oarepo_requests/translations/en/LC_MESSAGES/messages.mo
index 08a6623a..dc66058d 100644
Binary files a/oarepo_requests/translations/en/LC_MESSAGES/messages.mo and b/oarepo_requests/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/oarepo_requests/translations/en/LC_MESSAGES/messages.po b/oarepo_requests/translations/en/LC_MESSAGES/messages.po
index f13e89af..bf69c689 100644
--- a/oarepo_requests/translations/en/LC_MESSAGES/messages.po
+++ b/oarepo_requests/translations/en/LC_MESSAGES/messages.po
@@ -566,28 +566,28 @@ msgid ""
 msgstr ""
 
 msgid "requestCreated"
-msgstr "{{creatorLabel}} created this request"
+msgstr "created this request"
 
 msgid "requestSubmitted"
-msgstr "{{creatorLabel}} submitted this request"
+msgstr "submitted this request"
 
 msgid "requestCancelled"
-msgstr "{{creatorLabel}} canceled this request"
+msgstr "canceled this request"
 
 msgid "requestAccepted"
-msgstr "{{creatorLabel}} accepted this request"
+msgstr "accepted this request"
 
 msgid "requestDeclined"
-msgstr "{{creatorLabel}} declined this request"
+msgstr "declined this request"
 
 msgid "Request expired."
 msgstr "Request expired"
 
 msgid "requestDeleted"
-msgstr "{{creatorLabel}} deleted this request"
+msgstr "deleted this request"
 
 msgid "requestCommented"
-msgstr "{{creatorLabel}} commented"
+msgstr "commented"
 
 #: /home/ron/prace/oarepo-requests/oarepo_requests/actions/delete_published_record.py:9
 msgid "Permanently delete"
@@ -637,5 +637,64 @@ msgstr ""
 msgid "You do not have permission to update the record."
 msgstr ""
 
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:45
+msgid "Edit metadata"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:69
+msgid "Keep files:"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:71
+msgid ""
+"If you choose yes, the current record's files will be linked to the new "
+"version of the record. Then you will be able to add/remove files in the "
+"form."
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:74
+msgid "No"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:75
+msgid "Yes"
+msgstr ""
+
+msgid "Comment was not submitted successfully. Please try again in a moment."
+msgstr ""
+
+msgid "User avatar"
+msgstr ""
+
+msgid "deleted a comment"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Comment was not edited successfully. Please try again in a moment."
+msgstr ""
+
+msgid "Comment was not deleted successfully. Please try again in a moment."
+msgstr ""
+
+msgid "Edited"
+msgstr ""
+
+msgid "Delete comment"
+msgstr ""
+
+msgid "Are you sure you want to delete this comment?"
+msgstr ""
+
+msgid "deleted comment"
+msgstr ""
+
+msgid "Remaining characters: "
+msgstr ""
+
 #~ msgid "No status"
 #~ msgstr ""
diff --git a/oarepo_requests/translations/messages.mo b/oarepo_requests/translations/messages.mo
index 7965e2b4..52ff21d8 100644
Binary files a/oarepo_requests/translations/messages.mo and b/oarepo_requests/translations/messages.mo differ
diff --git a/oarepo_requests/translations/messages.pot b/oarepo_requests/translations/messages.pot
index 6cbadeb1..815dd945 100644
--- a/oarepo_requests/translations/messages.pot
+++ b/oarepo_requests/translations/messages.pot
@@ -8,425 +8,440 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-21 12:37+0100\n"
+"POT-Creation-Date: 2024-11-28 23:02+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.16.0\n"
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:163
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:163
 msgid "Submitted"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:164
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:164
 msgid "Expired"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:165
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:165
 msgid "Accepted"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:166
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:166
 msgid "Declined"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:167
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:167
 msgid "Cancelled"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:169
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:169
 msgid "Request status"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:175
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:175
 msgid "Type"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/delete_published_record.py:30
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/delete_published_record.py:30
 msgid "Permanently delete"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/delete_published_record.py:52
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/delete_published_record.py:52
 msgid "Keep the record"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/generic.py:138
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:28
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/generic.py:138
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:28
 msgid "Submit"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/generic.py:144
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:24
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/generic.py:144
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:24
 msgid "Decline"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/generic.py:150
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:22
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/generic.py:150
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:22
 msgid "Accept"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/publish_draft.py:59
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/publish_draft.py:59
 msgid "Publish"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/actions/publish_draft.py:92
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/actions/publish_draft.py:92
 msgid "Return for correction"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/resolvers/ui.py:333
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/resolvers/ui.py:333
 msgid "System user"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/services/ui_schema.py:159
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/services/ui_schema.py:159
 msgid "status"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:10
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:10
 msgid "Create Request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:11
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:11
 msgid "Open dialog for request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:12
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:12
 msgid "My Requests"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:13
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:13
 msgid "Requests to Approve"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:14
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:14
 msgid "Are you sure?"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:15
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:15
 msgid "Cancel"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:16
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:16
 msgid "OK"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:17
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:17
 msgid "Create request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:18
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:18
 msgid "Submit request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:19
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:19
 msgid "Delete request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:20
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:20
 msgid "Delete"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:21
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:21
 msgid "Accept request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:23
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:23
 msgid "Decline request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:25
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:25
 msgid "Create and submit request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:26
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:26
 msgid "Create and submit"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:27
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:27
 msgid "Error sending request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:29
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:29
 msgid "Save drafted request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:30
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:30
 msgid "Save"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:31
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:31
 msgid "Create"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:32
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:32
 msgid "Creator"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:33
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:33
 msgid "Receiver"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:34
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:34
 msgid "Request type"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:35
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:35
 msgid "Created"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:36
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:36
 msgid "Timeline"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:37
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:37
 msgid "Submit event"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:38
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:38
 msgid "No requests to show"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:39
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:39
 msgid "api.requests"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:40
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:40
 msgid "api.applicable-requests"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:34
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:34
 msgid "Delete draft"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:46
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:46
 msgid "Request deletion of draft"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:63
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:68
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:63
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:68
 msgid "Request draft deletion"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:66
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:66
 msgid "Draft deletion requested"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:81
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:81
 msgid "Click to permanently delete the draft."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:84
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:84
 msgid "Request permission to delete the draft."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:88
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:88
 msgid ""
 "Permission to delete draft requested. You will be notified about the "
 "decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:93
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:93
 msgid ""
 "You have been asked to approve the request to permanently delete the draft. "
 "You can approve or reject the request."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:97
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:97
 msgid "Permission to delete draft (including files) requested. "
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:100
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:100
 msgid "Submit request to get permission to delete the draft."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_draft.py:101
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:101
 msgid "You do not have permission to delete the draft."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:38
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:38
 msgid "Delete record"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:51
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:51
 msgid "Request deletion of published record"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:68
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:73
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:68
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:73
 msgid "Request record deletion"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:71
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:71
 msgid "Record deletion requested"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:86
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:86
 msgid "Click to permanently delete the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:89
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:89
 msgid "Request permission to delete the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:93
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:93
 msgid ""
 "Permission to delete record requested. You will be notified about the "
 "decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:98
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:98
 msgid ""
 "You have been asked to approve the request to permanently delete the record."
 " You can approve or reject the request."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:102
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:102
 msgid "Permission to delete record (including files) requested. "
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:105
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:105
 msgid "Submit request to get permission to delete the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_published_record.py:106
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:106
 msgid "You do not have permission to delete the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:45
-msgid "Edit record"
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:45
+msgid "Edit metadata"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:65
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:65
 msgid "Request re-opening of published record"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:122
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:127
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:122
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:127
 msgid "Request edit access"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:125
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:125
 msgid "Edit access requested"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:140
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:140
 msgid "Click to start editing the metadata of the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:143
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:160
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:143
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:160
 msgid ""
 "Request edit access to the record. You will be notified about the decision "
 "by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:150
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:150
 msgid ""
 "Edit access requested. You will be notified about the decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:155
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:155
 msgid "You have been requested to grant edit access to the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:158
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:158
 msgid "Edit access requested."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:40
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:40
 msgid "New Version"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:61
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:61
 msgid "Request requesting creation of new version of a published record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:69
-msgid "Keep files."
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:69
+msgid "Keep files:"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:70
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:70
 msgid "Keep files in the new version?"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:120
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:125
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:71
+msgid ""
+"If you choose yes, the current record's files will be linked to the new "
+"version of the record. Then you will be able to add/remove files in the "
+"form."
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:74
+msgid "No"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:75
+msgid "Yes"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:123
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:128
 msgid "Request new version access"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:123
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:126
 msgid "New version access requested"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:138
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:141
 msgid "Click to start creating a new version of the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:141
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:144
 msgid ""
 "Request permission to update record (including files). You will be notified "
 "about the decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:148
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:151
 msgid ""
 "Permission to update record (including files) requested. You will be "
 "notified about the decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:153
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:156
 msgid ""
 "You have been asked to approve the request to update the record. You can "
 "approve or reject the request."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:157
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:160
 msgid "Permission to update record (including files) requested. "
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:160
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:163
 msgid "Submit request to get edit access to the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/new_version.py:161
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:164
 msgid "You do not have permission to update the record."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:46
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:128
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:46
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:128
 msgid "Publish draft"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:63
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:63
 msgid "Resource version"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:64
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:64
 msgid "Write down the version (first, second…)."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:79
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:79
 msgid "Request publishing of a draft"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:130
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:135
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:130
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:135
 msgid "Submit for review"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:133
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:133
 msgid "Submitted for review"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:148
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:148
 msgid ""
 "Click to immediately publish the draft. The draft will be a subject to "
 "embargo as requested in the side panel. Note: The action is irreversible."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:155
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:155
 msgid ""
 "By submitting the draft for review you are requesting the publication of the"
 " draft. The draft will become locked and no further changes will be possible"
@@ -434,33 +449,33 @@ msgid ""
 "decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:163
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:163
 msgid ""
 "The draft has been submitted for review. It is now locked and no further "
 "changes are possible. You will be notified about the decision by email."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:169
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:169
 msgid ""
 "The draft has been submitted for review. You can now accept or decline the "
 "request."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:173
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:173
 msgid "The draft has been submitted for review."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:176
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:176
 msgid ""
 "Submit for review. After submitting the draft for review, it will be locked "
 "and no further modifications will be possible."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:180
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:180
 msgid "Request not yet submitted."
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/ui/templates/semantic-ui/oarepo_requests_ui/RequestDetail.jinja:3
+#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/ui/templates/semantic-ui/oarepo_requests_ui/RequestDetail.jinja:3
 msgid "Request"
 msgstr ""
 
@@ -470,10 +485,13 @@ msgstr ""
 msgid "Request not created successfully. Please try again in a moment."
 msgstr ""
 
-msgid "Your comment here..."
+msgid "Comment was not submitted successfully. Please try again in a moment."
+msgstr ""
+
+msgid "Leave comment"
 msgstr ""
 
-msgid "Comment"
+msgid "Remaining characters: "
 msgstr ""
 
 msgid "Request details"
@@ -500,6 +518,36 @@ msgstr ""
 msgid "Error while fetching timeline events"
 msgstr ""
 
+msgid "User avatar"
+msgstr ""
+
+msgid "deleted comment"
+msgstr ""
+
+msgid "requestCommented"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Comment was not edited successfully. Please try again in a moment."
+msgstr ""
+
+msgid "Comment was not deleted successfully. Please try again in a moment."
+msgstr ""
+
+msgid "Edited"
+msgstr ""
+
+msgid "Delete comment"
+msgstr ""
+
+msgid "Are you sure you want to delete this comment?"
+msgstr ""
+
 msgid ""
 "Are you sure you want to proceed? Once the action is completed, it will not "
 "be possible to undo it."
@@ -517,12 +565,6 @@ msgid ""
 "This action is irreversible. Are you sure you wish to accept this request?"
 msgstr ""
 
-msgid "Add comment"
-msgstr ""
-
-msgid "optional"
-msgstr ""
-
 msgid ""
 "It is highly recommended to provide an explanation for the rejection of the "
 "request. Note that it is always possible to provide explanation later on the"
@@ -564,9 +606,6 @@ msgstr ""
 msgid "requestDeleted"
 msgstr ""
 
-msgid "requestCommented"
-msgstr ""
-
 msgid "Error loading request types"
 msgstr ""
 
@@ -576,12 +615,6 @@ msgstr ""
 msgid "Record has validation errors. Redirecting to form..."
 msgstr ""
 
-msgid "Comment was not submitted successfully."
-msgstr ""
-
-msgid "Leave comment"
-msgstr ""
-
 msgid "Back to requests"
 msgstr ""
 
@@ -590,9 +623,3 @@ msgstr ""
 
 msgid "to top"
 msgstr ""
-
-msgid "commented"
-msgstr ""
-
-msgid "icon"
-msgstr ""
diff --git a/oarepo_requests/types/edit_record.py b/oarepo_requests/types/edit_record.py
index ce48ca82..200669bb 100644
--- a/oarepo_requests/types/edit_record.py
+++ b/oarepo_requests/types/edit_record.py
@@ -42,7 +42,7 @@ class EditPublishedRecordRequestType(NonDuplicableOARepoRequestType):
     """
 
     type_id = "edit_published_record"
-    name = _("Edit record")
+    name = _("Edit metadata")
     payload_schema = {
         "draft_record.links.self": ma.fields.Str(
             attribute="draft_record:links:self",
diff --git a/oarepo_requests/types/new_version.py b/oarepo_requests/types/new_version.py
index 6a5b2d3d..c818a88d 100644
--- a/oarepo_requests/types/new_version.py
+++ b/oarepo_requests/types/new_version.py
@@ -66,10 +66,13 @@ def available_actions(cls) -> dict[str, type[RequestAction]]:
         "field": "keep_files",
         "ui_widget": "BooleanCheckbox",
         "props": {
-            "label": _("Keep files."),
+            "label": _("Keep files:"),
             "placeholder": _("Keep files in the new version?"),
-            "required": False,
-            "default": True,
+            "description": _(
+                "If you choose yes, the current record's files will be linked to the new version of the record. Then you will be able to add/remove files in the form."
+            ),
+            "falseLabel": _("No"),
+            "trueLabel": _("Yes"),
         },
     }
 
diff --git a/oarepo_requests/ui/resource.py b/oarepo_requests/ui/resource.py
index 948d5b91..087cfdbc 100644
--- a/oarepo_requests/ui/resource.py
+++ b/oarepo_requests/ui/resource.py
@@ -206,6 +206,7 @@ def not_found(self, error: Exception, *args: Any, **kwargs: Any) -> Response:
                 default_macro="NotFound",
             ),
             pid=getattr(error, "pid_value", None) or getattr(error, "pid", None),
+            error=error,
         )
 
     def permission_denied(
@@ -219,4 +220,5 @@ def permission_denied(
                 default_macro="PermissionDenied",
             ),
             pid=getattr(error, "pid_value", None) or getattr(error, "pid", None),
+            error=error,
         )
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/actions/RequestActionButton.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/actions/RequestActionButton.jsx
index 087f8f7b..a4febd72 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/actions/RequestActionButton.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/actions/RequestActionButton.jsx
@@ -28,9 +28,14 @@ export const RequestActionButton = ({
     formik,
     modalControl,
   });
+
   const handleClick = () => {
     if (requireConfirmation) {
-      confirmAction(() => requestAction(), requestActionName, extraData);
+      confirmAction(
+        (value) => requestAction(value),
+        requestActionName,
+        extraData
+      );
     } else {
       requestAction();
     }
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/CommentSubmitForm.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/CommentSubmitForm.jsx
new file mode 100644
index 00000000..76f0e7be
--- /dev/null
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/CommentSubmitForm.jsx
@@ -0,0 +1,79 @@
+import React, { useState } from "react";
+import PropTypes from "prop-types";
+import { i18next } from "@translations/oarepo_requests_ui/i18next";
+import { Button, Message, Form } from "semantic-ui-react";
+import { RequestCommentInput } from "@js/oarepo_requests_common";
+
+export const CommentSubmitForm = ({ commentSubmitMutation }) => {
+  const {
+    mutate: submitComment,
+    isLoading,
+    isError,
+    reset: resetSendCommentMutation,
+  } = commentSubmitMutation;
+
+  const [comment, setComment] = useState({
+    payload: { content: "", format: "html" },
+  });
+
+  const handleCommentChange = (event, value) => {
+    setComment({
+      payload: {
+        content: value,
+        format: "html",
+      },
+    });
+  };
+
+  const handleFormReset = () => {
+    setComment({
+      payload: { content: "", format: "html" },
+    });
+  };
+
+  const handleCommentSubmit = () => {
+    submitComment(comment, {
+      onSuccess: () => {
+        handleFormReset();
+      },
+      onError: () => {
+        setTimeout(() => resetSendCommentMutation(), 3000);
+      },
+    });
+  };
+
+  return (
+    <Form className="ui form">
+      <RequestCommentInput
+        comment={comment.payload.content}
+        handleChange={handleCommentChange}
+      />
+      {isError && (
+        <Message negative>
+          <Message.Header>
+            {i18next.t(
+              "Comment was not submitted successfully. Please try again in a moment."
+            )}
+          </Message.Header>
+        </Message>
+      )}
+      <Button
+        size="tiny"
+        floated="right"
+        primary
+        icon="send"
+        type="button"
+        className="rel-mt-1"
+        labelPosition="left"
+        loading={isLoading}
+        disabled={isLoading || !comment.payload.content}
+        content={i18next.t("Leave comment")}
+        onClick={handleCommentSubmit}
+      />
+    </Form>
+  );
+};
+
+CommentSubmitForm.propTypes = {
+  commentSubmitMutation: PropTypes.object.isRequired,
+};
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/DefaultView.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/DefaultView.jsx
index 7b51b08b..ebf30086 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/DefaultView.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/DefaultView.jsx
@@ -1,11 +1,20 @@
 import React from "react";
 import PropTypes from "prop-types";
+import { useFormikContext, getIn } from "formik";
 
-export const DefaultView = ({ props, value }) => {
-  return <span {...props}>{value}</span>;
+export const DefaultView = ({ fieldPath, label }) => {
+  const { values } = useFormikContext();
+  const value = getIn(values, fieldPath, "");
+  return value ? (
+    <span>
+      <strong>{label}</strong>: <span>{value}</span>
+    </span>
+  ) : null;
 };
 
 DefaultView.propTypes = {
-  props: PropTypes.object,
-  value: PropTypes.string,
+  fieldPath: PropTypes.string,
+  label: PropTypes.string,
 };
+
+export default DefaultView;
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/ReadOnlyCustomFields.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/ReadOnlyCustomFields.jsx
deleted file mode 100644
index 0b8e91e4..00000000
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/ReadOnlyCustomFields.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React, { useEffect, useState } from "react";
-import PropTypes from "prop-types";
-import { loadWidgetsFromConfig } from "@js/oarepo_requests_common";
-import _has from "lodash/has";
-import _zip from "lodash/zip";
-
-export const ReadOnlyCustomFields = ({
-  config,
-  data,
-  fieldPathPrefix,
-  templateLoaders,
-  includesPaths = (fields) => fields.map((field) => field.key),
-}) => {
-  const [sections, setSections] = useState([]);
-
-  const loadCustomFieldsWidgets = async () => {
-    const sections = [];
-    for (const sectionCfg of config) {
-      const usedFields = sectionCfg.fields.filter((field) =>
-        _has(data, field.field)
-      );
-      const Widgets = await loadWidgetsFromConfig({
-        templateLoaders: templateLoaders,
-        fieldPathPrefix: fieldPathPrefix,
-        fields: usedFields,
-      });
-      const widgetsWithConfig = _zip(Widgets, usedFields);
-      const filteredFieldsWithData = widgetsWithConfig.map(
-        ([Widget, fieldConfig]) => {
-          const value = data[fieldConfig.field];
-          return (
-            <Widget
-              key={fieldConfig.field}
-              props={fieldConfig.view_widget_props}
-              value={value}
-            />
-          );
-        }
-      );
-      sections.push({ ...sectionCfg, fields: filteredFieldsWithData });
-    }
-    return sections;
-  };
-
-  useEffect(() => {
-    loadCustomFieldsWidgets()
-      .then((sections) => {
-        sections = sections.map((sectionCfg) => {
-          const paths = includesPaths(sectionCfg.fields, fieldPathPrefix);
-          return { ...sectionCfg, paths };
-        });
-        setSections(sections);
-      })
-      .catch((error) => {
-        console.error("Couldn't load custom fields widgets.", error);
-      });
-  }, [config, fieldPathPrefix, includesPaths, templateLoaders]);
-
-  return (
-    <>
-      {sections.map(({ section, fields }) => (
-        <React.Fragment key={section}>{fields}</React.Fragment>
-      ))}
-    </>
-  );
-};
-
-ReadOnlyCustomFields.propTypes = {
-  config: PropTypes.arrayOf(
-    PropTypes.shape({
-      section: PropTypes.string.isRequired,
-      fields: PropTypes.arrayOf(
-        PropTypes.shape({
-          field: PropTypes.string.isRequired,
-          view_widget: PropTypes.string,
-          view_widget_props: PropTypes.object,
-        })
-      ),
-    })
-  ),
-  data: PropTypes.object.isRequired, // { field1: value1, field2: value2, ...} just like Formik initialValues
-  templateLoaders: PropTypes.array.isRequired,
-  fieldPathPrefix: PropTypes.string,
-  includesPaths: PropTypes.func,
-};
-
-ReadOnlyCustomFields.defaultProps = {
-  includesPaths: (fields) => fields.map((field) => field.key),
-};
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCommentInput.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCommentInput.jsx
index 1f846ce6..d1ee5fb5 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCommentInput.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCommentInput.jsx
@@ -1,46 +1,64 @@
 import React from "react";
-import { i18next } from "@translations/oarepo_requests_ui/i18next";
-import { FormField } from "semantic-ui-react";
-import { RichInputField, FieldLabel, RichEditor } from "react-invenio-forms";
-import { useFormikContext } from "formik";
+import { RichEditor } from "react-invenio-forms";
 import sanitizeHtml from "sanitize-html";
 import PropTypes from "prop-types";
+import { useQuery } from "@tanstack/react-query";
+import { httpApplicationJson } from "@js/oarepo_ui";
 
-export const RequestCommentInput = ({ fieldPath, label }) => {
-  const { values, setFieldValue, setFieldTouched } = useFormikContext();
+export const RequestCommentInput = ({
+  comment,
+  handleChange,
+  initialValue,
+}) => {
+  // when focused move the cursor at the end of any existing content
+  const handleFocus = (event, editor) => {
+    editor.selection.select(editor.getBody(), true);
+    editor.selection.collapse(false);
+  };
+
+  // TODO: there is no appropriate URL to call here. I think this one is the safest, because we know it exists and it does
+  // not rely on external library (like those that contain /me that are from dashboard). To be discussed how to handle this appropriately.
+  // maybe some link that lives in oarepo ui and that can universaly provide allowed tags and attributes
+  const { data } = useQuery(
+    ["allowedHtmlTagsAttrs"],
+    () => httpApplicationJson.get(`/requests/configs/publish_draft`),
+    {
+      refetchOnWindowFocus: false,
+      staleTime: Infinity,
+    }
+  );
+
+  const allowedHtmlAttrs = data?.data?.allowedHtmlAttrs;
+  const allowedHtmlTags = data?.data?.allowedHtmlTags;
   return (
-    <FormField>
-      <RichInputField
-        fieldPath={fieldPath}
-        label={
-          <FieldLabel htmlFor={fieldPath} label={label} className="rel-mb-25" />
-        }
-        optimized="true"
-        placeholder={i18next.t("Your comment here...")}
-        editor={
-          <RichEditor
-            initialValue={values?.payload?.content}
-            inputValue={() => values?.payload?.content}
-            optimized
-            editorConfig={{ auto_focus: true, min_height: 130 }}
-            onBlur={(event, editor) => {
-              const cleanedContent = sanitizeHtml(editor.getContent());
-              setFieldValue(fieldPath, cleanedContent);
-              setFieldTouched(fieldPath, true);
-            }}
-          />
-        }
-      />
-    </FormField>
+    <RichEditor
+      initialValue={initialValue}
+      inputValue={comment}
+      editorConfig={{
+        auto_focus: true,
+        min_height: 100,
+        toolbar:
+          "blocks | bold italic | bullist numlist | outdent indent | undo redo",
+      }}
+      onEditorChange={(event, editor) => {
+        const cleanedContent = sanitizeHtml(editor.getContent(), {
+          allowedTags: allowedHtmlTags,
+          allowedAttributes: allowedHtmlAttrs,
+        });
+
+        handleChange(event, cleanedContent);
+      }}
+      onFocus={handleFocus}
+    />
   );
 };
 
 RequestCommentInput.propTypes = {
-  fieldPath: PropTypes.string,
-  label: PropTypes.string,
+  comment: PropTypes.string,
+  handleChange: PropTypes.func,
+  initialValue: PropTypes.string,
 };
 
 RequestCommentInput.defaultProps = {
-  fieldPath: "payload.content",
-  label: i18next.t("Comment"),
+  initialValue: "",
 };
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCustomFields.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCustomFields.jsx
index 3ebfe046..d598b8ab 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCustomFields.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCustomFields.jsx
@@ -1,11 +1,7 @@
 import React from "react";
-import { Grid, List, Form, Divider } from "semantic-ui-react";
+import { Grid, Form, Divider } from "semantic-ui-react";
 import { CustomFields } from "react-invenio-forms";
-import {
-  ReadOnlyCustomFields,
-  REQUEST_TYPE,
-  REQUEST_MODAL_TYPE,
-} from "@js/oarepo_requests_common";
+import { REQUEST_TYPE, REQUEST_MODAL_TYPE } from "@js/oarepo_requests_common";
 import PropTypes from "prop-types";
 
 export const RequestCustomFields = ({
@@ -36,6 +32,21 @@ export const RequestCustomFields = ({
     })
     .flat();
 
+  const readOnlyCustomFieldsConfig = customFields?.ui.map((section) => {
+    const { fields } = section;
+    const fieldsWithReadOnlyWidget = fields.map((field) => {
+      const { read_only_ui_widget } = field;
+      return {
+        ...field,
+        ui_widget: read_only_ui_widget,
+      };
+    });
+    return {
+      ...section,
+      fields: fieldsWithReadOnlyWidget,
+    };
+  });
+
   const renderReadOnlyData =
     customFieldsType === REQUEST_MODAL_TYPE.READ_ONLY &&
     Object.keys(request?.payload || {}).some((key) =>
@@ -46,41 +57,35 @@ export const RequestCustomFields = ({
     <Grid.Row>
       <Grid.Column width={columnWidth}>
         {renderSubmitForm && !request.is_closed && (
-          <Form className="requests-form-cf">
+          <Form>
+            <div className="requests-form-cf">
+              <CustomFields
+                config={customFields?.ui}
+                templateLoaders={[
+                  (widget) => import(`@templates/custom_fields/${widget}.js`),
+                  () => import(`react-invenio-forms`),
+                ]}
+                fieldPathPrefix="payload"
+              />
+              <Divider hidden />
+            </div>
+          </Form>
+        )}
+
+        {renderReadOnlyData && (
+          <div className="requests-form-cf">
             <CustomFields
-              config={customFields?.ui}
+              config={readOnlyCustomFieldsConfig}
               templateLoaders={[
                 (widget) => import(`@templates/custom_fields/${widget}.js`),
-                () => import(`react-invenio-forms`),
+                (widget) =>
+                  import(
+                    `@js/oarepo_requests_common/components/DefaultView.jsx`
+                  ),
               ]}
               fieldPathPrefix="payload"
             />
-            <Divider hidden />
-          </Form>
-        )}
-
-        {renderReadOnlyData && (
-          <List relaxed>
-            {Object.keys(request.payload).map((key) => (
-              <List.Item key={key}>
-                <List.Content>
-                  <List.Header>{key}</List.Header>
-                  <ReadOnlyCustomFields
-                    className="requests-form-cf"
-                    config={customFields?.ui}
-                    data={{ [key]: request.payload[key] }}
-                    templateLoaders={[
-                      (widget) =>
-                        import(
-                          `@js/oarepo_requests_common/widgets/${widget}.jsx`
-                        ),
-                      () => import(`react-invenio-forms`),
-                    ]}
-                  />
-                </List.Content>
-              </List.Item>
-            ))}
-          </List>
+          </div>
         )}
       </Grid.Column>
     </Grid.Row>
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModal.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModal.jsx
index dd61d815..a7414e2c 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModal.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModal.jsx
@@ -58,7 +58,7 @@ export const RequestModal = ({
           {({ confirmDialogProps }) => (
             <React.Fragment>
               <Modal
-                className="requests-request-modal"
+                className="requests-request-modal form-modal"
                 as={Dimmer.Dimmable}
                 blurring
                 onClose={onClose}
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContent.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContent.jsx
index 9df19ab8..7305aa20 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContent.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContent.jsx
@@ -1,13 +1,13 @@
 import React from "react";
 import PropTypes from "prop-types";
 import { Grid } from "semantic-ui-react";
-import {} from "react-invenio-forms";
 import {
   SideRequestInfo,
   RequestCustomFields,
   Timeline,
 } from "@js/oarepo_requests_common";
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
+import sanitizeHtml from "sanitize-html";
 
 /**
  * @typedef {import("../../record-requests/types").Request} Request
@@ -20,16 +20,24 @@ export const RequestModalContent = ({
   request,
   customFields,
   modalActions,
+  allowedHtmlAttrs,
+  allowedHtmlTags,
 }) => {
   /** @type {{requests: Request[], setRequests: (requests: Request[]) => void}} */
 
   const description = request?.stateful_description || request?.description;
+
+  const sanitizedDescription = sanitizeHtml(description, {
+    allowedTags: allowedHtmlTags,
+    allowedAttributes: allowedHtmlAttrs,
+  });
+
   return (
     <Grid doubling stackable>
       <Grid.Row>
         {description && (
           <Grid.Column as="p" id="request-modal-desc">
-            {description}{" "}
+            <span dangerouslySetInnerHTML={{ __html: sanitizedDescription }} />{" "}
             <a
               href={request?.links?.self_html}
               target="_blank"
@@ -63,4 +71,6 @@ RequestModalContent.propTypes = {
   request: PropTypes.object.isRequired,
   customFields: PropTypes.object,
   modalActions: PropTypes.array,
+  allowedHtmlAttrs: PropTypes.object,
+  allowedHtmlTags: PropTypes.array,
 };
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContentAndActions.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContentAndActions.jsx
index 61481879..d198adda 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContentAndActions.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContentAndActions.jsx
@@ -12,7 +12,6 @@ import { useFormikContext } from "formik";
 import { mapLinksToActions } from "@js/oarepo_requests_common";
 import PropTypes from "prop-types";
 import { useQuery, useIsMutating } from "@tanstack/react-query";
-// TODO: remove when /configs starts using vnd zenodo accept header
 import { httpApplicationJson } from "@js/oarepo_ui";
 
 export const RequestModalContentAndActions = ({
@@ -43,6 +42,9 @@ export const RequestModalContentAndActions = ({
     }
   );
   const customFields = data?.data?.custom_fields;
+  const allowedHtmlAttrs = data?.data?.allowedHtmlAttrs;
+  const allowedHtmlTags = data?.data?.allowedHtmlTags;
+
   const requestTypeProperties = data?.data?.request_type_properties;
   const isMutating = useIsMutating();
   const modalActions = mapLinksToActions(
@@ -75,6 +77,8 @@ export const RequestModalContentAndActions = ({
           onCompletedAction={onSubmit}
           customFields={customFields}
           modalActions={modalActions}
+          allowedHtmlAttrs={allowedHtmlAttrs}
+          allowedHtmlTags={allowedHtmlTags}
         />
       </Modal.Content>
       <Modal.Actions>
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/Timeline.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/Timeline.jsx
index adef8d0c..93fcfb5f 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/Timeline.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/Timeline.jsx
@@ -1,22 +1,21 @@
 import React, { useState } from "react";
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
 import { Message, Feed, Dimmer, Loader, Pagination } from "semantic-ui-react";
-import {
-  EventSubmitForm,
-  TimelineEvent,
-} from "@js/oarepo_requests_detail/components";
+import { CommentSubmitForm, TimelineEvent } from "@js/oarepo_requests_common";
 import PropTypes from "prop-types";
-import { httpVnd } from "@js/oarepo_ui";
-import { useQuery } from "@tanstack/react-query";
+import { httpApplicationJson } from "@js/oarepo_ui";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 
 export const Timeline = ({ request, timelinePageSize }) => {
+  const queryClient = useQueryClient();
+
   const [page, setPage] = useState(1);
   const { data, error, isLoading, refetch } = useQuery(
     ["requestEvents", request.id, page],
     () =>
       // q=!(type:T) to eliminate system created events
-      httpVnd.get(
-        `${request.links?.timeline}?q=!(type:T)&page=${page}&size=${timelinePageSize}&sort=newest`
+      httpApplicationJson.get(
+        `${request.links?.timeline}?q=!(type:T)&page=${page}&size=${timelinePageSize}&sort=newest&expand=1`
       ),
     {
       enabled: !!request.links?.timeline,
@@ -26,6 +25,41 @@ export const Timeline = ({ request, timelinePageSize }) => {
       refetchInterval: 10000,
     }
   );
+
+  const commentSubmitMutation = useMutation(
+    (values) =>
+      httpApplicationJson.post(request.links?.comments + "?expand=1", values),
+    {
+      onSuccess: (response) => {
+        if (response.status === 201) {
+          queryClient.setQueryData(
+            ["requestEvents", request.id, page],
+            (oldData) => {
+              if (!oldData) return;
+              // a bit ugly, but it is a limitation of react query when data you recieve is nested
+              const newHits = [...oldData.data.hits.hits];
+              if (oldData.data.hits.total + 1 > timelinePageSize) {
+                newHits.pop();
+              }
+              return {
+                ...oldData,
+                data: {
+                  ...oldData.data,
+                  hits: {
+                    ...oldData.data.hits,
+                    total: oldData.data.hits.total + 1,
+                    hits: [response.data, ...newHits],
+                  },
+                },
+              };
+            }
+          );
+        }
+        setTimeout(() => refetch(), 1000);
+      },
+    }
+  );
+
   const handlePageChange = (activePage) => {
     if (activePage === page) return;
     setPage(activePage);
@@ -40,12 +74,7 @@ export const Timeline = ({ request, timelinePageSize }) => {
         </Loader>
       </Dimmer>
       <div className="rel-mb-5">
-        <EventSubmitForm
-          request={request}
-          refetch={refetch}
-          page={page}
-          timelinePageSize={timelinePageSize}
-        />
+        <CommentSubmitForm commentSubmitMutation={commentSubmitMutation} />
       </div>
       {error && (
         <Message negative>
@@ -57,7 +86,13 @@ export const Timeline = ({ request, timelinePageSize }) => {
       {events?.length > 0 && (
         <Feed>
           {events.map((event) => (
-            <TimelineEvent key={event.id} event={event} />
+            <TimelineEvent
+              key={event.id}
+              event={event}
+              // necessary for query invalidation and setting state of the request events query
+              requestId={request.id}
+              page={page}
+            />
           ))}
         </Feed>
       )}
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineActionEvent.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineActionEvent.jsx
new file mode 100644
index 00000000..2ecdb560
--- /dev/null
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineActionEvent.jsx
@@ -0,0 +1,49 @@
+import React from "react";
+import {
+  getRequestStatusIcon,
+  getFeedMessage,
+} from "@js/oarepo_requests_common";
+import PropTypes from "prop-types";
+import { Icon, Feed } from "semantic-ui-react";
+import { i18next } from "@translations/oarepo_requests_ui/i18next";
+import { toRelativeTime, Image } from "react-invenio-forms";
+
+export const TimelineActionEvent = ({ event }) => {
+  const createdBy = event?.expanded?.created_by;
+  const creatorLabel = createdBy?.username || createdBy?.email;
+  const eventIcon = getRequestStatusIcon(event.payload.event);
+  const feedMessage = getFeedMessage(event.payload.event);
+
+  return (
+    <div className="requests action-event-container">
+      <Feed.Event>
+        <div className="action-event-vertical-line"></div>
+        <Feed.Content>
+          <Feed.Summary className="flex align-items-center">
+            <div className="flex align-items-center justify-center">
+              <Icon
+                className="requests action-event-icon"
+                name={eventIcon?.name}
+                color={eventIcon?.color}
+              />
+            </div>
+            <div className="requests action-event-avatar inline-block">
+              <Image
+                src={createdBy?.links?.avatar}
+                alt={i18next.t("User avatar")}
+              />
+            </div>
+            <b className="ml-5">{creatorLabel}</b>
+            <Feed.Date>
+              {feedMessage} {toRelativeTime(event.updated, i18next.language)}
+            </Feed.Date>
+          </Feed.Summary>
+        </Feed.Content>
+      </Feed.Event>
+    </div>
+  );
+};
+
+TimelineActionEvent.propTypes = {
+  event: PropTypes.object,
+};
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineCommentEvent.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineCommentEvent.jsx
new file mode 100644
index 00000000..dadf67da
--- /dev/null
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineCommentEvent.jsx
@@ -0,0 +1,291 @@
+import React, { useState } from "react";
+import { i18next } from "@translations/oarepo_requests_ui/i18next";
+import { Feed, Dropdown, Button, Confirm, Message } from "semantic-ui-react";
+import _has from "lodash/has";
+import sanitizeHtml from "sanitize-html";
+import PropTypes from "prop-types";
+import { toRelativeTime, Image } from "react-invenio-forms";
+import {
+  ConfirmationModalCancelButton,
+  ConfirmationModalConfirmButton,
+  RequestCommentInput,
+} from "@js/oarepo_requests_common";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { httpApplicationJson } from "@js/oarepo_ui";
+
+const TimelineCommentEvent = ({ event, requestId, page }) => {
+  const createdBy = event?.expanded?.created_by;
+  const creatorLabel = createdBy?.username || createdBy?.email;
+  const [editMode, setEditMode] = useState(false);
+  const [deleteMode, setDeleteMode] = useState(false);
+  const [comment, setComment] = useState(event.payload.content);
+  const toggleEditMode = () => setEditMode(!editMode);
+  const toggleDeleteMode = () => setDeleteMode(!deleteMode);
+  const canUpdate = event?.permissions?.can_update_comment;
+  const canDelete = event?.permissions?.can_delete_comment;
+  const commentHasBeenEdited = event?.revision_id > 1 && event?.payload;
+  const queryClient = useQueryClient();
+  const {
+    mutate: editComment,
+    isLoading: editLoading,
+    isError: editError,
+    reset: resetEditCommentMutation,
+  } = useMutation(({ url, values }) => httpApplicationJson.put(url, values), {
+    onSuccess: (response) => {
+      queryClient.setQueryData(
+        ["requestEvents", requestId, page],
+        (oldData) => {
+          if (!oldData) return;
+          // a bit ugly, but it is a limitation of react query when data you recieve is nested
+          const newHits = [...oldData.data.hits.hits];
+          const commentIndex = newHits.findIndex(
+            (comment) => comment.id === response.data.id
+          );
+          newHits[commentIndex] = response.data;
+
+          return {
+            ...oldData,
+            data: {
+              ...oldData.data,
+              hits: {
+                ...oldData.data.hits,
+                hits: newHits,
+              },
+            },
+          };
+        }
+      );
+      setTimeout(
+        () => queryClient.invalidateQueries(["requestEvents", requestId, page]),
+        1000
+      );
+    },
+  });
+
+  const {
+    mutate: deleteComment,
+    isLoading: deleteLoading,
+    isError: deleteError,
+    reset: resetDeleteCommentMutation,
+  } = useMutation(({ url }) => httpApplicationJson.delete(url), {
+    onSuccess: (response, variables) => {
+      const { eventId } = variables;
+      queryClient.setQueryData(
+        ["requestEvents", requestId, page],
+        (oldData) => {
+          if (!oldData) return;
+          // a bit ugly, but it is a limitation of react query when data you recieve is nested
+          const newHits = [...oldData.data.hits.hits];
+          const indexCommentToDelete = newHits.findIndex(
+            (comment) => comment.id === eventId
+          );
+
+          const currentComment = newHits[indexCommentToDelete];
+
+          const deletionPayload = {
+            content: i18next.t("deleted comment"),
+            event: "comment_deleted",
+            format: "html",
+          };
+
+          newHits[indexCommentToDelete] = {
+            ...currentComment,
+            type: "L",
+            payload: deletionPayload,
+          };
+          return {
+            ...oldData,
+            data: {
+              ...oldData.data,
+              hits: {
+                ...oldData.data.hits,
+                hits: newHits,
+              },
+            },
+          };
+        }
+      );
+      setTimeout(
+        () => queryClient.invalidateQueries(["requestEvents", requestId, page]),
+        1000
+      );
+    },
+  });
+
+  const handleEditComment = () => {
+    editComment(
+      {
+        url: event.links.self + "?expand=1",
+        values: { payload: { content: comment, format: "html" } },
+      },
+      // timeout necessary to avoid showing previous comment for a moment
+      {
+        onSuccess: () => setTimeout(() => setEditMode(false), 200),
+        onError: () => {
+          setTimeout(() => resetEditCommentMutation(), 3000);
+        },
+      }
+    );
+  };
+
+  const handleConfirmDeletion = () => {
+    deleteComment(
+      { url: event.links.self, eventId: event.id },
+      {
+        onSettled: () => setDeleteMode(false),
+        onError: () => setTimeout(() => resetDeleteCommentMutation(), 3000),
+      }
+    );
+  };
+
+  const handleCancelDeletion = () => {
+    setDeleteMode(false);
+  };
+
+  const handleCommentChange = (event, value) => {
+    setComment(value);
+  };
+
+  const editButtonDisabled =
+    editLoading || comment === event.payload.content || !comment;
+
+  return (
+    <div className="requests comment-event-container">
+      <Feed.Event key={event.id}>
+        {createdBy?.links?.avatar && (
+          <div className="requests comment-event-avatar">
+            <Image
+              src={createdBy?.links?.avatar}
+              alt={i18next.t("User avatar")}
+            />
+          </div>
+        )}
+        <Feed.Content>
+          <Feed.Summary>
+            <b>{creatorLabel}</b>
+            <Feed.Date>
+              {i18next.t("requestCommented")}{" "}
+              {toRelativeTime(event.created, i18next.language)}
+            </Feed.Date>
+            {(canDelete || canUpdate) && (
+              <Dropdown
+                icon="ellipsis horizontal"
+                className="right-floated"
+                direction="left"
+                aria-label={i18next.t("Actions")}
+              >
+                <Dropdown.Menu>
+                  {canUpdate && (
+                    <Dropdown.Item onClick={() => toggleEditMode()}>
+                      {i18next.t("Edit")}
+                    </Dropdown.Item>
+                  )}
+                  {canDelete && (
+                    <Dropdown.Item onClick={() => toggleDeleteMode()}>
+                      {i18next.t("Delete")}
+                    </Dropdown.Item>
+                  )}
+                </Dropdown.Menu>
+              </Dropdown>
+            )}
+          </Feed.Summary>
+          {_has(event.payload, "content") && !editMode && (
+            <Feed.Extra text>
+              <div
+                dangerouslySetInnerHTML={{
+                  __html: sanitizeHtml(event.payload.content),
+                }}
+              />
+            </Feed.Extra>
+          )}
+          {editMode && (
+            <React.Fragment>
+              <RequestCommentInput
+                comment={comment}
+                initialValue={event?.payload?.content}
+                handleChange={handleCommentChange}
+              />
+              <div className="requests edit-comment-buttons">
+                <Button
+                  icon="close"
+                  type="button"
+                  labelPosition="left"
+                  size="tiny"
+                  onClick={toggleEditMode}
+                  content={i18next.t("Cancel")}
+                />
+                <Button
+                  icon="save"
+                  type="button"
+                  primary
+                  labelPosition="left"
+                  size="tiny"
+                  disabled={editButtonDisabled}
+                  loading={editLoading}
+                  onClick={handleEditComment}
+                  content={i18next.t("Save")}
+                />
+              </div>
+            </React.Fragment>
+          )}
+          {editError && (
+            <Message negative>
+              <Message.Header>
+                {i18next.t(
+                  "Comment was not edited successfully. Please try again in a moment."
+                )}
+              </Message.Header>
+            </Message>
+          )}
+          {deleteError && (
+            <Message negative>
+              <Message.Header>
+                {i18next.t(
+                  "Comment was not deleted successfully. Please try again in a moment."
+                )}
+              </Message.Header>
+            </Message>
+          )}
+          {commentHasBeenEdited && (
+            <Feed.Meta>
+              {i18next.t("Edited")}{" "}
+              {toRelativeTime(event.updated, i18next.language)}
+            </Feed.Meta>
+          )}
+        </Feed.Content>
+      </Feed.Event>
+      <Confirm
+        className="requests dangerous-action-confirmation-modal "
+        open={deleteMode}
+        onCancel={handleCancelDeletion}
+        onConfirm={handleConfirmDeletion}
+        confirmButton={
+          <ConfirmationModalConfirmButton
+            negative
+            labelPosition="left"
+            icon="trash"
+            content={i18next.t("Delete comment")}
+            disabled={deleteLoading}
+            loading={deleteLoading}
+          />
+        }
+        cancelButton={
+          <ConfirmationModalCancelButton
+            labelPosition="left"
+            icon="close"
+            content={i18next.t("Cancel")}
+          />
+        }
+        content={i18next.t("Are you sure you want to delete this comment?")}
+      />
+      <div className="comment-event-vertical-line"></div>
+    </div>
+  );
+};
+
+TimelineCommentEvent.propTypes = {
+  event: PropTypes.object.isRequired,
+  requestId: PropTypes.string.isRequired,
+  page: PropTypes.number.isRequired,
+};
+export default TimelineCommentEvent;
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineEvent.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineEvent.jsx
new file mode 100644
index 00000000..92ad7edd
--- /dev/null
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TimelineEvent.jsx
@@ -0,0 +1,31 @@
+import React from "react";
+import Overridable from "react-overridable";
+import {
+  TimelineCommentEvent,
+  TimelineActionEvent,
+} from "@js/oarepo_requests_common";
+import PropTypes from "prop-types";
+
+export const TimelineEvent = ({ event, requestId, page }) => (
+  <React.Fragment>
+    {event.type === "C" && (
+      <Overridable id="OarepoRequests.TimelineCommentEvent" event={event}>
+        <TimelineCommentEvent event={event} requestId={requestId} page={page} />
+      </Overridable>
+    )}
+    {event.type === "L" && (
+      <Overridable
+        id={`OarepoRequests.TimelineActionEvent.${event.payload.event}`}
+        event={event}
+      >
+        <TimelineActionEvent event={event} />
+      </Overridable>
+    )}
+  </React.Fragment>
+);
+
+TimelineEvent.propTypes = {
+  event: PropTypes.object.isRequired,
+  requestId: PropTypes.string.isRequired,
+  page: PropTypes.number.isRequired,
+};
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/TopicPreview.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TopicPreview.jsx
similarity index 100%
rename from oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/TopicPreview.jsx
rename to oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/TopicPreview.jsx
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/index.js
index 9097c009..5c177589 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/index.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/index.js
@@ -1,4 +1,3 @@
-export * from "./ReadOnlyCustomFields";
 export * from "./DefaultView";
 export * from "./RequestModalContent";
 export * from "./RequestModal";
@@ -10,3 +9,8 @@ export * from "./Timeline";
 export * from "./ConfirmationModalCancelButton";
 export * from "./ConfirmationModalConfirmButton";
 export * from "./RequestModalContentAndActions";
+export { TopicPreview } from "./TopicPreview";
+export { default as TimelineCommentEvent } from "./TimelineCommentEvent";
+export { CommentSubmitForm } from "./CommentSubmitForm";
+export { TimelineActionEvent } from "./TimelineActionEvent";
+export { TimelineEvent } from "./TimelineEvent";
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/index.js
index c0435acc..8ea0b8f8 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/index.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/index.js
@@ -2,4 +2,3 @@ export * from "./actions";
 export * from "./contexts";
 export * from "./utils";
 export * from "./components";
-export * from "./widgets";
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/hooks.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/hooks.js
index e75ac738..046cd396 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/hooks.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/hooks.js
@@ -1,4 +1,4 @@
-import React, { useState, useCallback } from "react";
+import React, { useState, useCallback, useRef } from "react";
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
 import { Message, Icon } from "semantic-ui-react";
 import { useMutation } from "@tanstack/react-query";
@@ -10,7 +10,6 @@ import {
   ConfirmationModalCancelButton,
   ConfirmationModalConfirmButton,
 } from "@js/oarepo_requests_common";
-import { useFormikContext } from "formik";
 
 /**
  * @typedef {import("semantic-ui-react").ConfirmProps} ConfirmProps
@@ -72,30 +71,33 @@ const acceptConfirmDialogProps = (requestOrRequestType, dangerous) => ({
   ),
 });
 
-const declineConfirmDialogProps = (requestOrRequestType) => ({
-  header: `${i18next.t("Decline request")} (${requestOrRequestType.name})`,
-  confirmButton: (
-    <ConfirmationModalConfirmButton content={i18next.t("Decline")} negative />
-  ),
-  content: (
-    <div className="content">
-      <RequestCommentInput
-        label={`${i18next.t("Add comment")} (${i18next.t("optional")})`}
-      />
-      <Message>
-        <Icon name="info circle" className="text size large" />
-        <span>
-          {i18next.t(
-            "It is highly recommended to provide an explanation for the rejection of the request. Note that it is always possible to provide explanation later on the request timeline."
-          )}
-        </span>
-      </Message>
-    </div>
-  ),
-});
+const declineConfirmDialogProps = (
+  requestOrRequestType,
+  comment,
+  handleChange
+) => {
+  return {
+    header: `${i18next.t("Decline request")} (${requestOrRequestType.name})`,
+    confirmButton: (
+      <ConfirmationModalConfirmButton content={i18next.t("Decline")} negative />
+    ),
+    content: (
+      <div className="content">
+        <RequestCommentInput comment={comment} handleChange={handleChange} />
+        <Message>
+          <Icon name="info circle" className="text size large" />
+          <span>
+            {i18next.t(
+              "It is highly recommended to provide an explanation for the rejection of the request. Note that it is always possible to provide explanation later on the request timeline."
+            )}
+          </span>
+        </Message>
+      </div>
+    ),
+  };
+};
 
 export const useConfirmDialog = (requestOrRequestType) => {
-  const formik = useFormikContext();
   const [confirmDialogProps, setConfirmDialogProps] = useState({
     open: false,
     content: i18next.t("Are you sure?"),
@@ -106,21 +108,26 @@ export const useConfirmDialog = (requestOrRequestType) => {
     onConfirm: () =>
       setConfirmDialogProps((props) => ({ ...props, open: false })),
   });
+  const [comment, setComment] = useState("");
+  const commentRef = useRef(comment);
 
+  const handleChange = (event, value) => {
+    setComment(value);
+    commentRef.current = value;
+  };
   const confirmAction = useCallback(
     (onConfirm, requestActionType, extraData) => {
       const dangerous = extraData?.dangerous;
-
       const baseConfirmDialogProps = {
         open: true,
         content: dangerous ? <WarningMessage /> : i18next.t("Are you sure?"),
         onConfirm: () => {
           setConfirmDialogProps((props) => ({ ...props, open: false }));
-          onConfirm();
+          onConfirm(commentRef.current);
         },
         onCancel: () => {
           setConfirmDialogProps((props) => ({ ...props, open: false }));
-          formik?.resetForm();
+          setComment("");
         },
       };
 
@@ -142,7 +149,11 @@ export const useConfirmDialog = (requestOrRequestType) => {
           );
           break;
         case REQUEST_TYPE.DECLINE:
-          caseSpecificProps = declineConfirmDialogProps(requestOrRequestType);
+          caseSpecificProps = declineConfirmDialogProps(
+            requestOrRequestType,
+            comment,
+            handleChange
+          );
           break;
         default:
           break;
@@ -154,7 +165,7 @@ export const useConfirmDialog = (requestOrRequestType) => {
         ...caseSpecificProps,
       }));
     },
-    []
+    [comment, requestOrRequestType]
   );
 
   return { confirmDialogProps, confirmAction };
@@ -168,21 +179,34 @@ export const useAction = ({
 } = {}) => {
   const { onBeforeAction, onAfterAction, onActionError } = useCallbackContext();
   return useMutation(
-    async () => {
+    async (values) => {
       if (onBeforeAction) {
-        const shouldProceed = await onBeforeAction(formik, modalControl);
+        const shouldProceed = await onBeforeAction(
+          formik,
+          modalControl,
+          requestOrRequestType
+        );
         if (!shouldProceed) {
           modalControl?.closeModal();
           throw new Error("Could not proceed with the action.");
         }
       }
-
-      return action(requestOrRequestType, formik?.values);
+      const formValues = { ...formik?.values };
+      if (values) {
+        formValues.payload.content = values;
+      }
+      return action(requestOrRequestType, formValues);
     },
     {
       onError: (e, variables) => {
         if (onActionError) {
-          onActionError(e, variables, formik, modalControl);
+          onActionError(
+            e,
+            variables,
+            formik,
+            modalControl,
+            requestOrRequestType
+          );
         } else if (e?.response?.data?.errors) {
           formik?.setFieldError(
             "api",
@@ -207,7 +231,13 @@ export const useAction = ({
       },
       onSuccess: (data, variables) => {
         if (onAfterAction) {
-          onAfterAction(data, variables, formik, modalControl);
+          onAfterAction(
+            data,
+            variables,
+            formik,
+            modalControl,
+            requestOrRequestType
+          );
         }
         const redirectionURL = data?.data?.links?.topic_html;
         modalControl?.closeModal();
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/index.js
index 47a68caa..70bd6b39 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/index.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/index.js
@@ -1,4 +1,3 @@
 export * from "./utils";
 export * from "./objects";
-export * from "./loader";
 export * from "./hooks";
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/loader.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/loader.js
deleted file mode 100644
index 5eefffad..00000000
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/loader.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import { DefaultView } from "@js/oarepo_requests_common";
-
-/** Import function to load widget either from a specific path or local widgets
- *
- * The user defined path to import widget is of the format `@templates/<templatePath>`.
- * Note that the `@template` alias should be a correctly resolving path and it's the
- * user of this function that has to ensure that. The value is hardcoded here as the
- * dynamic import cannot rely on purely a dynamic path i.e a variable.
- */
-export async function importWidget(templateLoaders, { view_widget: UIWidget }) {
-  let component;
-
-  // Try import widget from user's defined templateLoaders
-  for (const loader of templateLoaders) {
-    try {
-      const module = await loader(UIWidget);
-      component = module.default ?? module[UIWidget];
-      // Component was found, stop looking.
-      if (component) {
-        return component;
-      }
-    } catch (error) {
-      // If the component failed to load from a loader, try other loaders first.
-      continue;
-    }
-  }
-
-  return DefaultView;
-}
-
-/**
- * @param config: Configuration to load widgets
- *
- * Example configuration
- *
- * {
- *  fieldPathPrefix: "mynamespace" or empty,
- *  templateLoader: UIWidget => import(`my_folder/${UIWidget}.js`),
- *  fields: [{
- *    ui_widget: "MyWidget",
- *    field: "field_id",
- *    props: {
- *      label: "My label"
- *    }
- *  }]
- * }
- *
- * @returns array fields: resolved react components
- *
- * Example return
- *
- * [
- *  <Input fieldPath={'mynamespace.field_id'} label={label} />,
- *  ...
- * ]
- *
- */
-export async function loadWidgetsFromConfig({
-  templateLoaders,
-  fieldPathPrefix,
-  fields,
-}) {
-  const importWidgetsFromFolder = (
-    templateFolder,
-    fieldPathPrefix,
-    fieldsConfig
-  ) => {
-    const tplPromises = [];
-    fieldsConfig.forEach((fieldCfg) => {
-      tplPromises.push(
-        importWidget(templateFolder, {
-          ...fieldCfg,
-          fieldPath: fieldPathPrefix
-            ? `${fieldPathPrefix}.${fieldCfg.field}`
-            : fieldCfg.field,
-        })
-      );
-    });
-    return Promise.all(tplPromises);
-  };
-  const _fields = await importWidgetsFromFolder(
-    templateLoaders,
-    fieldPathPrefix,
-    fields
-  );
-  return [..._fields];
-}
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/utils.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/utils.js
index 18cad276..9cc1cadc 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/utils.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/utils.js
@@ -34,29 +34,33 @@ export const getRequestStatusIcon = (requestStatus) => {
       return { name: "hourglass end", color: "orange" };
     case "deleted":
       return { name: "thrash", color: "black" };
+    case "comment_deleted":
+      return { name: "eraser", color: "grey" };
     default:
       return null;
   }
 };
 
-export const getFeedMessage = (requestStatus, creatorLabel) => {
-  switch (requestStatus?.toLowerCase()) {
+export const getFeedMessage = (eventStatus) => {
+  switch (eventStatus?.toLowerCase()) {
     case "created":
-      return i18next.t("requestCreated", { creatorLabel });
+      return i18next.t("requestCreated");
     case "submitted":
-      return i18next.t("requestSubmitted", { creatorLabel });
+      return i18next.t("requestSubmitted");
     case "cancelled":
-      return i18next.t("requestCancelled", { creatorLabel });
+      return i18next.t("requestCancelled");
     case "accepted":
-      return i18next.t("requestAccepted", { creatorLabel });
+      return i18next.t("requestAccepted");
     case "declined":
-      return i18next.t("requestDeclined", { creatorLabel });
+      return i18next.t("requestDeclined");
     case "expired":
       return i18next.t("Request expired.");
     case "deleted":
-      return i18next.t("requestDeleted", { creatorLabel });
+      return i18next.t("requestDeleted");
+    case "comment_deleted":
+      return i18next.t("deleted comment");
     default:
-      return i18next.t("requestCommented", { creatorLabel });
+      return i18next.t("requestCommented");
   }
 };
 
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/widgets/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/widgets/index.js
deleted file mode 100644
index 40070f99..00000000
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/widgets/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { DefaultView, ReadOnlyCustomFields } from "@js/oarepo_requests_common";
-export default { DefaultView, ReadOnlyCustomFields };
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/CreateRequestModalContent.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/CreateRequestModalContent.jsx
index 37d1504e..9e44df33 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/CreateRequestModalContent.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/CreateRequestModalContent.jsx
@@ -2,6 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { Form, Divider } from "semantic-ui-react";
 import { CustomFields } from "react-invenio-forms";
+import sanitizeHtml from "sanitize-html";
 
 /**
  * @typedef {import("../../record-requests/types").RequestType} RequestType
@@ -9,19 +10,35 @@ import { CustomFields } from "react-invenio-forms";
  */
 
 /** @param {{ requestType: RequestType, customSubmitHandler: (e) => void }} props */
-export const CreateRequestModalContent = ({ requestType, customFields }) => {
+export const CreateRequestModalContent = ({
+  requestType,
+  customFields,
+  allowedHtmlAttrs,
+  allowedHtmlTags,
+}) => {
   const description =
     requestType?.stateful_description || requestType?.description;
+
+  const sanitizedDescription = sanitizeHtml(description, {
+    allowedTags: allowedHtmlTags,
+    allowedAttributes: allowedHtmlAttrs,
+  });
+
   return (
     <>
-      {description && <p id="request-modal-desc">{description}</p>}
+      {description && (
+        <p
+          id="request-modal-desc"
+          dangerouslySetInnerHTML={{ __html: sanitizedDescription }}
+        ></p>
+      )}
       {customFields?.ui && (
         <Form id="request-form">
           <CustomFields
             config={customFields?.ui}
             templateLoaders={[
               (widget) => import(`@templates/custom_fields/${widget}.js`),
-              () => import(`react-invenio-forms`),
+              (widget) => import(`react-invenio-forms`),
             ]}
             fieldPathPrefix="payload"
           />
@@ -35,4 +52,6 @@ export const CreateRequestModalContent = ({ requestType, customFields }) => {
 CreateRequestModalContent.propTypes = {
   requestType: PropTypes.object.isRequired,
   customFields: PropTypes.object,
+  allowedHtmlAttrs: PropTypes.object,
+  allowedHtmlTags: PropTypes.array,
 };
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx
index ec84b58b..226259ad 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx
@@ -12,6 +12,8 @@ import {
   QueryClientProvider,
 } from "@tanstack/react-query";
 import { httpVnd } from "@js/oarepo_ui";
+import { OverridableContext, overrideStore } from "react-overridable";
+const overriddenComponents = overrideStore.getAll();
 
 export const requestButtonsDefaultIconConfig = {
   delete_published_record: { icon: "trash", labelPosition: "left" },
@@ -115,16 +117,18 @@ const RecordRequestsWithQueryClient = ({
   requestButtonsIconsConfig,
 }) => {
   return (
-    <QueryClientProvider client={queryClient}>
-      <RecordRequests
-        record={initialRecord}
-        ContainerComponent={ContainerComponent}
-        onBeforeAction={onBeforeAction}
-        onAfterAction={onAfterAction}
-        onActionError={onActionError}
-        requestButtonsIconsConfig={requestButtonsIconsConfig}
-      />
-    </QueryClientProvider>
+    <OverridableContext.Provider value={overriddenComponents}>
+      <QueryClientProvider client={queryClient}>
+        <RecordRequests
+          record={initialRecord}
+          ContainerComponent={ContainerComponent}
+          onBeforeAction={onBeforeAction}
+          onAfterAction={onAfterAction}
+          onActionError={onActionError}
+          requestButtonsIconsConfig={requestButtonsIconsConfig}
+        />
+      </QueryClientProvider>
+    </OverridableContext.Provider>
   );
 };
 
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/EventSubmitForm.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/EventSubmitForm.jsx
deleted file mode 100644
index 200e8ec7..00000000
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/EventSubmitForm.jsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { useEffect } from "react";
-import PropTypes from "prop-types";
-import { i18next } from "@translations/oarepo_requests_ui/i18next";
-import { Button, Message, Form } from "semantic-ui-react";
-import { useFormik, FormikProvider } from "formik";
-// TODO: until we figure out a way to globally use sanitization with our hook
-import {
-  CommentPayloadSchema,
-  RequestCommentInput,
-} from "@js/oarepo_requests_common";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { httpVnd } from "@js/oarepo_ui";
-
-export const EventSubmitForm = ({
-  request,
-  refetch,
-  page,
-  timelinePageSize,
-}) => {
-  const formik = useFormik({
-    initialValues: {
-      payload: {
-        content: "",
-        format: "html",
-      },
-    },
-    onSubmit: () => {},
-    validationSchema: CommentPayloadSchema,
-    validateOnBlur: false,
-    validateOnChange: false,
-  });
-
-  const { resetForm, values, setFieldError } = formik;
-  const queryClient = useQueryClient();
-
-  const { mutate, isError, isLoading, reset } = useMutation(
-    () => httpVnd.post(request.links?.comments, values),
-    {
-      onSuccess: (response) => {
-        if (response.status === 201) {
-          queryClient.setQueryData(
-            ["requestEvents", request.id, page],
-            (oldData) => {
-              if (!oldData) return;
-              // a bit ugly, but it is a limitation of react query when data you recieve is nested
-              const newData = [...oldData.data.hits.hits];
-              if (oldData.data.hits.total + 1 > timelinePageSize) {
-                newData.pop();
-              }
-              return {
-                ...oldData,
-                data: {
-                  ...oldData.data,
-                  hits: {
-                    ...oldData.data.hits,
-                    total: oldData.data.hits.total + 1,
-                    hits: [response.data, ...newData],
-                  },
-                },
-              };
-            }
-          );
-        }
-        setTimeout(() => refetch(), 1000);
-        resetForm();
-      },
-      onError: (error) => {
-        if (error.response?.data?.errors?.length > 0) {
-          error.response.data.errors.forEach((error) => {
-            setFieldError(error.field, error.messages[0]);
-          });
-        }
-      },
-    }
-  );
-
-  useEffect(() => {
-    if (isError) {
-      setTimeout(() => {
-        reset();
-        resetForm();
-      }, 2500);
-    }
-    return () => isError && reset();
-  }, [isError, reset, resetForm]);
-  return (
-    <FormikProvider value={formik}>
-      <Form className="ui form">
-        <RequestCommentInput />
-        {isError && (
-          <Message negative>
-            <Message.Header>
-              {i18next.t("Comment was not submitted successfully.")}
-            </Message.Header>
-          </Message>
-        )}
-        <Button
-          size="tiny"
-          floated="right"
-          color="blue"
-          icon="send"
-          type="button"
-          loading={isLoading}
-          disabled={isLoading}
-          content={i18next.t("Leave comment")}
-          onClick={() => mutate()}
-        />
-      </Form>
-    </FormikProvider>
-  );
-};
-
-EventSubmitForm.propTypes = {
-  request: PropTypes.object,
-  refetch: PropTypes.func,
-  page: PropTypes.number,
-  timelinePageSize: PropTypes.number,
-};
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/RequestDetail.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/RequestDetail.jsx
index 3b9caf6b..bb21c2c4 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/RequestDetail.jsx
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/RequestDetail.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useMemo } from "react";
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
 import { scrollTop, httpApplicationJson } from "@js/oarepo_ui";
 import {
@@ -12,7 +12,6 @@ import {
   Loader,
   Message,
 } from "semantic-ui-react";
-import { TopicPreview } from ".";
 import PropTypes from "prop-types";
 import { useQuery, useIsMutating } from "@tanstack/react-query";
 import {
@@ -22,8 +21,11 @@ import {
   SideRequestInfo,
   Timeline,
   CallbackContextProvider,
+  TopicPreview,
 } from "@js/oarepo_requests_common";
 import { Formik } from "formik";
+import _isEmpty from "lodash/isEmpty";
+import sanitizeHtml from "sanitize-html";
 
 export const RequestDetail = ({
   request,
@@ -43,8 +45,10 @@ export const RequestDetail = ({
       staleTime: Infinity,
     }
   );
-
   const customFields = data?.data?.custom_fields;
+  const allowedHtmlAttrs = data?.data?.allowedHtmlAttrs;
+  const allowedHtmlTags = data?.data?.allowedHtmlTags;
+
   const requestTypeProperties = data?.data?.request_type_properties;
   const actions = mapLinksToActions(
     request,
@@ -64,13 +68,24 @@ export const RequestDetail = ({
     };
   }, []);
 
+  const formikInitialValues = useMemo(() => {
+    return {
+      payload: !_isEmpty(request?.payload) ? request.payload : {},
+    };
+  }, [request?.payload]);
+
   const requestHeader = request?.stateful_name || request?.name;
   const description = request?.stateful_description || request?.description;
+  const sanitizedDescription = sanitizeHtml(description, {
+    allowedTags: allowedHtmlTags,
+    allowedAttributes: allowedHtmlAttrs,
+  });
+
   return (
     <CallbackContextProvider
       value={{ onBeforeAction, onAfterAction, onActionError }}
     >
-      <Formik initialValues={{}}>
+      <Formik initialValues={formikInitialValues}>
         {({ errors }) => (
           <ConfirmModalContextProvider requestOrRequestType={request}>
             {({ confirmDialogProps }) => (
@@ -116,7 +131,13 @@ export const RequestDetail = ({
                 <Grid.Row>
                   <Grid.Column>
                     <Header as="h1">{requestHeader}</Header>
-                    {description && <p>{description}</p>}
+                    {description && (
+                      <p
+                        dangerouslySetInnerHTML={{
+                          __html: sanitizedDescription,
+                        }}
+                      ></p>
+                    )}
                     <SideRequestInfo request={request} />
                   </Grid.Column>
                 </Grid.Row>
@@ -199,5 +220,5 @@ RequestDetail.defaultProps = {
   onBeforeAction: undefined,
   onAfterAction: undefined,
   onActionError: undefined,
-  timelinePageSize: 10,
+  timelinePageSize: 25,
 };
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/TimelineEvent.jsx b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/TimelineEvent.jsx
deleted file mode 100644
index 82817a20..00000000
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/TimelineEvent.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { memo } from "react";
-import { i18next } from "@translations/oarepo_requests_ui/i18next";
-import { Icon, Feed } from "semantic-ui-react";
-import _has from "lodash/has";
-import sanitizeHtml from "sanitize-html";
-import {
-  getRequestStatusIcon,
-  getFeedMessage,
-} from "@js/oarepo_requests_common";
-import PropTypes from "prop-types";
-
-const TimelineEvent = ({ event }) => {
-  const eventLabel = event.payload?.event ?? i18next.t("commented");
-  const eventIcon = getRequestStatusIcon(eventLabel) ?? {
-    name: "user circle",
-    color: "grey",
-  };
-  const creatorLabel = event.created_by?.label;
-  const feedMessage = getFeedMessage(eventLabel, creatorLabel);
-  return (
-    <Feed.Event key={event.id}>
-      <Feed.Label>
-        <Icon
-          name={eventIcon.name}
-          color={eventIcon.color}
-          aria-label={`${eventLabel} ${i18next.t("icon")}`}
-        />
-      </Feed.Label>
-      <Feed.Content>
-        <Feed.Summary>
-          {feedMessage}
-          <Feed.Date>{event.created}</Feed.Date>
-        </Feed.Summary>
-        {_has(event.payload, "content") && (
-          <Feed.Extra text>
-            <div
-              dangerouslySetInnerHTML={{
-                __html: sanitizeHtml(event.payload.content),
-              }}
-            />
-          </Feed.Extra>
-        )}
-      </Feed.Content>
-    </Feed.Event>
-  );
-};
-
-TimelineEvent.propTypes = {
-  event: PropTypes.object.isRequired,
-};
-export default memo(
-  TimelineEvent,
-  (prevProps, nextProps) => prevProps.event.updated === nextProps.event.updated
-);
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/index.js
index 3fdf9d85..22463079 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/index.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/index.js
@@ -1,5 +1 @@
 export { RequestDetail } from "./RequestDetail";
-export { SideRequestInfo } from "../../common/components/SideRequestInfo";
-export { TopicPreview } from "./TopicPreview";
-export { default as TimelineEvent } from "./TimelineEvent";
-export { EventSubmitForm } from "./EventSubmitForm";
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/index.js
index e8742765..a6e4a297 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/index.js
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/index.js
@@ -3,9 +3,12 @@ import ReactDOM from "react-dom";
 import { FormConfigProvider } from "@js/oarepo_ui";
 import { RequestDetail } from "./components";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { OverridableContext, overrideStore } from "react-overridable";
 
 const recordRequestsAppDiv = document.getElementById("request-detail");
 
+const overriddenComponents = overrideStore.getAll();
+
 const request = recordRequestsAppDiv.dataset?.request
   ? JSON.parse(recordRequestsAppDiv.dataset.request)
   : {};
@@ -15,10 +18,12 @@ const formConfig = recordRequestsAppDiv.dataset?.formConfig
 const queryClient = new QueryClient();
 
 ReactDOM.render(
-  <FormConfigProvider value={{ formConfig }}>
-    <QueryClientProvider client={queryClient}>
-      <RequestDetail request={request} />
-    </QueryClientProvider>
-  </FormConfigProvider>,
+  <OverridableContext.Provider value={overriddenComponents}>
+    <FormConfigProvider value={{ formConfig }}>
+      <QueryClientProvider client={queryClient}>
+        <RequestDetail request={request} />
+      </QueryClientProvider>
+    </FormConfigProvider>
+  </OverridableContext.Provider>,
   recordRequestsAppDiv
 );
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/collections/form.overrides b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/collections/form.overrides
index ba772433..6238b3a5 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/collections/form.overrides
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/collections/form.overrides
@@ -1,14 +1,12 @@
-.ui.form {
-  &.requests-form-cf {
-    .ui.accordion {
-      .active.title {
-        display: none;
-      }
-      .ui.container {
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-        width: auto;
-      }
+.requests-form-cf {
+  .ui.accordion {
+    .active.title {
+      display: none;
+    }
+    .ui.container {
+      margin-left: 0 !important;
+      margin-right: 0 !important;
+      width: auto;
     }
   }
 }
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/modules/modal.overrides b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/modules/modal.overrides
index 45017854..343b9a1e 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/modules/modal.overrides
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/modules/modal.overrides
@@ -1,5 +1,8 @@
 .ui.modal {
   &.requests-request-modal {
+    .field {
+      margin-bottom: 1rem !important;
+    }
     .ui.accordion {
       .active.title {
         display: none;
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/views/feed.overrides b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/views/feed.overrides
new file mode 100644
index 00000000..b5b81c3b
--- /dev/null
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/views/feed.overrides
@@ -0,0 +1,197 @@
+.ui.feed {
+  word-break: break-word;
+  .requests.comment-event-container {
+    position: relative;
+    .event {
+      border: @commentEventBorder;
+      border-radius: @commentEventBorderRadius;
+      padding: @commentEventPadding;
+      .requests.comment-event-avatar {
+        width: @commentEventAvatarWidth;
+        height: @commentEventAvatarHeight;
+        position: absolute;
+        bottom: 0.5rem;
+        left: calc(@verticalLineLeftMargin - @commentEventAvatarWidth / 2);
+        z-index: 1;
+      }
+    }
+    .comment-event-vertical-line {
+      height: 3rem;
+      width: 0;
+      border-left: @commentEventBorder;
+      margin-left: @verticalLineLeftMargin;
+    }
+  }
+  .requests.action-event-container {
+    position: relative;
+    min-height: 3rem;
+    .event {
+      padding-top: 1rem;
+      padding-bottom: 2rem;
+      .requests.action-event-avatar {
+        width: @actionEventAvatarWidth;
+        height: @actionEventAvatarHeight;
+      }
+      .summary {
+        .requests.action-event-avatar {
+          flex-shrink: 0;
+        }
+        position: relative;
+        z-index: 1;
+        margin-left: calc(
+          @verticalLineLeftMargin - @actionEventIconSize / 2 -
+            @commentEventBorderWidth
+        );
+      }
+    }
+    .requests.action-event-icon {
+      font-size: @actionEventIconSize;
+      line-height: normal;
+      background-color: white;
+    }
+    .action-event-vertical-line {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      width: 0;
+      border-left: @commentEventBorder;
+      margin-left: @verticalLineLeftMargin;
+    }
+  }
+  .requests.edit-comment-buttons {
+    text-align: right;
+    margin-top: 5px;
+  }
+}
+
+.ui.feed {
+  // override SUI defaults  to bypass immediate parent rule for feed
+  .event > .content .user {
+    display: inline-block;
+    font-weight: @userFontWeight;
+    margin-right: @userDistance;
+    vertical-align: baseline;
+  }
+
+  .event > .content .user img {
+    margin: @userImageMargin;
+    width: @userImageWidth;
+    height: @userImageHeight;
+    vertical-align: @userImageVerticalAlign;
+  }
+
+  /*--------------
+     Inline Date
+  ---------------*/
+
+  /* Date inside Summary */
+
+  .event > .content .summary > .date {
+    display: @summaryDateDisplay;
+    float: @summaryDateFloat;
+    font-weight: @summaryDateFontWeight;
+    font-size: @summaryDateFontSize;
+    font-style: @summaryDateFontStyle;
+    margin: @summaryDateMargin;
+    padding: @summaryDatePadding;
+    color: @summaryDateColor;
+  }
+
+  /*--------------
+    Extra Summary
+  ---------------*/
+
+  .event > .content .extra {
+    margin: @extraMargin;
+    background: @extraBackground;
+    padding: @extraPadding;
+    color: @extraColor;
+  }
+
+  /* Images */
+
+  .event > .content .extra.images img {
+    display: inline-block;
+    margin: @extraImageMargin;
+    width: @extraImageWidth;
+  }
+
+  /* Text */
+
+  .event > .content .extra.text {
+    padding: @extraTextPadding;
+    border-left: @extraTextPointer;
+    font-size: @extraTextFontSize;
+    line-height: @extraTextLineHeight;
+  }
+
+  /*--------------
+        Meta
+  ---------------*/
+
+  .event > .content .meta {
+    display: @metadataDisplay;
+    font-size: @metadataFontSize;
+    margin: @metadataMargin;
+    background: @metadataBackground;
+    border: @metadataBorder;
+    border-radius: @metadataBorderRadius;
+    box-shadow: @metadataBoxShadow;
+    padding: @metadataPadding;
+    color: @metadataColor;
+  }
+
+  .event > .content .meta > * {
+    position: relative;
+    margin-left: @metadataElementSpacing;
+  }
+
+  .event > .content .meta > *:after {
+    content: @metadataDivider;
+    color: @metadataDividerColor;
+    top: 0;
+    left: @metadataDividerOffset;
+    opacity: 1;
+    position: absolute;
+    vertical-align: top;
+  }
+
+  .event > .content .meta .like {
+    color: @likeColor;
+    transition: @likeTransition;
+  }
+
+  .event > .content .meta .like:hover .icon {
+    color: @likeHoverColor;
+  }
+
+  .event > .content .meta .active.like .icon {
+    color: @likeActiveColor;
+  }
+
+  /* First element */
+
+  .event > .content .meta > :first-child {
+    margin-left: 0em;
+  }
+
+  .event > .content .meta > :first-child::after {
+    display: none;
+  }
+
+  /* Action */
+
+  .event > .content .meta a,
+  .event > .content .meta > .icon {
+    cursor: @metadataActionCursor;
+    opacity: @metadataActionOpacity;
+    color: @metadataActionColor;
+    transition: @metadataActionTransition;
+  }
+
+  .event > .content .meta a:hover,
+  .event > .content .meta a:hover .icon,
+  .event > .content .meta > .icon:hover {
+    color: @metadataActionHoverColor;
+  }
+}
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/views/feed.variables b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/views/feed.variables
new file mode 100644
index 00000000..81cd3f31
--- /dev/null
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/views/feed.variables
@@ -0,0 +1,10 @@
+@commentEventBorderWidth: 1px;
+@commentEventBorder: @commentEventBorderWidth solid @borderColor;
+@commentEventBorderRadius: 5px;
+@commentEventPadding: 1.5rem;
+@commentEventAvatarWidth: 2rem;
+@commentEventAvatarHeight: 2rem;
+@verticalLineLeftMargin: 2rem;
+@actionEventIconSize: 1.5rem;
+@actionEventAvatarWidth: 1.5rem;
+@actionEventAvatarHeight: 1.5rem;
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json b/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json
index 70d570dc..9578d8f9 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json
@@ -1 +1 @@
-{"status":"Stav","Create Request":"Vytvořit žádost","Open dialog for request":"Otevřít dialogové okno pro žádost","My Requests":"Moje žádosti","Requests to Approve":"Žádosti ke schválení","Are you sure?":"Jste si jistí?","Cancel":"Zrušit","OK":"OK","Create request":"Vytvořit žádost","Submit request":"Odeslat žádost","Delete request":"Smazat žádost","Delete":"Smazat","Accept request":"Přijmout žádost","Accept":"Přijmout","Decline request":"Zamítnout žádost","Decline":"Zamítnout","Create and submit request":"Vytvořit a odeslat žádost","Create and submit":"Vytvořit a odeslat","Error sending request":"Chyba při odesílání žádosti","Submit":"Odeslat","Save drafted request":"Uložit koncept žádosti","Save":"Uložit","Create":"Vytvořit","Creator":"Tvůrce","Receiver":"Příjemce","Request type":"Typ žádosti","Created":"Vytvořeno","Timeline":"Časová osa","Submit event":"Odeslat událost","No requests to show":"Žádné žádosti k zobrazení","api.requests":"API pro žádosti záznamu","Request deletion of published record":"Žádost o smazání zveřejněného záznamu","Request re-opening of published record":"Žádost o znovuotevření zveřejněného záznamu","Request publishing of a draft":"Žádost o kontrolu a zveřejnění konceptu","No status":"Beze stavu","Cannot send request. Please try again later.":"Nemohu poslat žádost. Prosím, zkuste později.","Cancel request":"Zrušit žádost","Submitted":"Odeslána","Expired":"Expirována","Accepted":"Přijata","Declined":"Zamítnuta","Cancelled":"Zrušena","Status":"Stav","Type":"Typ","Loading request types":"Načítám typy žádostí","Error loading request types":"Chyba při načítání typů žádostí","No new requests to create":"Nejsou dostupné žádné žádosti","Requests":"Žádosti","Error loading requests":"Chyba při načítání žádostí","Loading requests":"Načítám žádosti","Delete record":"Smazat záznam","Edit record":"Upravit záznam","Publish draft":"Publikovat","Close":"Zavřít","Request":"Žádost","Pending":"Schvalována","request":"žádost","Error while submitting comment.":"Chyba při odesílání komentáře.","Add comment":"Přidat komentář","optional":"nepovinné","Your comment here...":"Váš komentář...","Comment was not created successfully.":"Komentář nebyl úspěšně vytvořen.","Comment":"Komentář","Error while submitting the comment":"Chyba při odesílání komentáře","Back to requests":"Zpět na žádosti","Record":"Záznam","preview":"náhled","to top":"na začátek stránky","Loading timeline...":"Načítám časovou osu...","Error while fetching timeline events":"Chyba při načítání událostí časové osy","commented":"komnetoval","icon":"ikona","this request":"tato žádost","Comment must be at least 1 character long.":"Komentář musí být alespoň 1 znak dlouhý.","Invalid format.":"Neplatný formát.","Request status":"Stav žádosti","Request record deletion":"Zažádat smazání záznamu","Record deletion requested":"Zažádáno smazání záznamu","Click to permanently delete the record.":"Klikněte pro trvalé smazání záznamu.","Request permission to delete the record.":"Zažádat o povolení smazat záznam.","Permission to delete record requested. You will be notified about the decision by email.":"Zažádáno o povolení k smazání záznamu. O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to permanently delete the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o trvalé smazání záznamu. Můžete žádost schválit nebo zamítnout.","Permission to delete record (including files) requested. ":"Zažádáno o povolení ke smazání záznamu (včetně souborů).","Submit request to get permission to delete the record.":"Odeslat žádost o povolení ke smazání záznamu.","Request edit access":"Žádost o úpravu záznamu","Edit access requested":"Zažádáno o úpravu záznamu","Click to start editing the metadata of the record.":"Klikněte pro začátek úprav metadat záznamu.","Request edit access to the record. You will be notified about the decision by email.":"Zažádat o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","Edit access requested. You will be notified about the decision by email.":"Zažádáno o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","You have been requested to grant edit access to the record.":"Byl jste požádán o udělení práva na upravení záznamu.","Edit access requested.":"Zažádáno o úpravu záznamu.","New Version":"Nová verze","Request requesting creation of new version of a published record.":"Žádost o vytvoření nové verze zveřejněného záznamu.","Request new version access":"Zažádat o vytvoření nové verzi","New version access requested":"Zažádáno o vytvoření nové verze","Click to start creating a new version of the record.":"Kliněte pro začátek vytváření nové verze záznamu.","Request permission to update record (including files). You will be notified about the decision by email.":"Zažádat o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","Permission to update record (including files) requested. You will be notified about the decision by email.":"Zažádáno o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to update the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o aktualizaci záznamu. Můžete žádost schválit nebo zamítnout.","Permission to update record (including files) requested. ":"Zažádáno o povolení aktualizace záznamu (včetně souborů).","Submit request to get edit access to the record.":"Odeslat žádost o povolení aktualizace záznamu (včetně souborů).","Resource version":"Verze záznamu","Write down the version (first, second…).":"Napište verzi (první, druhá…).","Submit for review":"Odeslat ke kontrole","Submitted for review":"Odesláno ke kontrole","Click to immediately publish the draft. The draft will be a subject to embargo as requested in the side panel. Note: The action is irreversible.":"Klikněte pro okamžité zveřejnění konceptu. Bylo-li zvoleno, záznam může podléhat embargu. Upozornění: Tuto akci není možno vzít zpět.","By submitting the draft for review you are requesting the publication of the draft. The draft will become locked and no further changes will be possible until the request is accepted or declined. You will be notified about the decision by email.":"Odesláním konceptu ke kontrole žádáte o zveřejnění konceptu. Koncept bude uzamčen a další změny nebudou možné, dokud nebude žádost přijata nebo zamítnuta. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. It is now locked and no further changes are possible. You will be notified about the decision by email.":"Koncept byl odeslán ke kontrole. Nyní je uzamčen a další změny nejsou možné. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. You can now accept or decline the request.":"Koncept Vám byl odeslán ke kontrole. Žádost můžete přijmout nebo zamítnout.","The draft has been submitted for review.":"Koncept byl odeslán ke kontrole.","Submit for review. After submitting the draft for review, it will be locked and no further modifications will be possible.":"Odeslat ke kontrole. Po odeslání konceptu ke kontrole bude záznam uzamčen a další změny nebudou možné.","Request not yet submitted.":"Žádost zatím nebyla odeslána.","Delete draft":"Smazat koncept","Request draft deletion":"Zažádat o smazání konceptu","Draft deletion requested":"Zažádáno o smazání konceptu","Click to permanently delete the draft.":"Klikněte pro trvalé smazání konceptu.","Request permission to delete the draft.":"Zažádat o povolení ke smazání konceptu.","Permission to delete draft requested. You will be notified about the decision by email.":"Zažádáno o povolení ke smazání konceptu. O rozhodnutí budete informováni emailem.","You have been asked to approve the request to permanently delete the draft. You can approve or reject the request.":"Byli jste požádáni o schválení žádosti o trvalé smazání konceptu. Můžete žádost schválit nebo odmítnout.","Permission to delete draft (including files) requested. ":"Zažádáno o povolení ke smazání konceptu (včetně souborů).","Submit request to get permission to delete the draft.":"Odeslat žádost o povolení ke smazání konceptu.","Request not created successfully. Please try again in a moment.":"Žádost nebyla úspěšně vytvořena. Zkuste to prosím za chvíli znovu.","Form fields could not be fetched.":"Formulářová pole nebyla načtena.","Request details":"Podrobnosti žádosti","Topic":"Téma","Request topic":"Téma žádosti","Are you sure you want to proceed? Once the action is completed, it will not be possible to undo it.":"Jste si jisti, že chcete pokračovat? Po dokončení akce ji nebude možné vrátit zpět.","Are you sure you wish to":"Jste si jisti, že chcete","Proceed":"Pokračovat","Are you sure you wish to proceed? After this request is accepted, it will not be possible to reverse the action.":"Jste si jisti, že chcete pokračovat? Po přijetí této žádosti nebude možné akci zvrátit.","The request could not be created due to validation errors. Please correct the errors and try again.":"Žádost nemohla být vytvořena kvůli validačním chybám. Prosím opravte chyby a zkuste to znovu.","The action could not be executed. Please try again in a moment.":"Akce nebyla úspěšně provedena. Zkuste to prosím za chvíli znovu.","Record has validation errors. Redirecting to form...":"Záznam obsahuje validační chyby. Přesměrování na formulář...","Comment was not submitted successfully.":"Komentář nebyl úspěšně odeslán.","Leave comment":"Zanechat komentář","Request deletion of draft":"Zažádat o smazání konceptu","It is highly recommended to provide an explanation for the rejection of the request. Note that it is always possible to provide explanation later on the request timeline.":"Důrazně doporučujeme poskytnout vysvětlení zamítnutí žádosti. Všimněte si, že je vždy možné poskytnout vysvětlení později v rámci časové osy žádosti.","Record preview":"Náhled záznamu","This action is irreversible. Are you sure you wish to accept this request?":"Tato akce je nevratná. Opravdu si přejete tuto žádost přijmout?","requestCreated":"{{creatorLabel}} vytvořil(a) tuto žádost","requestSubmitted":"{{creatorLabel}} odeslal(a) tuto žádost","requestCancelled":"{{creatorLabel}} zrušil(a) tuto žádost","requestAccepted":"{{creatorLabel}} přijal(a) tuto žádost","requestDeclined":"{{creatorLabel}} odmítl(a) tuto žádost","Request expired.":"Žádost vypršela","requestDeleted":"{{creatorLabel}} smazal(a) tuto žádost","requestCommented":"{{creatorLabel}} komentoval(a)","Permanently delete":"Trvale smazat","Keep the record":"Ponechat záznam","Publish":"Publikovat","Return for correction":"Vrátit k opravě","api.applicable-requests":"API pro vytváření žádostí","System user":"Systémový uživatel","Keep files.":"Ponechat soubory.","Keep files in the new version?":"Ponechat soubory v nové verzi?","You do not have permission to delete the draft.":"Nemáte právo smazat rozpracovaný záznam.","You do not have permission to delete the record.":"Nemáte právo smazat záznam.","You do not have permission to update the record.":"Nemáte právo zažádat o aktualizaci záznamu."}
\ No newline at end of file
+{"status":"Stav","Create Request":"Vytvořit žádost","Open dialog for request":"Otevřít dialogové okno pro žádost","My Requests":"Moje žádosti","Requests to Approve":"Žádosti ke schválení","Are you sure?":"Jste si jistí?","Cancel":"Zrušit","OK":"OK","Create request":"Vytvořit žádost","Submit request":"Odeslat žádost","Delete request":"Smazat žádost","Delete":"Smazat","Accept request":"Přijmout žádost","Accept":"Přijmout","Decline request":"Zamítnout žádost","Decline":"Zamítnout","Create and submit request":"Vytvořit a odeslat žádost","Create and submit":"Vytvořit a odeslat","Error sending request":"Chyba při odesílání žádosti","Submit":"Odeslat","Save drafted request":"Uložit koncept žádosti","Save":"Uložit","Create":"Vytvořit","Creator":"Tvůrce","Receiver":"Příjemce","Request type":"Typ žádosti","Created":"Vytvořeno","Timeline":"Časová osa","Submit event":"Odeslat událost","No requests to show":"Žádné žádosti k zobrazení","api.requests":"API pro žádosti záznamu","Request deletion of published record":"Žádost o smazání zveřejněného záznamu","Request re-opening of published record":"Žádost o znovuotevření zveřejněného záznamu","Request publishing of a draft":"Žádost o kontrolu a zveřejnění konceptu","No status":"Beze stavu","Cannot send request. Please try again later.":"Nemohu poslat žádost. Prosím, zkuste později.","Cancel request":"Zrušit žádost","Submitted":"Odeslána","Expired":"Expirována","Accepted":"Přijata","Declined":"Zamítnuta","Cancelled":"Zrušena","Status":"Stav","Type":"Typ","Loading request types":"Načítám typy žádostí","Error loading request types":"Chyba při načítání typů žádostí","No new requests to create":"Nejsou dostupné žádné žádosti","Requests":"Žádosti","Error loading requests":"Chyba při načítání žádostí","Loading requests":"Načítám žádosti","Delete record":"Smazat záznam","Edit record":"Upravit záznam","Publish draft":"Publikovat","Close":"Zavřít","Request":"Žádost","Pending":"Schvalována","request":"žádost","Error while submitting comment.":"Chyba při odesílání komentáře.","Add comment":"Přidat komentář","optional":"nepovinné","Your comment here...":"Váš komentář...","Comment was not created successfully.":"Komentář nebyl úspěšně vytvořen.","Comment":"Komentář","Error while submitting the comment":"Chyba při odesílání komentáře","Back to requests":"Zpět na žádosti","Record":"Záznam","preview":"náhled","to top":"na začátek stránky","Loading timeline...":"Načítám časovou osu...","Error while fetching timeline events":"Chyba při načítání událostí časové osy","commented":"komnetoval","icon":"ikona","this request":"tato žádost","Comment must be at least 1 character long.":"Komentář musí být alespoň 1 znak dlouhý.","Invalid format.":"Neplatný formát.","Request status":"Stav žádosti","Request record deletion":"Zažádat smazání záznamu","Record deletion requested":"Zažádáno smazání záznamu","Click to permanently delete the record.":"Klikněte pro trvalé smazání záznamu.","Request permission to delete the record.":"Zažádat o povolení smazat záznam.","Permission to delete record requested. You will be notified about the decision by email.":"Zažádáno o povolení k smazání záznamu. O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to permanently delete the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o trvalé smazání záznamu. Můžete žádost schválit nebo zamítnout.","Permission to delete record (including files) requested. ":"Zažádáno o povolení ke smazání záznamu (včetně souborů).","Submit request to get permission to delete the record.":"Odeslat žádost o povolení ke smazání záznamu.","Request edit access":"Žádost o úpravu záznamu","Edit access requested":"Zažádáno o úpravu záznamu","Click to start editing the metadata of the record.":"Klikněte pro začátek úprav metadat záznamu.","Request edit access to the record. You will be notified about the decision by email.":"Zažádat o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","Edit access requested. You will be notified about the decision by email.":"Zažádáno o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","You have been requested to grant edit access to the record.":"Byl jste požádán o udělení práva na upravení záznamu.","Edit access requested.":"Zažádáno o úpravu záznamu.","New Version":"Nová verze","Request requesting creation of new version of a published record.":"Žádost o vytvoření nové verze zveřejněného záznamu.","Request new version access":"Zažádat o vytvoření nové verzi","New version access requested":"Zažádáno o vytvoření nové verze","Click to start creating a new version of the record.":"Kliněte pro začátek vytváření nové verze záznamu.","Request permission to update record (including files). You will be notified about the decision by email.":"Zažádat o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","Permission to update record (including files) requested. You will be notified about the decision by email.":"Zažádáno o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to update the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o aktualizaci záznamu. Můžete žádost schválit nebo zamítnout.","Permission to update record (including files) requested. ":"Zažádáno o povolení aktualizace záznamu (včetně souborů).","Submit request to get edit access to the record.":"Odeslat žádost o povolení aktualizace záznamu (včetně souborů).","Resource version":"Verze záznamu","Write down the version (first, second…).":"Napište verzi (první, druhá…).","Submit for review":"Odeslat ke kontrole","Submitted for review":"Odesláno ke kontrole","Click to immediately publish the draft. The draft will be a subject to embargo as requested in the side panel. Note: The action is irreversible.":"Klikněte pro okamžité zveřejnění konceptu. Bylo-li zvoleno, záznam může podléhat embargu. Upozornění: Tuto akci není možno vzít zpět.","By submitting the draft for review you are requesting the publication of the draft. The draft will become locked and no further changes will be possible until the request is accepted or declined. You will be notified about the decision by email.":"Odesláním konceptu ke kontrole žádáte o zveřejnění konceptu. Koncept bude uzamčen a další změny nebudou možné, dokud nebude žádost přijata nebo zamítnuta. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. It is now locked and no further changes are possible. You will be notified about the decision by email.":"Koncept byl odeslán ke kontrole. Nyní je uzamčen a další změny nejsou možné. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. You can now accept or decline the request.":"Koncept Vám byl odeslán ke kontrole. Žádost můžete přijmout nebo zamítnout.","The draft has been submitted for review.":"Koncept byl odeslán ke kontrole.","Submit for review. After submitting the draft for review, it will be locked and no further modifications will be possible.":"Odeslat ke kontrole. Po odeslání konceptu ke kontrole bude záznam uzamčen a další změny nebudou možné.","Request not yet submitted.":"Žádost zatím nebyla odeslána.","Delete draft":"Smazat koncept","Request draft deletion":"Zažádat o smazání konceptu","Draft deletion requested":"Zažádáno o smazání konceptu","Click to permanently delete the draft.":"Klikněte pro trvalé smazání konceptu.","Request permission to delete the draft.":"Zažádat o povolení ke smazání konceptu.","Permission to delete draft requested. You will be notified about the decision by email.":"Zažádáno o povolení ke smazání konceptu. O rozhodnutí budete informováni emailem.","You have been asked to approve the request to permanently delete the draft. You can approve or reject the request.":"Byli jste požádáni o schválení žádosti o trvalé smazání konceptu. Můžete žádost schválit nebo odmítnout.","Permission to delete draft (including files) requested. ":"Zažádáno o povolení ke smazání konceptu (včetně souborů).","Submit request to get permission to delete the draft.":"Odeslat žádost o povolení ke smazání konceptu.","Request not created successfully. Please try again in a moment.":"Žádost nebyla úspěšně vytvořena. Zkuste to prosím za chvíli znovu.","Form fields could not be fetched.":"Formulářová pole nebyla načtena.","Request details":"Podrobnosti žádosti","Topic":"Téma","Request topic":"Téma žádosti","Are you sure you want to proceed? Once the action is completed, it will not be possible to undo it.":"Jste si jisti, že chcete pokračovat? Po dokončení akce ji nebude možné vrátit zpět.","Are you sure you wish to":"Jste si jisti, že chcete","Proceed":"Pokračovat","Are you sure you wish to proceed? After this request is accepted, it will not be possible to reverse the action.":"Jste si jisti, že chcete pokračovat? Po přijetí této žádosti nebude možné akci zvrátit.","The request could not be created due to validation errors. Please correct the errors and try again.":"Žádost nemohla být vytvořena kvůli validačním chybám. Prosím opravte chyby a zkuste to znovu.","The action could not be executed. Please try again in a moment.":"Akce nebyla úspěšně provedena. Zkuste to prosím za chvíli znovu.","Record has validation errors. Redirecting to form...":"Záznam obsahuje validační chyby. Přesměrování na formulář...","Comment was not submitted successfully.":"Komentář nebyl úspěšně odeslán.","Leave comment":"Zanechat komentář","Request deletion of draft":"Zažádat o smazání konceptu","It is highly recommended to provide an explanation for the rejection of the request. Note that it is always possible to provide explanation later on the request timeline.":"Důrazně doporučujeme poskytnout vysvětlení zamítnutí žádosti. Všimněte si, že je vždy možné poskytnout vysvětlení později v rámci časové osy žádosti.","Record preview":"Náhled záznamu","This action is irreversible. Are you sure you wish to accept this request?":"Tato akce je nevratná. Opravdu si přejete tuto žádost přijmout?","requestCreated":"vytvořil(a) tuto žádost","requestSubmitted":"odeslal(a) tuto žádost","requestCancelled":"zrušil(a) tuto žádost","requestAccepted":"přijal(a) tuto žádost","requestDeclined":"odmítl(a) tuto žádost","Request expired.":"Žádost vypršela","requestDeleted":"smazal(a) tuto žádost","requestCommented":"komentoval(a)","Permanently delete":"Trvale smazat","Keep the record":"Ponechat záznam","Publish":"Publikovat","Return for correction":"Vrátit k opravě","api.applicable-requests":"API pro vytváření žádostí","System user":"Systémový uživatel","Keep files.":"Ponechat soubory.","Keep files in the new version?":"Ponechat soubory v nové verzi?","You do not have permission to delete the draft.":"Nemáte právo smazat rozpracovaný záznam.","You do not have permission to delete the record.":"Nemáte právo smazat záznam.","You do not have permission to update the record.":"Nemáte právo zažádat o aktualizaci záznamu.","Edit metadata":"Upravit metadata","Keep files:":"Ponechat soubory:","If you choose yes, the current record's files will be linked to the new version of the record. Then you will be able to add/remove files in the form.":"Pokud zvolíte ano, soubory aktuálního záznamu budou propojeny s novou verzí záznamu. Poté budete moci přidávat/odstraňovat soubory ve formuláři.","No":"Ne","Yes":"Ano","Comment was not submitted successfully. Please try again in a moment.":"Komentář nebyl úspěšně odeslán. Zkuste to prosím za chvíli znovu.","User avatar":"Uživatelský avatar","Actions":"Akce","Edit":"Upravit","Comment was not edited successfully. Please try again in a moment.":"Komentář nebyl úspěšně upraven. Zkuste to prosím za chvíli znovu.","Comment was not deleted successfully. Please try again in a moment.":"Komentář nebyl úspěšně smazán. Zkuste to prosím za chvíli znovu.","Edited":"Upraveno","Delete comment":"Smazat komentář","Are you sure you want to delete this comment?":"Opravdu chcete tento komentář smazat?","deleted comment":"smazal(a) komentář","Remaining characters: ":"Zbývající znaky: "}
\ No newline at end of file
diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/en/LC_MESSAGES/translations.json b/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/en/LC_MESSAGES/translations.json
index 451c9835..facd6b47 100644
--- a/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/en/LC_MESSAGES/translations.json
+++ b/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/en/LC_MESSAGES/translations.json
@@ -1 +1 @@
-{"api.requests":"Requests API","requestCreated":"{{creatorLabel}} created this request","requestSubmitted":"{{creatorLabel}} submitted this request","requestCancelled":"{{creatorLabel}} canceled this request","requestAccepted":"{{creatorLabel}} accepted this request","requestDeclined":"{{creatorLabel}} declined this request","Request expired.":"Request expired","requestDeleted":"{{creatorLabel}} deleted this request","requestCommented":"{{creatorLabel}} commented","api.applicable-requests":"Applicable requests API"}
\ No newline at end of file
+{"api.requests":"Requests API","requestCreated":"created this request","requestSubmitted":"submitted this request","requestCancelled":"canceled this request","requestAccepted":"accepted this request","requestDeclined":"declined this request","Request expired.":"Request expired","requestDeleted":"deleted this request","requestCommented":"commented","api.applicable-requests":"Applicable requests API"}
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 3add4890..bd1ca409 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-requests
-version = 2.3.4
+version = 2.3.5
 description =
 authors = Ronald Krist <krist@cesnet.cz>
 readme = README.md
diff --git a/tests/test_requests/test_allowed_request_types_link_and_service.py b/tests/test_requests/test_allowed_request_types_link_and_service.py
index d762c12f..943cf750 100644
--- a/tests/test_requests/test_allowed_request_types_link_and_service.py
+++ b/tests/test_requests/test_allowed_request_types_link_and_service.py
@@ -301,12 +301,12 @@ def test_ui_serialization(
                 }
             },
             "description": "Request re-opening of published record",
-            "name": "Edit record",
+            "name": "Edit metadata",
             "dangerous": False,
             "editable": False,
             "has_form": False,
             "stateful_description": "Click to start editing the metadata of the record.",
-            "stateful_name": "Edit record",
+            "stateful_name": "Edit metadata",
         },
         {
             "type_id": "new_version",
diff --git a/tests/test_ui/test_ui_resource.py b/tests/test_ui/test_ui_resource.py
index 94f75df8..f4a1842d 100644
--- a/tests/test_ui/test_ui_resource.py
+++ b/tests/test_ui/test_ui_resource.py
@@ -41,7 +41,7 @@ def test_record_delete_request_present(
                     "create": f"https://127.0.0.1:5000/api/thesis/{topic['id']}/requests/edit_published_record"
                 }
             },
-            "name": "Edit record",
+            "name": "Edit metadata",
         }
         assert data["creatable_request_types"]["delete_published_record"] == {
             "description": "Request deletion of published record",