fix Mark as unread a post on non-crt (#6824)

This commit is contained in:
Elias Nahum
2022-12-03 21:37:13 +02:00
committed by GitHub
parent 8366268beb
commit 7717fea599
2 changed files with 5 additions and 2 deletions

View File

@@ -5,6 +5,7 @@ import {withDatabase} from '@nozbe/watermelondb/DatabaseProvider';
import withObservables from '@nozbe/with-observables';
import {observeCurrentTeamId} from '@queries/servers/system';
import {observeIsCRTEnabled} from '@queries/servers/thread';
import MarkAsUnreadOption from './mark_unread_option';
@@ -13,6 +14,7 @@ import type {WithDatabaseArgs} from '@typings/database/database';
const enhanced = withObservables([], ({database}: WithDatabaseArgs) => {
return {
teamId: observeCurrentTeamId(database),
isCRTEnabled: observeIsCRTEnabled(database),
};
});

View File

@@ -14,17 +14,18 @@ import {dismissBottomSheet} from '@screens/navigation';
import type PostModel from '@typings/database/models/servers/post';
type Props = {
isCRTEnabled: boolean;
sourceScreen: typeof Screens[keyof typeof Screens];
post: PostModel;
teamId: string;
}
const MarkAsUnreadOption = ({sourceScreen, post, teamId}: Props) => {
const MarkAsUnreadOption = ({isCRTEnabled, sourceScreen, post, teamId}: Props) => {
const serverUrl = useServerUrl();
const onPress = useCallback(async () => {
await dismissBottomSheet(Screens.POST_OPTIONS);
if (sourceScreen === Screens.THREAD) {
if (sourceScreen === Screens.THREAD && isCRTEnabled) {
const threadId = post.rootId || post.id;
markThreadAsUnread(serverUrl, teamId, threadId, post.id);
} else {