From 709711c3ca79883eead601f93a908d35ce4849c2 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Sat, 13 Jul 2024 15:14:50 +0000
Subject: [PATCH] Fix the InlineMessages for the room upgrades in RoomSettings

Fix the InlineMessages for the room upgrades in RoomSettings, they should show even if we aren't currently in the room. Resolve resource can join the predecessor/sucessor if required.

Closes network/neochat#618
---
 src/settings/RoomGeneralPage.qml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/settings/RoomGeneralPage.qml b/src/settings/RoomGeneralPage.qml
index f9ea7d0f0..bc816b56e 100644
--- a/src/settings/RoomGeneralPage.qml
+++ b/src/settings/RoomGeneralPage.qml
@@ -360,11 +360,13 @@ FormCard.FormCardPage {
     }
 
     Kirigami.InlineMessage {
+        Layout.fillWidth: true
         Layout.maximumWidth: Kirigami.Units.gridUnit * 30
+        Layout.topMargin: Kirigami.Units.largeSpacing
         Layout.alignment: Qt.AlignHCenter
         text: i18n("This room continues another conversation.")
         type: Kirigami.MessageType.Information
-        visible: room.predecessorId && room.connection.room(room.predecessorId)
+        visible: room.predecessorId
         actions: Kirigami.Action {
             text: i18n("See older messages…")
             onTriggered: {
@@ -374,11 +376,13 @@ FormCard.FormCardPage {
         }
     }
     Kirigami.InlineMessage {
+        Layout.fillWidth: true
         Layout.maximumWidth: Kirigami.Units.gridUnit * 30
+        Layout.topMargin: Kirigami.Units.largeSpacing
         Layout.alignment: Qt.AlignHCenter
         text: i18n("This room has been replaced.")
         type: Kirigami.MessageType.Information
-        visible: room.successorId && room.connection.room(room.successorId)
+        visible: room.successorId
         actions: Kirigami.Action {
             text: i18n("See new room…")
             onTriggered: {