fix: app hang when opening "New Chat" dialog

...or when opening "Add Members".

Closes #5724.

This is a follow-up to 8c18aa9
(#5725),
issue #5723.

Author: WofWca

packages/frontend/src/components/dialogs/AddMember/AddMemberDialog.tsx

@@ -26,6 +26,7 @@ export function AddMemberDialog({
   const {
     contactIds,
     contactCache,
+    isContactLoaded,
     loadContacts,
     queryStrIsValidEmail,
     refreshContacts,
@@ -55,6 +56,7 @@ export function AddMemberDialog({
 
         contactIds,
         contactCache,
+        isContactLoaded,
         loadContacts,
         refreshContacts,
 

packages/frontend/src/components/dialogs/AddMember/AddMemberInnerDialog.tsx

@@ -32,6 +32,7 @@ export function AddMemberInnerDialog({
 
   contactIds,
   contactCache,
+  isContactLoaded,
   loadContacts,
   refreshContacts,
 
@@ -47,6 +48,7 @@ export function AddMemberInnerDialog({
 
   contactIds: number[]
   contactCache: { [id: number]: T.Contact | undefined }
+  isContactLoaded: (index: number) => boolean
   loadContacts: (startIndex: number, stopIndex: number) => Promise<void>
   refreshContacts: () => void
 
@@ -230,14 +232,9 @@ export function AddMemberInnerDialog({
                 // with wrong indices.
                 // See `CreateChatMain` component.
                 loadMoreItems={loadContacts}
-                // perf: consider using `isContactLoaded` from `useLazyLoadedContacts`
-                // otherwise sometimes we might load the same contact twice (performance thing)
-                // See https://github.com/bvaughn/react-window/issues/765
                 isItemLoaded={index => {
                   const isExtraItem = index >= contactIds.length
-                  return isExtraItem
-                    ? true
-                    : contactCache[contactIds[index]] != undefined
+                  return isExtraItem ? true : isContactLoaded(index)
                 }}
                 // minimumBatchSize={100}
               >

packages/frontend/src/components/dialogs/CreateChat/index.tsx

@@ -173,6 +173,7 @@ function CreateChatMain(props: CreateChatMainProps) {
   const {
     contactIds,
     contactCache,
+    isContactLoaded,
     loadContacts,
     queryStrIsValidEmail,
     refreshContacts,
@@ -366,15 +367,17 @@ function CreateChatMain(props: CreateChatMainProps) {
                   contactIds.indexOf(contactsAndExtraItems[stopInd])
                 )
               }}
-              // perf: consider using `isContactLoaded` from `useLazyLoadedContacts`
-              // otherwise sometimes we might load the same contact twice (performance thing)
-              // See https://github.com/bvaughn/react-window/issues/765
               isItemLoaded={index => {
                 const isExtraItem = contactsAndExtraItems[index] < -100
                 if (isExtraItem) {
                   return true
                 }
-                return contactCache[contactsAndExtraItems[index]] != undefined
+                // Again, the indices are shifted
+                // due to the existence of extra items.
+                const indInContactIds = contactIds.indexOf(
+                  contactsAndExtraItems[index]
+                )
+                return isContactLoaded(indInContactIds)
               }}
               // minimumBatchSize={100}
             >