diff --git a/CHANGELOG.md b/CHANGELOG.md index 69d8b94b4..b11fb15c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 5.2.0 - undefined +## 5.2.0 - 2023-12-22 ### Fixed - Download path and emojis size settings @@ -14,7 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Display all call logs on default account. - Avoid sending composing when openning chat. - Crashes. -- Update SDK to 5.3 +- Double chat rooms. +- Update SDK to 5.3.1 ### Added - Dedicated call history view. diff --git a/linphone-app/ui/modules/Linphone/Chat/Message.qml b/linphone-app/ui/modules/Linphone/Chat/Message.qml index 9084c94d4..e796e219f 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Message.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Message.qml @@ -135,15 +135,6 @@ Item { } } - ChatDeliveries{ - id: deliveryLayout - anchors.top:rectangle.bottom - anchors.left:parent.left - anchors.right:parent.right - anchors.rightMargin: 50 - - chatMessageModel: $chatEntry - } Loader{ id: reactionLoader anchors.top: rectangle.bottom @@ -165,6 +156,15 @@ Item { onReactionsClicked: container.reactionsClicked($chatEntry) } } + ChatDeliveries{ + id: deliveryLayout + anchors.top: reactionLoader.active ? reactionLoader.bottom : rectangle.bottom + anchors.left:parent.left + anchors.right:parent.right + anchors.rightMargin: 50 + + chatMessageModel: $chatEntry + } ActionButton { id: menuButton diff --git a/linphone-sdk b/linphone-sdk index 9bd7b11d4..cc73b680e 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 9bd7b11d47b09bcef967ef26885488cdb5b9f6f2 +Subproject commit cc73b680eddd9e840b91eede2cfe9b9f20f70d06