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

Take the Threads Activity Centre out of labs (#12439)

Browse source 
* Take the TAC out of labs!

Requires https://github.com/matrix-org/matrix-react-sdk/pull/12438
and ideally https://github.com/matrix-org/matrix-react-sdk/pull/12418

* i18n

* Add test method

That's needed now we we don't include threads in the notif count in the tests

* One less labs setting

* Update snapshot

* Disable release announcement

* Unused import

* Fix some screenshots

* Fix all the unread test cases now room unreads don't include threads

* Fix more tests

* Even more test fixes

* Still more test fixes

* Oh goodness, it's more test fixes

* Fix selectors now there are 2 buttons called Threads

* Disable some tests that aren't passing

for reasons that don't appear releated to any of the TAC work, as
per the comment.

* Remove debugging

* Oops, removed too much
This commit is contained in:
David Baker 2024-04-29 16:30:19 +01:00 • committed by GitHub
parent 02e7fb340e
commit 281916fd96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 341 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/hooks/useUnreadNotifications.ts
View file

@ -15,13 +15,12 @@ limitations under the License.
*/
import { RoomEvent } from "matrix-js-sdk/src/matrix";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useCallback, useEffect, useState } from "react";
import type { NotificationCount, Room } from "matrix-js-sdk/src/matrix";
import { determineUnreadState } from "../RoomNotifs";
import { NotificationLevel } from "../stores/notifications/NotificationLevel";
import { useEventEmitter } from "./useEventEmitter";
import SettingsStore from "../settings/SettingsStore";
export const useUnreadNotifications = (
room?: Room,
@ -31,8 +30,6 @@ export const useUnreadNotifications = (
count: number;
level: NotificationLevel;
} => {
const tacEnabled = useMemo(() => SettingsStore.getValue("threadsActivityCentre"), []);
const [symbol, setSymbol] = useState<string | null>(null);
const [count, setCount] = useState<number>(0);
const [level, setLevel] = useState<NotificationLevel>(NotificationLevel.None);
@ -53,11 +50,11 @@ export const useUnreadNotifications = (
useEventEmitter(room, RoomEvent.MyMembership, () => updateNotificationState());
const updateNotificationState = useCallback(() => {
const { symbol, count, level } = determineUnreadState(room, threadId, !tacEnabled);
const { symbol, count, level } = determineUnreadState(room, threadId, false);
setSymbol(symbol);
setCount(count);
setLevel(level);
}, [room, threadId, tacEnabled]);
}, [room, threadId]);
useEffect(() => {
updateNotificationState();