Merge branch 'develop' into feature/5204_fix_federation_pill_appearance

* develop: MESSENGER-5410 change default setting fix pipeline MESSENGER-5410 add room federation setting MESSENGER-5410 add toggle to room settings and refactor toggle view MESSENGER-5410 refactor set federation acls when creating room # Conflicts: # Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
2026-04-30 05:06:58 +02:00 · 2024-01-15 13:59:48 +01:00
parent 8a53e455c7 99e51e0a7a
commit 5d71ab9fce
9 changed files with 372 additions and 67 deletions
@@ -127,6 +127,7 @@ class RoomInfoBasicView: UIView {
        } else {
            roomNameLabel.text = viewData.roomDisplayName
            isRoomFederated = false
+            pillImageView?.image = nil
        }
        
        roomNameLabel.numberOfLines = 0