imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into florianduros/tooltip-update

Browse source
This commit is contained in:
Florian Duros 2024-04-17 11:57:12 +02:00 • committed by GitHub
commit 9b5d4716e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 843 additions and 542 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/dialogs/InteractiveAuthDialog.tsx
View file

@ -29,6 +29,7 @@ import InteractiveAuth, {
} from "../../structures/InteractiveAuth";
import { ContinueKind, SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
import BaseDialog from "./BaseDialog";
import { Linkify } from "../../../Linkify";
type DialogAesthetics = Partial<{
[x in AuthType]: {
@ -168,7 +169,9 @@ export default class InteractiveAuthDialog<T> extends React.Component<Interactiv
if (this.state.authError) {
content = (
<div id="mx_Dialog_content">
<div role="alert">{this.state.authError.message || this.state.authError.toString()}</div>
<Linkify>
<div role="alert">{this.state.authError.message || this.state.authError.toString()}</div>
</Linkify>
<br />
<AccessibleButton onClick={this.onDismissClick} className="mx_GeneralButton" autoFocus={true}>
{_t("action|dismiss")}

10
src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
View file

@ -36,6 +36,7 @@ import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
import { KeyBindingAction } from "../../../../accessibility/KeyboardShortcuts";
import { ReleaseAnnouncement } from "../../../structures/ReleaseAnnouncement";
import { useIsReleaseAnnouncementOpen } from "../../../../hooks/useIsReleaseAnnouncementOpen";
import { useSettingValue } from "../../../../hooks/useSettings";
interface ThreadsActivityCentreProps {
/**
@ -52,6 +53,11 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
const [open, setOpen] = useState(false);
const roomsAndNotifications = useUnreadThreadRooms(open);
const isReleaseAnnouncementOpen = useIsReleaseAnnouncementOpen("threadsActivityCentre");
const settingTACOnlyNotifs = useSettingValue<boolean>("Notifications.tac_only_notifications");
const emptyCaption = settingTACOnlyNotifs
? _t("threads_activity_centre|no_rooms_with_threads_notifs")
: _t("threads_activity_centre|no_rooms_with_unread_threads");
return (
<div
@ -110,9 +116,7 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
/>
))}
{roomsAndNotifications.rooms.length === 0 && (
<div className="mx_ThreadsActivityCentre_emptyCaption">
{_t("threads_activity_centre|no_rooms_with_unreads_threads")}
</div>
<div className="mx_ThreadsActivityCentre_emptyCaption">{emptyCaption}</div>
)}
</div>
</Menu>