Fix broken chatting with yourself; (#165)

homebase-id · Aug 20, 2024 · d4397c1 · d4397c1
1 parent c86ba9d
commit d4397c1
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/packages/mobile/src/pages/chat/chat-page.tsx b/packages/mobile/src/pages/chat/chat-page.tsx
@@ -208,29 +208,30 @@ const ChatPage = memo(({ route, navigation }: ChatProp) => {
 
   const doSend = useCallback(
     (message: { text: string }[]) => {
+      if (!conversation) return;
+
       if (
-        !conversation ||
-        stringGuidsEqual(route.params.convoId, ConversationWithYourselfId) ||
-        conversation?.fileMetadata.senderOdinId
+        !stringGuidsEqual(route.params.convoId, ConversationWithYourselfId) && // You can't invite yourself
+        !conversation?.fileMetadata.senderOdinId // Only the original creator can invite
       ) {
-        return;
-      }
-
-      const filteredRecipients = conversation.fileMetadata.appData.content.recipients.filter(
-        (recipient) => recipient !== identity
-      );
+        const filteredRecipients = conversation.fileMetadata.appData.content.recipients.filter(
+          (recipient) => recipient !== identity
+        );
 
-      const anyRecipientMissingConversation = filteredRecipients.some((recipient) => {
-        const latestTransferStatus =
-          conversation.serverMetadata?.transferHistory?.recipients[recipient].latestTransferStatus;
+        const anyRecipientMissingConversation = filteredRecipients.some((recipient) => {
+          const latestTransferStatus =
+            conversation.serverMetadata?.transferHistory?.recipients[recipient]
+              .latestTransferStatus;
 
-        if (!latestTransferStatus) return true;
-        return FailedTransferStatuses.includes(latestTransferStatus);
-      });
-      if (anyRecipientMissingConversation) {
-        console.log('invite recipient');
-        inviteRecipient({ conversation });
+          if (!latestTransferStatus) return true;
+          return FailedTransferStatuses.includes(latestTransferStatus);
+        });
+        if (anyRecipientMissingConversation) {
+          console.log('invite recipient');
+          inviteRecipient({ conversation });
+        }
       }
+
       sendMessage({
         conversation: conversation,
         message: message[0]?.text,