From ebf011fae951ddacb29d03cdc66bcd9287d74918 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 31 May 2023 05:13:25 +0000 Subject: [PATCH 1/4] Fix flaky Cypress test - invite-dialog.spec.ts (#11017) Co-authored-by: Kerry --- cypress/e2e/invite/invite-dialog.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/e2e/invite/invite-dialog.spec.ts b/cypress/e2e/invite/invite-dialog.spec.ts index 16275da1d81..80edfa411d6 100644 --- a/cypress/e2e/invite/invite-dialog.spec.ts +++ b/cypress/e2e/invite/invite-dialog.spec.ts @@ -169,7 +169,6 @@ describe("Invite dialog", function () { cy.get(".mx_RoomHeader").within(() => { cy.get(".mx_RoomHeader_name--textonly") .realHover() - .get(".mx_RoomHeader_name--textonly:hover") .should("have.css", "background-color", "rgba(0, 0, 0, 0)"); }); From 636b6884e830f9ef7592a5841273cf8a75a5f275 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 31 May 2023 12:48:36 +0100 Subject: [PATCH 2/4] Update Permalinks.ts --- src/utils/permalinks/Permalinks.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts index 6a76f66b0ec..db1114275ac 100644 --- a/src/utils/permalinks/Permalinks.ts +++ b/src/utils/permalinks/Permalinks.ts @@ -217,7 +217,7 @@ export class RoomPermalinkCreator { const aclEvent = this.room?.currentState.getStateEvents(EventType.RoomServerAcl, ""); if (aclEvent && aclEvent.getContent()) { const getRegex = (hostname: string): RegExp => - new RegExp("^" + utils.globToRegexp(hostname, false) + "$"); + new RegExp("^" + utils.globToRegexp(hostname) + "$"); const denied = aclEvent.getContent<{ deny: string[] }>().deny; if (Array.isArray(denied)) { From a9abf58ac3707a914d238a5b1cd22105e8919477 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 31 May 2023 12:55:14 +0100 Subject: [PATCH 3/4] Update Permalinks.ts --- src/utils/permalinks/Permalinks.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts index db1114275ac..56740e96a41 100644 --- a/src/utils/permalinks/Permalinks.ts +++ b/src/utils/permalinks/Permalinks.ts @@ -216,8 +216,7 @@ export class RoomPermalinkCreator { if (this.room?.currentState) { const aclEvent = this.room?.currentState.getStateEvents(EventType.RoomServerAcl, ""); if (aclEvent && aclEvent.getContent()) { - const getRegex = (hostname: string): RegExp => - new RegExp("^" + utils.globToRegexp(hostname) + "$"); + const getRegex = (hostname: string): RegExp => new RegExp("^" + utils.globToRegexp(hostname) + "$"); const denied = aclEvent.getContent<{ deny: string[] }>().deny; if (Array.isArray(denied)) { From 176daad49f9bdb607070df56374455e98f002346 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 31 May 2023 13:20:26 +0100 Subject: [PATCH 4/4] Fix room list notification badges going missing in compact layout (#11022) --- res/css/views/rooms/_EventTile.pcss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index 75aec20489a..0aa75129917 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1453,12 +1453,14 @@ $left-gutter: 64px; margin-bottom: $spacing-4; /* 1/4 of the non-compact margin-bottom */ } } - } - &[data-shape="ThreadsList"][data-notification]::before, - .mx_NotificationBadge { - /* stylelint-disable-next-line declaration-colon-space-after */ - inset-block-start: calc($notification-inset-block-start - var(--MatrixChat_useCompactLayout_group-padding-top)); + &[data-shape="ThreadsList"][data-notification]::before, + .mx_NotificationBadge { + /* stylelint-disable-next-line declaration-colon-space-after */ + inset-block-start: calc( + $notification-inset-block-start - var(--MatrixChat_useCompactLayout_group-padding-top) + ); + } } }