Merge pull request #4247 from tloncorp/lb/contact-fixes-omni

native: couple small contact fixes
tloncorp · Dec 4, 2024 · 63eef46 · 63eef46
2 parents 630c907 + d63a971
commit 63eef46
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/packages/shared/src/db/queries.ts b/packages/shared/src/db/queries.ts
@@ -3196,16 +3196,27 @@ export const getUnreadUnseenActivityEvents = createReadQuery(
       .where(
         and(
           gt($activityEvents.timestamp, seenMarker),
-          eq($activityEvents.shouldNotify, true),
           or(
-            and(eq($activityEvents.type, 'reply'), gt($threadUnreads.count, 0)),
-            and(eq($activityEvents.type, 'post'), gt($channelUnreads.count, 0)),
+            eq($activityEvents.type, 'contact'),
             and(
-              gt($groupUnreads.notifyCount, 0),
+              eq($activityEvents.shouldNotify, true),
               or(
-                eq($activityEvents.type, 'group-ask'),
-                eq($activityEvents.type, 'flag-post'),
-                eq($activityEvents.type, 'flag-reply')
+                and(
+                  eq($activityEvents.type, 'reply'),
+                  gt($threadUnreads.count, 0)
+                ),
+                and(
+                  eq($activityEvents.type, 'post'),
+                  gt($channelUnreads.count, 0)
+                ),
+                and(
+                  gt($groupUnreads.notifyCount, 0),
+                  or(
+                    eq($activityEvents.type, 'group-ask'),
+                    eq($activityEvents.type, 'flag-post'),
+                    eq($activityEvents.type, 'flag-reply')
+                  )
+                )
               )
             )
           )

diff --git a/packages/ui/src/components/ContactsScreenView.tsx b/packages/ui/src/components/ContactsScreenView.tsx
@@ -34,11 +34,9 @@ export function ContactsScreenView(props: Props) {
   const sections = useMemo(() => {
     const result: Section[] = [];
 
-    if (userContact) {
-      result.push({
-        data: [userContact],
-      });
-    }
+    result.push({
+      data: [userContact ?? db.getFallbackContact(currentUserId)],
+    });
 
     if (sortedContacts.length > 0) {
       result.push({
@@ -54,11 +52,11 @@ export function ContactsScreenView(props: Props) {
     }
 
     return result;
-  }, [userContact, sortedContacts, props.suggestions]);
+  }, [userContact, currentUserId, sortedContacts, props.suggestions]);
 
   const renderItem = useCallback(
     ({ item }: { item: db.Contact }) => {
-      const isSelf = item.id === userContact?.id;
+      const isSelf = item.id === currentUserId;
       return (
         <ContactListItem
           size="$4xl"