diff --git a/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png b/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png index 5fcf0e0b6c..e823f84f99 100644 Binary files a/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png and b/playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png index 8ac6a451c1..950bc3a0eb 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png differ diff --git a/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png b/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png index ba425f4d88..760e2b181a 100644 Binary files a/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png and b/playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png differ diff --git a/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png index d21b9dc95f..e49db5d408 100644 Binary files a/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png and b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png differ diff --git a/playwright/snapshots/register/register.spec.ts/registration-linux.png b/playwright/snapshots/register/register.spec.ts/registration-linux.png index 09722b20b0..1cca0eb56b 100644 Binary files a/playwright/snapshots/register/register.spec.ts/registration-linux.png and b/playwright/snapshots/register/register.spec.ts/registration-linux.png differ diff --git a/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png b/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png index cb903f1ce4..92839f2ad9 100644 Binary files a/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png and b/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png differ diff --git a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Chats-has-a-new-look--linux.png b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Chats-has-a-new-look--linux.png index 1e59f07e35..3c471ad838 100644 Binary files a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Chats-has-a-new-look--linux.png and b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Chats-has-a-new-look--linux.png differ diff --git a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-We’ve-refreshed-your-sounds-linux.png b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-We’ve-refreshed-your-sounds-linux.png index 35b18e76ad..d10f97a670 100644 Binary files a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-We’ve-refreshed-your-sounds-linux.png and b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-We’ve-refreshed-your-sounds-linux.png differ diff --git a/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png index 93d8044a3d..d7126166d7 100644 Binary files a/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/invite-teammates-dialog-linux.png differ diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png index ca8e0971c8..ac19c94bdb 100644 Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-room-view-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png index 06613ff9f5..1a0a852cd1 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png index 1b8184039f..cf5e66851c 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png index d808a53f12..d9359dab70 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png index eee2840d2e..7c660888e6 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png index 077bea616a..040b1ef72c 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png index 01cb599729..63eb2da98f 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png index ff1827b93d..f943108d73 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png index ab181627f7..914e10dff2 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png index 1bde77b8c5..912fa679b8 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png index a4630bd69c..9fbe9c79e1 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png index 5788816cbc..39fffefc70 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png index eee2840d2e..7c660888e6 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png index 2552b6d554..3684f57b11 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png index ade0bfdc06..39c40e0b13 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png index 533d5632a3..74a2028787 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-padding-modern-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png index 746523e606..f6785d89c9 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/hidden-event-line-zero-padding-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png index 26e67b37de..8949324613 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/image-in-timeline-default-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png index 0c1d057ba1..fdcbb28133 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-bubble-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png index 789056d04d..78196d2632 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-irc-layout-linux.png differ diff --git a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png index d0be96b6e2..df6aca3083 100644 Binary files a/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/long-strings-with-reply-modern-layout-linux.png differ diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss index 589e30b515..25989fd937 100644 --- a/res/css/structures/_SpaceRoomView.pcss +++ b/res/css/structures/_SpaceRoomView.pcss @@ -162,7 +162,7 @@ Please see LICENSE files in the repository root for full details. width: 16px; background: var(--cpd-color-icon-on-solid-primary); mask-size: 16px; - mask-image: url("$(res)/img/element-icons/room/invite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-add.svg"); } } @@ -232,7 +232,7 @@ Please see LICENSE files in the repository root for full details. text-decoration: underline; &::before { - mask-image: url("$(res)/img/element-icons/room/invite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-add.svg"); background-color: var(--cpd-color-icon-primary); } } diff --git a/res/css/views/auth/_AuthBody.pcss b/res/css/views/auth/_AuthBody.pcss index ad47ca8dc3..f5f0f9cce5 100644 --- a/res/css/views/auth/_AuthBody.pcss +++ b/res/css/views/auth/_AuthBody.pcss @@ -237,7 +237,7 @@ Please see LICENSE files in the repository root for full details. font-size: $font-15px; line-height: $font-24px; - .mx_InlineSpinner img { + .mx_InlineSpinner svg { vertical-align: sub; margin-right: 5px; } diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss index 19a40d24a5..3f598c26aa 100644 --- a/res/css/views/dialogs/_SpotlightDialog.pcss +++ b/res/css/views/dialogs/_SpotlightDialog.pcss @@ -454,7 +454,7 @@ Please see LICENSE files in the repository root for full details. } .mx_SpotlightDialog_searchMessages::before { - mask-image: url("$(res)/img/element-icons/room/search-inset.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chat.svg"); } .mx_SpotlightDialog_otherSearches_messageSearchText { diff --git a/res/css/views/elements/_InlineSpinner.pcss b/res/css/views/elements/_InlineSpinner.pcss index 9f7ae2ab52..5df3bd9904 100644 --- a/res/css/views/elements/_InlineSpinner.pcss +++ b/res/css/views/elements/_InlineSpinner.pcss @@ -7,14 +7,10 @@ Please see LICENSE files in the repository root for full details. .mx_InlineSpinner { display: inline; -} -.mx_InlineSpinner img, -.mx_InlineSpinner_icon { - margin: 0px 6px; - vertical-align: -3px; -} - -.mx_InlineSpinner_icon { - display: inline-block !important; /* Override regular mx_Spinner_icon */ + svg { + margin: 0px 6px; + vertical-align: -3px; + display: inline-block; + } } diff --git a/res/css/views/elements/_ServerPicker.pcss b/res/css/views/elements/_ServerPicker.pcss index aced0976ce..5d04482334 100644 --- a/res/css/views/elements/_ServerPicker.pcss +++ b/res/css/views/elements/_ServerPicker.pcss @@ -25,13 +25,11 @@ Please see LICENSE files in the repository root for full details. .mx_ServerPicker_help { width: 20px; height: 20px; - background-color: $icon-button-color; border-radius: 10px; grid-column: 2; grid-row: 1; margin-left: auto; text-align: center; - color: #ffffff; font-size: 16px; position: relative; @@ -45,8 +43,8 @@ Please see LICENSE files in the repository root for full details. mask-position: center; mask-size: contain; mask-repeat: no-repeat; - mask-image: url("$(res)/img/element-icons/i.svg"); - background: #ffffff; + mask-image: url("@vector-im/compound-design-tokens/icons/info.svg"); + background: $icon-button-color; } } diff --git a/res/css/views/elements/_Spinner.pcss b/res/css/views/elements/_Spinner.pcss index 1280cc888c..a5cf725d3e 100644 --- a/res/css/views/elements/_Spinner.pcss +++ b/res/css/views/elements/_Spinner.pcss @@ -19,39 +19,3 @@ Please see LICENSE files in the repository root for full details. .mx_MatrixChat_middlePanel .mx_Spinner { height: auto; } - -@keyframes spin { - from { - transform: rotateZ(0deg); - } - to { - transform: rotateZ(360deg); - } -} - -.mx_Spinner_icon { - background-color: $quinary-content; - mask: url("$(res)/img/spinner/spinner-background.svg"); - mask-size: 100%; - - display: flex; - justify-content: center; - align-items: center; - - width: 100%; - height: 100%; - - &::before { - background-color: $secondary-content; - mask: url("$(res)/img/spinner/spinner-foreground.svg"); - mask-size: 100%; - - width: 100%; - height: 100%; - - content: ""; - display: flex; - - animation: 1s linear spin infinite; - } -} diff --git a/res/css/views/right_panel/_ExtensionsCard.pcss b/res/css/views/right_panel/_ExtensionsCard.pcss index c98fa3e9dc..10a9cb2d56 100644 --- a/res/css/views/right_panel/_ExtensionsCard.pcss +++ b/res/css/views/right_panel/_ExtensionsCard.pcss @@ -89,7 +89,7 @@ Please see LICENSE files in the repository root for full details. right: 8px; &::before { - mask-image: url("$(res)/img/element-icons/room/pin-upright.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/pin-solid.svg"); } } diff --git a/res/css/views/rooms/_NewRoomIntro.pcss b/res/css/views/rooms/_NewRoomIntro.pcss index 4f704facd9..9f18e790fd 100644 --- a/res/css/views/rooms/_NewRoomIntro.pcss +++ b/res/css/views/rooms/_NewRoomIntro.pcss @@ -40,7 +40,7 @@ Please see LICENSE files in the repository root for full details. } .mx_NewRoomIntro_inviteButton::before { - mask-image: url("$(res)/img/element-icons/room/invite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-add.svg"); } } diff --git a/res/css/views/rooms/_NotificationBadge.pcss b/res/css/views/rooms/_NotificationBadge.pcss index 2066b81f0a..5f76d82bfa 100644 --- a/res/css/views/rooms/_NotificationBadge.pcss +++ b/res/css/views/rooms/_NotificationBadge.pcss @@ -56,8 +56,8 @@ Please see LICENSE files in the repository root for full details. } &.mx_NotificationBadge_knocked { - mask-image: url("$(res)/img/element-icons/ask-to-join.svg"); - width: 12px; + mask-image: url("@vector-im/compound-design-tokens/icons/ask-to-join.svg"); + width: 16px; height: 16px; } diff --git a/res/css/views/voip/_LegacyCallViewHeader.pcss b/res/css/views/voip/_LegacyCallViewHeader.pcss index d3a3d76cee..234ecba41f 100644 --- a/res/css/views/voip/_LegacyCallViewHeader.pcss +++ b/res/css/views/voip/_LegacyCallViewHeader.pcss @@ -66,7 +66,7 @@ Please see LICENSE files in the repository root for full details. &.mx_LegacyCallViewHeader_button_pin { &::before { - mask-image: url("$(res)/img/element-icons/room/pin-upright.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/pin-solid.svg"); } } diff --git a/res/img/element-icons/ask-to-join.svg b/res/img/element-icons/ask-to-join.svg deleted file mode 100644 index e8d447cfff..0000000000 --- a/res/img/element-icons/ask-to-join.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/res/img/element-icons/i.svg b/res/img/element-icons/i.svg deleted file mode 100644 index 6674f1ed8d..0000000000 --- a/res/img/element-icons/i.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/invite.svg b/res/img/element-icons/room/invite.svg deleted file mode 100644 index 2819553ab3..0000000000 --- a/res/img/element-icons/room/invite.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/pin-upright.svg b/res/img/element-icons/room/pin-upright.svg deleted file mode 100644 index 9297f62a02..0000000000 --- a/res/img/element-icons/room/pin-upright.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/element-icons/room/search-inset.svg b/res/img/element-icons/room/search-inset.svg deleted file mode 100644 index 699cdd1d00..0000000000 --- a/res/img/element-icons/room/search-inset.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/spinner/spinner-background.svg b/res/img/spinner/spinner-background.svg deleted file mode 100644 index 085abbfc60..0000000000 --- a/res/img/spinner/spinner-background.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/spinner/spinner-foreground.svg b/res/img/spinner/spinner-foreground.svg deleted file mode 100644 index 8c1c83aa94..0000000000 --- a/res/img/spinner/spinner-foreground.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/components/structures/LargeLoader.tsx b/src/components/structures/LargeLoader.tsx index 57f0f949e9..dce73a9eb4 100644 --- a/src/components/structures/LargeLoader.tsx +++ b/src/components/structures/LargeLoader.tsx @@ -20,7 +20,7 @@ interface LargeLoaderProps { export const LargeLoader: React.FC = ({ text }) => { return (
- +
{text}
); diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx index ef4f46df96..e2b05c54f1 100644 --- a/src/components/structures/SpaceHierarchy.tsx +++ b/src/components/structures/SpaceHierarchy.tsx @@ -150,7 +150,7 @@ const Tile: React.FC = ({ tabIndex={isActive ? 0 : -1} title={_t("space|joining_space")} > - + ); } else if (joinedRoom || room.join_rule === JoinRule.Knock) { diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx index 171bd955a1..0a5080869b 100644 --- a/src/components/structures/auth/ForgotPassword.tsx +++ b/src/components/structures/auth/ForgotPassword.tsx @@ -373,7 +373,7 @@ export default class ForgotPassword extends React.Component { public renderSetPassword(): JSX.Element { const submitButtonChild = - this.state.phase === Phase.ResettingPassword ? : _t("auth|reset_password_action"); + this.state.phase === Phase.ResettingPassword ? : _t("auth|reset_password_action"); return ( <> diff --git a/src/components/structures/auth/forgot-password/EnterEmail.tsx b/src/components/structures/auth/forgot-password/EnterEmail.tsx index 9e7d6ae5a6..643cb6c963 100644 --- a/src/components/structures/auth/forgot-password/EnterEmail.tsx +++ b/src/components/structures/auth/forgot-password/EnterEmail.tsx @@ -38,7 +38,7 @@ export const EnterEmail: React.FC = ({ onLoginClick, onSubmitForm, }) => { - const submitButtonChild = loading ? : _t("auth|forgot_password_send_email"); + const submitButtonChild = loading ? : _t("auth|forgot_password_send_email"); const emailFieldRef = useRef(null); diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx index a9bf8b7597..6f1e74b63d 100644 --- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx +++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx @@ -460,7 +460,7 @@ export class EmailIdentityAuthEntry extends React.Component< a: (text: string) => ( - {text} + {text} ), @@ -875,7 +875,7 @@ export class SSOAuthEntry extends React.Component {this.props.busy ? ( - + ) : ( <> {cancelButton} diff --git a/src/components/views/context_menus/RoomGeneralContextMenu.tsx b/src/components/views/context_menus/RoomGeneralContextMenu.tsx index ac06958c71..fdfabdeee9 100644 --- a/src/components/views/context_menus/RoomGeneralContextMenu.tsx +++ b/src/components/views/context_menus/RoomGeneralContextMenu.tsx @@ -17,6 +17,7 @@ import { MarkAsReadIcon, MarkAsUnreadIcon, LeaveIcon, + UserAddIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts"; @@ -43,7 +44,6 @@ import { shouldShowComponent } from "../../../customisations/helpers/UIComponent import { UIComponent } from "../../../settings/UIFeature"; import { DeveloperToolsOption } from "./DeveloperToolsOption"; import { useSettingValue } from "../../../hooks/useSettings"; -import { Icon as InviteIcon } from "../../../../res/img/element-icons/room/invite.svg"; export interface RoomGeneralContextMenuProps extends IContextMenuProps { room: Room; @@ -190,7 +190,7 @@ export const RoomGeneralContextMenu: React.FC = ({ onPostInviteClick, )} label={_t("action|invite")} - icon={} + icon={} /> ); } diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx index 45a901157c..49d8275ab6 100644 --- a/src/components/views/context_menus/SpaceContextMenu.tsx +++ b/src/components/views/context_menus/SpaceContextMenu.tsx @@ -15,6 +15,7 @@ import { LeaveIcon, SearchIcon, PreferencesIcon, + UserAddIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; import { type IProps as IContextMenuProps } from "../../structures/ContextMenu"; @@ -40,7 +41,6 @@ import { shouldShowComponent } from "../../../customisations/helpers/UIComponent import { UIComponent } from "../../../settings/UIFeature"; import PosthogTrackers from "../../../PosthogTrackers"; import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload"; -import { Icon as InviteIcon } from "../../../../res/img/element-icons/room/invite.svg"; interface IProps extends IContextMenuProps { space?: Room; @@ -69,7 +69,7 @@ const SpaceContextMenu: React.FC = ({ space, hideHeader, onFinished, ... } + icon={} label={_t("action|invite")} onClick={onInviteClick} /> diff --git a/src/components/views/dialogs/ExportDialog.tsx b/src/components/views/dialogs/ExportDialog.tsx index a1b6daa721..c615f106fc 100644 --- a/src/components/views/dialogs/ExportDialog.tsx +++ b/src/components/views/dialogs/ExportDialog.tsx @@ -391,7 +391,7 @@ const ExportDialog: React.FC = ({ room, onFinished }) => { {isExporting ? (
- +

{exportProgressText}

{ const entries = c.transactions .filter((t) => t.status === TransactionStatus.Error || t.didPreviouslyFail) .map((t, j) => { - let button = ; + let button = ; if (t.status === TransactionStatus.Error) { button = ( t.run()}> diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx index d9f2f98390..f4e33ce155 100644 --- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx +++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx @@ -1279,7 +1279,7 @@ const SpotlightDialog: React.FC = ({ initialText = "", initialFilter = n aria-label={_t("action|search")} aria-describedby="mx_SpotlightDialog_keyboardPrompt" /> - {(publicRoomsLoading || peopleLoading || profileLoading) && } + {(publicRoomsLoading || peopleLoading || profileLoading) && }
{ @@ -23,15 +22,14 @@ export default class InlineSpinner extends React.PureComponent { public render(): React.ReactNode { return ( -
-
+ - {this.props.children} -
-
+ role="progressbar" + data-testid="spinner" + /> + ); } } diff --git a/src/components/views/elements/JoinRuleDropdown.tsx b/src/components/views/elements/JoinRuleDropdown.tsx index 3ba27c1988..f40493854e 100644 --- a/src/components/views/elements/JoinRuleDropdown.tsx +++ b/src/components/views/elements/JoinRuleDropdown.tsx @@ -8,11 +8,15 @@ Please see LICENSE files in the repository root for full details. import React, { type ReactElement } from "react"; import { JoinRule } from "matrix-js-sdk/src/matrix"; -import { GroupIcon, LockSolidIcon, PublicIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; +import { + GroupIcon, + LockSolidIcon, + PublicIcon, + AskToJoinIcon, +} from "@vector-im/compound-design-tokens/assets/web/icons"; import Dropdown from "./Dropdown"; import { type NonEmptyArray } from "../../../@types/common"; -import { Icon as AskToJoinIcon } from "../../../../res/img/element-icons/ask-to-join.svg"; interface IProps { value: JoinRule; diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx index 1df76f645d..fc9574b411 100644 --- a/src/components/views/elements/MiniAvatarUploader.tsx +++ b/src/components/views/elements/MiniAvatarUploader.tsx @@ -87,11 +87,7 @@ const MiniAvatarUploader: React.FC = ({ {children}
- {busy ? ( - - ) : ( - - )} + {busy ? : }
diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx index 9ff1c1e017..d81ff992ee 100644 --- a/src/components/views/elements/ReplyChain.tsx +++ b/src/components/views/elements/ReplyChain.tsx @@ -246,7 +246,7 @@ export default class ReplyChain extends React.Component {

); } else if (this.state.loading) { - header = ; + header = ; } const { isQuoteExpanded } = this.props; diff --git a/src/components/views/elements/Spinner.tsx b/src/components/views/elements/Spinner.tsx index ab23135a88..a3ba625e89 100644 --- a/src/components/views/elements/Spinner.tsx +++ b/src/components/views/elements/Spinner.tsx @@ -7,24 +7,23 @@ Please see LICENSE files in the repository root for full details. */ import React from "react"; +import { InlineSpinner } from "@vector-im/compound-web"; import { _t } from "../../../languageHandler"; interface IProps { - w?: number; - h?: number; + size?: number; message?: string; onFinished: any; // XXX: Spinner pretends to be a dialog so it must accept an onFinished, but it never calls it } export default class Spinner extends React.PureComponent { public static defaultProps: Partial = { - w: 32, - h: 32, + size: 32, }; public render(): React.ReactNode { - const { w, h, message } = this.props; + const { size, message } = this.props; return (
{message && ( @@ -32,13 +31,7 @@ export default class Spinner extends React.PureComponent {
{message}
  )} -
+
); } diff --git a/src/components/views/location/MapFallback.tsx b/src/components/views/location/MapFallback.tsx index 59968d421e..d6b5f8e18e 100644 --- a/src/components/views/location/MapFallback.tsx +++ b/src/components/views/location/MapFallback.tsx @@ -22,7 +22,7 @@ const MapFallback: React.FC = ({ className, isLoading, children, ...rest return (
- {isLoading ? : } + {isLoading ? : } {children}
); diff --git a/src/components/views/messages/DownloadActionButton.tsx b/src/components/views/messages/DownloadActionButton.tsx index 0072dd42a0..af6ad8cc1d 100644 --- a/src/components/views/messages/DownloadActionButton.tsx +++ b/src/components/views/messages/DownloadActionButton.tsx @@ -43,7 +43,7 @@ export default function DownloadActionButton({ mxEvent, mediaEventHelperGet }: I if (!canDownload) return null; - const spinner = loading ? : undefined; + const spinner = loading ? : undefined; const classes = classNames({ mx_MessageActionBar_iconButton: true, mx_MessageActionBar_downloadButton: true, diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx index 0e671b8e87..788a93c813 100644 --- a/src/components/views/messages/MImageBody.tsx +++ b/src/components/views/messages/MImageBody.tsx @@ -628,7 +628,7 @@ export class MImageBodyInner extends React.Component { return ; } } - return ; + return ; } // Overridden by MStickerBody diff --git a/src/components/views/messages/MPollBody.tsx b/src/components/views/messages/MPollBody.tsx index 983a4d5147..83b7f5c415 100644 --- a/src/components/views/messages/MPollBody.tsx +++ b/src/components/views/messages/MPollBody.tsx @@ -365,7 +365,7 @@ export default class MPollBody extends React.Component {
{totalText} - {isFetchingResponses && } + {isFetchingResponses && }
); diff --git a/src/components/views/rooms/LegacyRoomListHeader.tsx b/src/components/views/rooms/LegacyRoomListHeader.tsx index 4e3329f59d..a3c96ff60f 100644 --- a/src/components/views/rooms/LegacyRoomListHeader.tsx +++ b/src/components/views/rooms/LegacyRoomListHeader.tsx @@ -9,7 +9,12 @@ Please see LICENSE files in the repository root for full details. import { ClientEvent, EventType, type Room, RoomEvent, RoomType } from "matrix-js-sdk/src/matrix"; import React, { type JSX, useContext, useEffect, useState } from "react"; import { Tooltip } from "@vector-im/compound-web"; -import { PlusIcon, UserAddSolidIcon, SearchIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; +import { + PlusIcon, + UserAddSolidIcon, + SearchIcon, + UserAddIcon, +} from "@vector-im/compound-design-tokens/assets/web/icons"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import { shouldShowComponent } from "../../../customisations/helpers/UIComponents"; @@ -52,7 +57,6 @@ import IconizedContextMenu, { import SpaceContextMenu from "../context_menus/SpaceContextMenu"; import InlineSpinner from "../elements/InlineSpinner"; import { HomeButtonContextMenu } from "../spaces/SpacePanel"; -import { Icon as InviteIcon } from "../../../../res/img/element-icons/room/invite.svg"; import { Icon as HashVideoIcon } from "../../../../res/img/element-icons/roomlist/hash-video.svg"; const contextMenuBelow = (elementRect: DOMRect): MenuProps => { @@ -181,7 +185,7 @@ const LegacyRoomListHeader: React.FC = ({ onVisibilityChange }) => { inviteOption = ( } + icon={} onClick={(e) => { e.preventDefault(); e.stopPropagation(); diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx index fe0a64b162..01ef84d8b8 100644 --- a/src/components/views/rooms/RoomPreviewBar.tsx +++ b/src/components/views/rooms/RoomPreviewBar.tsx @@ -15,6 +15,7 @@ import { RoomViewLifecycle, } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle"; import { Button } from "@vector-im/compound-web"; +import { AskToJoinIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import dis from "../../../dispatcher/dispatcher"; @@ -29,7 +30,6 @@ import RoomAvatar from "../avatars/RoomAvatar"; import SettingsStore from "../../../settings/SettingsStore"; import { UIFeature } from "../../../settings/UIFeature"; import { ModuleRunner } from "../../../modules/ModuleRunner"; -import { Icon as AskToJoinIcon } from "../../../../res/img/element-icons/ask-to-join.svg"; import Field from "../elements/Field"; import { ModuleApi } from "../../../modules/Api.ts"; @@ -371,7 +371,7 @@ class RoomPreviewBar extends React.Component { if (this.props.previewLoading) { footer = (
- + {_t("room|loading_preview")}
); diff --git a/src/components/views/settings/devices/DeviceDetailHeading.tsx b/src/components/views/settings/devices/DeviceDetailHeading.tsx index 78c9574486..7d3019ab6f 100644 --- a/src/components/views/settings/devices/DeviceDetailHeading.tsx +++ b/src/components/views/settings/devices/DeviceDetailHeading.tsx @@ -103,7 +103,7 @@ const DeviceNameEditor: React.FC void }> = ({ devic > {_t("action|cancel")} - {isLoading && } + {isLoading && }
); diff --git a/src/components/views/settings/devices/DeviceDetails.tsx b/src/components/views/settings/devices/DeviceDetails.tsx index 52f5800dac..55fa8cca32 100644 --- a/src/components/views/settings/devices/DeviceDetails.tsx +++ b/src/components/views/settings/devices/DeviceDetails.tsx @@ -195,7 +195,7 @@ const DeviceDetails: React.FC = ({ > {_t("settings|sessions|sign_out")} - {isSigningOut && } + {isSigningOut && } )} diff --git a/src/components/views/settings/devices/FilteredDeviceList.tsx b/src/components/views/settings/devices/FilteredDeviceList.tsx index fd30091106..84283ab5b4 100644 --- a/src/components/views/settings/devices/FilteredDeviceList.tsx +++ b/src/components/views/settings/devices/FilteredDeviceList.tsx @@ -195,7 +195,7 @@ const DeviceListItem: React.FC<{ }) => { const tileContent = ( <> - {isSigningOut && } + {isSigningOut && } ); @@ -325,7 +325,7 @@ export const FilteredDeviceList = ({ onClick={() => onSignOutDevices(selectedDeviceIds)} className="mx_FilteredDeviceList_headerButton" > - {isSigningOut && } + {isSigningOut && } {_t("action|sign_out")} = ({ space, onFinished }) => { {space.canInvite(MatrixClientPeg.safeGet().getSafeUserId()) && shouldShowComponent(UIComponent.InviteUsers) ? ( } + icon={} title={_t("space|invite")} description={_t("space|invite_description")} onClick={() => { diff --git a/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap index d5ed4f79ce..e6ad46de88 100644 --- a/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap +++ b/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap @@ -95,13 +95,24 @@ exports[` Multi-tab lockout waits for other tab to stop during sta
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
@@ -224,13 +235,24 @@ exports[` should render spinner while app is loading 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap index b7b3034415..31cae614d7 100644 --- a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap +++ b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap @@ -54,13 +54,24 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
  -
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap b/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap index e2c79b6bf9..62aee87218 100644 --- a/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap +++ b/test/unit-tests/components/structures/auth/__snapshots__/LoginSplashView-test.tsx.snap @@ -8,13 +8,24 @@ exports[` Renders a spinner 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
Renders an error message 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
-
-
-
+ class="_icon_11k6c_18" + data-testid="spinner" + fill="currentColor" + height="1em" + role="progressbar" + style="width: 20px; height: 20px;" + viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + + +

Preparing invitations...

diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap index 5e2b84f442..27ade6f794 100644 --- a/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap +++ b/test/unit-tests/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap @@ -174,15 +174,28 @@ exports[` poll history displays poll history when tab clic
-
-
-
+ class="_icon_11k6c_18" + data-testid="spinner" + fill="currentColor" + height="1em" + role="progressbar" + style="width: 20px; height: 20px;" + viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + + + Loading polls
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap index fe1e04cf42..e6ead980dd 100644 --- a/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap +++ b/test/unit-tests/components/views/dialogs/__snapshots__/ShareDialog-test.tsx.snap @@ -168,13 +168,24 @@ exports[`ShareDialog should not render the socials if disabled 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
@@ -255,13 +266,24 @@ exports[`ShareDialog should render a share dialog for a matrix event 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
@@ -429,13 +451,24 @@ exports[`ShareDialog should render a share dialog for a room 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
@@ -602,13 +635,24 @@ exports[`ShareDialog should render a share dialog for a room member 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
@@ -748,13 +792,24 @@ exports[`ShareDialog should render a share dialog for an URL 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap index 54d661c1a8..8a42285ea0 100644 --- a/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap +++ b/test/unit-tests/components/views/dialogs/__snapshots__/VerificationRequestDialog-test.tsx.snap @@ -171,13 +171,24 @@ exports[`VerificationRequestDialog Initially, asks how you would like to verify
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap b/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap index c1330a4aab..3c88a63cb6 100644 --- a/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap +++ b/test/unit-tests/components/views/elements/__snapshots__/AppTile-test.tsx.snap @@ -511,13 +511,24 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = ` Loading…
  -
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap b/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap index 57ec2b4f2f..7f54e73f9b 100644 --- a/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap +++ b/test/unit-tests/components/views/messages/__snapshots__/MImageBody-test.tsx.snap @@ -18,13 +18,24 @@ exports[` should generate a thumbnail if one isn't included for ani
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
should show a thumbnail while image is being downloaded 1
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
renders a no polls message and a load more button when tabindex="0" > Load more polls -
-
-
+ class="_icon_11k6c_18" + data-testid="spinner" + fill="currentColor" + height="1em" + role="progressbar" + style="width: 20px; height: 20px;" + viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + + +
`; diff --git a/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap index 0de553d401..c4a4957397 100644 --- a/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap +++ b/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap @@ -111,9 +111,18 @@ exports[` message case Knocked renders the corresponding messa Request to join sent

-

+ fill="currentColor" + height="1em" + viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + + Your request to join is pending.

diff --git a/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap index 730254aed7..772ab01eeb 100644 --- a/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap +++ b/test/unit-tests/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap @@ -135,13 +135,24 @@ exports[`FontScalingPanel renders the font scaling UI 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap index 72330ab38e..0664d5d5b8 100644 --- a/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap +++ b/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap @@ -970,13 +970,24 @@ exports[` renders spinner while loading 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
@@ -1034,13 +1045,24 @@ exports[` renders spinner while signing in 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +

Waiting for device to sign in @@ -1110,13 +1132,24 @@ exports[` renders spinner while verifying 1`] = `

-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +

Completing set up of your new device @@ -1177,13 +1210,24 @@ exports[` renders spinner whilst QR generating 1`] = `

-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap index 5ad2eb43f7..9df918d95d 100644 --- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap +++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap @@ -771,13 +771,24 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap index 4df5ff9f96..3b2643c841 100644 --- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap +++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap @@ -40,13 +40,24 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
-
+ viewBox="0 0 24 24" + width="1em" + xmlns="http://www.w3.org/2000/svg" + > + +
`;