D123.1732569303.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D123.1732569303.diff
View Options

	diff --git a/src/matrix-room-list.cpp b/src/matrix-room-list.cpp
	--- a/src/matrix-room-list.cpp
	+++ b/src/matrix-room-list.cpp
	@@ -113,7 +113,11 @@
	const auto &roomB = allRooms[idB];
	auto aIsInvite = roomA.membership == Invite;
	auto bIsInvite = roomB.membership == Invite;
	- if (aIsInvite != bIsInvite) {
	+ auto aIsFavourite = roomA.tags().find("m.favourite") != nullptr;
	+ auto bIsFavourite = roomB.tags().find("m.favourite") != nullptr;
	+ if (aIsFavourite != bIsFavourite) {
	+ return aIsFavourite;
	+ } else if (aIsInvite != bIsInvite) {
	/**
	* if my membership in A is invite,
	* then the membership in B is not invite,
	diff --git a/src/tests/quick-tests/tst_EventView.qml b/src/tests/quick-tests/tst_EventView.qml
	--- a/src/tests/quick-tests/tst_EventView.qml
	+++ b/src/tests/quick-tests/tst_EventView.qml
	@@ -371,7 +371,7 @@
	function test_localEcho() {
	const indicator = findChild(eventView, 'localEchoIndicator');
	verify(indicator);
	- verify(indicator.source === 'state-sync');
	+ verify(indicator.icon.name === 'state-sync');
	verify(indicator.Accessible.name === l10n.get('event-sending'));

	const resendButton = findChild(eventView, 'resendEventButton');
	@@ -385,7 +385,7 @@
	const indicator = findChild(eventViewFailed, 'localEchoIndicator');
	verify(indicator);
	verify(indicator.visible);
	- verify(indicator.source === 'state-warning');
	+ verify(indicator.icon.name === 'state-warning');
	verify(indicator.Accessible.name === l10n.get('event-resend'));

	const menuComp = findChild(eventViewFailed, 'bubble').menuComp;