diff --git a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png
index 0568892b39..d07fc6d969 100644
Binary files a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png and b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/connectivity-lost-linux.png differ
diff --git a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png
index c528eb619a..f0ef19d724 100644
Binary files a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png and b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/consent-linux.png differ
diff --git a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png
index 304a425466..b1a20f0315 100644
Binary files a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png and b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/local-room-create-failed-linux.png differ
diff --git a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png
index fe23d40790..df2ec6e3b2 100644
Binary files a/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png and b/apps/web/playwright/snapshots/room/room-status-bar.spec.ts/message-failed-linux.png differ
diff --git a/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
index 537aa6b422..dd83b7d0c5 100644
--- a/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -213,12 +213,12 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
Could not start a chat with this user
renders a critical banner 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
diff --git a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.module.css b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.module.css
index b0e85609b6..8780b0cf66 100644
--- a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.module.css
+++ b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.module.css
@@ -6,6 +6,18 @@
}
}
-.description {
- color: var(--cpd-color-text-secondary);
+.secondaryAction svg {
+ color: var(--cpd-color-text-secondary) !important;
+}
+
+.primaryAction svg {
+ color: var(--cpd-color-text-on-solid-primary) !important;
+}
+
+.title {
+ color: var(--cpd-color-text-critical-primary);
+}
+
+.description {
+ color: var(--cpd-color-text-primary);
}
diff --git a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx
index b0147afaec..4a891645c3 100644
--- a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx
+++ b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx
@@ -47,6 +47,12 @@ const meta = {
onRetryRoomCreationClick: fn(),
onTermsAndConditionsClicked: fn(),
},
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/design/rTaQE2nIUSLav4Tg3nozq7/Compound-Web-Components?node-id=11019-2353&t=p8SkJGh9tJx09MTJ-4",
+ },
+ },
} satisfies Meta
;
export default meta;
diff --git a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx
index fa60e88ff5..b5ed34f1db 100644
--- a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx
+++ b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx
@@ -161,10 +161,10 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
return (
-
+
{_t("room|status_bar|server_connectivity_lost_title")}
-
+
{_t("room|status_bar|server_connectivity_lost_description")}
@@ -179,7 +179,8 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
actions={
): JSX
}
>
-
+
{_t("room|status_bar|requires_consent_agreement_title")}
@@ -219,13 +220,13 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
}
>
-
+
{{
monthly_active_user: _t("room|status_bar|monthly_user_limit_reached_title"),
hs_disabled: _t("room|status_bar|homeserver_blocked_title"),
}[snapshot.resourceLimit] || _t("room|status_bar|exceeded_resource_limit_title")}
-
+
{_t("room|status_bar|exceeded_resource_limit_description")}
@@ -240,8 +241,8 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
actions={
@@ -249,7 +250,7 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
}
>
-
+
{_t("room|status_bar|failed_to_create_room_title")}
@@ -267,9 +268,10 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
{vm.onDeleteAllClick && (
{_t("room|status_bar|delete_all")}
@@ -278,11 +280,11 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
{vm.onResendAllClick && (
{_t("room|status_bar|retry_all")}
@@ -293,12 +295,10 @@ export function RoomStatusBarView({ vm }: Readonly): JSX
aria-labelledby={bannerTitleId}
>
-
+
{_t("room|status_bar|some_messages_not_sent")}
-
- {_t("room|status_bar|select_messages_to_retry")}
-
+ {_t("room|status_bar|select_messages_to_retry")}
);
diff --git a/packages/shared-components/src/room/RoomStatusBar/__snapshots__/RoomStatusBarView.test.tsx.snap b/packages/shared-components/src/room/RoomStatusBar/__snapshots__/RoomStatusBarView.test.tsx.snap
index 71bf744b3b..46fbdd824c 100644
--- a/packages/shared-components/src/room/RoomStatusBar/__snapshots__/RoomStatusBarView.test.tsx.snap
+++ b/packages/shared-components/src/room/RoomStatusBar/__snapshots__/RoomStatusBarView.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`RoomStatusBarView > renders connection lost 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -31,13 +31,13 @@ exports[`RoomStatusBarView > renders connection lost 1`] = `
class="container"
>
Connectivity to the server has been lost.
Sent messages will be stored until your connection has returned.
@@ -70,7 +70,7 @@ exports[`RoomStatusBarView > renders consent link 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -81,7 +81,7 @@ exports[`RoomStatusBarView > renders consent link 1`] = `
class="container"
>
You can't send any messages until you review and agree to our terms and conditions.
@@ -92,8 +92,8 @@ exports[`RoomStatusBarView > renders consent link 1`] = `
class="actions"
>
renders local room error 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -136,7 +136,7 @@ exports[`RoomStatusBarView > renders local room error 1`] = `
class="content"
>
Could not start a chat with this user
@@ -146,8 +146,8 @@ exports[`RoomStatusBarView > renders local room error 1`] = `
class="actions"
>
renders resource limit error 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -202,13 +202,13 @@ exports[`RoomStatusBarView > renders resource limit error 1`] = `
class="container"
>
Your message wasn't sent because this homeserver has been blocked by its administrator.
Please contact your service administrator to continue using the service.
@@ -254,7 +254,7 @@ exports[`RoomStatusBarView > renders unsent messages 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -265,13 +265,13 @@ exports[`RoomStatusBarView > renders unsent messages 1`] = `
class="container"
>
Some of your messages have not been sent
You can select all or individual messages to retry or delete
@@ -282,7 +282,7 @@ exports[`RoomStatusBarView > renders unsent messages 1`] = `
>
renders unsent messages 1`] = `
renders unsent messages and deletes all 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -360,13 +360,13 @@ exports[`RoomStatusBarView > renders unsent messages and deletes all 1`] = `
class="container"
>
Some of your messages have not been sent
You can select all or individual messages to retry or delete
@@ -377,7 +377,7 @@ exports[`RoomStatusBarView > renders unsent messages and deletes all 1`] = `
>
renders unsent messages and deletes all 1`] = `
renders unsent messages and resends all 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
@@ -455,13 +455,13 @@ exports[`RoomStatusBarView > renders unsent messages and resends all 1`] = `
class="container"
>
Some of your messages have not been sent
You can select all or individual messages to retry or delete
@@ -472,7 +472,7 @@ exports[`RoomStatusBarView > renders unsent messages and resends all 1`] = `
>
renders unsent messages and resends all 1`] = `