Merge branch 'main' into survey-respondent-help-journey

ONSdigital · Jan 23, 2025 · 25ca32f · 25ca32f
2 parents d3c547a + 17ae7af
commit 25ca32f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/frontstage/templates/secure-messages/conversation-list.html b/frontstage/templates/secure-messages/conversation-list.html
@@ -55,7 +55,7 @@
                   "id": "message-link-" ~ loop.index,
                   "unread": true if message['unread'] else false,
                   "subject": {
-                                "url": url_for('secure_message_bp.view_conversation', thread_id=message.thread_id) ~ "#latest-message",
+                                "url": url_for('secure_message_bp.view_conversation', thread_id=message.thread_id),
                                 "text": message.subject
                                 },
                   "fromText": message.from or 'Unavailable',

diff --git a/frontstage/templates/secure-messages/conversation-view.html b/frontstage/templates/secure-messages/conversation-view.html
@@ -63,10 +63,6 @@ <h1 class="ons-u-fs-xl" name="page-messages-title">{{ subject }}</h1>
                     {% else %}
                         {% set msgType = 'sent' %}
                     {% endif %}
-                    {% if loop.last %}
-                        <div name="latest-message" id="latest-message">
-                    {% endif %}
-
                     {% call onsMessage({
                         "variant": msgType,
                         "id": 'conversation-message-' + loop.index|string,
@@ -82,9 +78,6 @@ <h1 class="ons-u-fs-xl" name="page-messages-title">{{ subject }}</h1>
                     }) %}
                         <span style="white-space:pre-line">{{ message.get('body') }}</span>
                     {% endcall %}
-                    {% if loop.last %}
-                        </div>
-                    {% endif %}
                 {% endfor %}
 
                 {% if not conversation_data.is_closed %}

diff --git a/frontstage/views/secure_messaging/message_get.py b/frontstage/views/secure_messaging/message_get.py
@@ -63,7 +63,7 @@ def view_conversation(session, thread_id):
 
         try:
             send_secure_message(secure_message_form, msg_to=msg_to)
-            thread_url = url_for("secure_message_bp.view_conversation", thread_id=thread_id) + "#latest-message"
+            thread_url = url_for("secure_message_bp.view_conversation", thread_id=thread_id)
             flash(Markup(f"Message sent. <a href={thread_url}>View Message</a>"))
             return redirect(url_for("secure_message_bp.view_conversation_list"))
         except InvalidSecureMessagingForm as e: