Jelajahi Sumber

canSendMessages fix

Viktoriia 1 bulan lalu
induk
melakukan
ed543885ef

+ 2 - 1
src/screens/InAppScreens/MessagesScreen/GroupChatScreen/index.tsx

@@ -2072,7 +2072,7 @@ const GroupChatScreen = ({ route }: { route: any }) => {
   };
 
   const renderInputToolbar = (props: any) => {
-    if (!canSendMessages) return null;
+    if (canSendMessages === 0) return null;
 
     return (
       <>
@@ -2085,6 +2085,7 @@ const GroupChatScreen = ({ route }: { route: any }) => {
         ) : null}
         <View
           onLayout={(e) => {
+            console.log('e.nativeEvent.layout.height', e.nativeEvent.layout.height)
             setInputHeight(e.nativeEvent.layout.height);
           }}
         >

+ 1 - 1
src/screens/InAppScreens/MessagesScreen/index.tsx

@@ -462,8 +462,8 @@ const MessagesScreen = () => {
                 avatar: item.chat.avatar,
                 userType: item.chat.userType ?? 'normal',
                 announcement: item.chat.announcement,
+                canSendMessages: item.chat?.canSendMessages ?? 1,
                 scrollToMessageId: item?.messageId ?? null,
-                canSendMessages: item.chat?.canSendMessages
               }
             );
           }}

+ 0 - 2
src/screens/InAppScreens/MessagesScreen/utils.ts

@@ -2,8 +2,6 @@ import moment from 'moment';
 import * as Notifications from 'expo-notifications';
 import { Alert, Platform } from 'react-native';
 import { NAVIGATION_PAGES } from 'src/types';
-import { usePushNotification } from 'src/contexts/PushNotificationContext';
-import { CommonActions } from '@react-navigation/native';
 import { storage, StoreType } from 'src/storage';
 import { Image as ImageCompressor, Video as VideoCompressor } from 'react-native-compressor';
 import * as FileSystem from 'expo-file-system/legacy';

+ 2 - 2
src/watermelondb/features/chat/data/chat.sync.ts

@@ -399,7 +399,7 @@ async function pullUpdates(token: string) {
           r.muted = s.muted ?? 0;
           r.userType = s.user_type ?? null;
 
-          r.canSendMessages = s.can_send_message ?? s.can_send_messages ?? 1;
+          r.canSendMessages = s.can_send_message ?? 1;
           r.isAdmin = s.is_admin ?? 0;
           r.announcement = s.announcement ?? 0;
 
@@ -456,7 +456,7 @@ async function pullUpdates(token: string) {
         r.userType = server.user_type ?? r.userType;
 
         r.canSendMessages =
-          server.can_send_message ?? server.can_send_messages ?? r.canSendMessages;
+          server.can_send_message ?? r.canSendMessages ?? 1;
         r.isAdmin = server.is_admin ?? r.isAdmin;
         r.announcement = server.announcement ?? r.announcement;
         r.removed = false;