From ef30fb2d760bd76e671a5fee788649ec806f7a45 Mon Sep 17 00:00:00 2001
From: Alex Risch <alexrisch@Alexs-MacBook-Pro-2.local>
Date: Fri, 9 Feb 2024 19:33:25 -0700
Subject: [PATCH 1/2] Updates:

Fixed callbacks for client creation
---
 src/screens/OnboardingEnableIdentityScreen.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/screens/OnboardingEnableIdentityScreen.tsx b/src/screens/OnboardingEnableIdentityScreen.tsx
index 401763e..a81c7ab 100644
--- a/src/screens/OnboardingEnableIdentityScreen.tsx
+++ b/src/screens/OnboardingEnableIdentityScreen.tsx
@@ -57,10 +57,10 @@ export const OnboardingEnableIdentityScreen = () => {
           enableAlphaMls: AppConfig.GROUPS_ENABLED,
           env: AppConfig.XMTP_ENV,
           preEnableIdentityCallback: async () => {
-            await enableIdentityPromise;
+            await enableIdentityPromise();
           },
           preCreateIdentityCallback: async () => {
-            await createIdentityPromise;
+            await createIdentityPromise();
           },
           codecs: [new RemoteAttachmentCodec()],
         });

From 6b9ae95fa6980618c6a30ef45aad5e84a60e9b4f Mon Sep 17 00:00:00 2001
From: Alex Risch <alexrisch@Alexs-MacBook-Pro-2.local>
Date: Fri, 9 Feb 2024 22:21:46 -0700
Subject: [PATCH 2/2] Fixes

Fixes
Dev screen
Config fix
---
 .github/workflows/release.yml                 |  23 +++
 .vscode/settings.json                         |   1 +
 android/app/build.gradle                      |   1 +
 src/components/ConversationMessageContent.tsx |   4 +-
 src/components/GroupListItem.tsx              |   4 +-
 src/components/ImageMessage.tsx               |   3 +-
 .../{ => modals}/AddGroupParticipantModal.tsx |  22 +--
 .../{ => modals}/GroupInfoModal.tsx           |  16 +-
 src/i18n/locales/en.json                      |  13 +-
 src/navigation/AppNavigation.tsx              |  10 +
 src/navigation/ScreenNames.ts                 |   1 +
 src/navigation/StackParams.ts                 |   1 +
 src/queries/useListQuery.ts                   |   3 +-
 src/screens/ConversationListScreen.tsx        |  14 +-
 src/screens/ConversationScreen.tsx            |  16 +-
 src/screens/DevScreen.tsx                     | 173 ++++++++++++++++++
 src/screens/GroupScreen.tsx                   |   4 +-
 src/utils/getAllListMessages.ts               |  84 +++++----
 18 files changed, 319 insertions(+), 74 deletions(-)
 create mode 100644 .github/workflows/release.yml
 rename src/components/{ => modals}/AddGroupParticipantModal.tsx (89%)
 rename src/components/{ => modals}/GroupInfoModal.tsx (88%)
 create mode 100644 src/screens/DevScreen.tsx

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..fe36ed6
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,23 @@
+name: Release
+on:
+  workflow_dispatch:
+
+jobs:
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+      - uses: actions/setup-node@v3
+      - run: yarn
+      - run: cd android && ./gradlew assembleRelease
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v4
+        with:
+          name: APK
+          path: ./android/app/build/outputs/apk/release/app-release.apk
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 526a1b0..d0e96bc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,4 +3,5 @@
   "editor.codeActionsOnSave": {
     "source.organizeImports": "explicit"
   },
+  "java.compile.nullAnalysis.mode": "automatic",
 }
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 33036f0..aa9c5b9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 /**
  * This is the configuration block to customize your React Native Android app.
diff --git a/src/components/ConversationMessageContent.tsx b/src/components/ConversationMessageContent.tsx
index e311fb7..e8f122e 100644
--- a/src/components/ConversationMessageContent.tsx
+++ b/src/components/ConversationMessageContent.tsx
@@ -38,7 +38,9 @@ export const ConversationMessageContent: FC<
 
   if (message.contentTypeId === ContentTypes.RemoteStaticAttachment) {
     return (
-      <ImageMessage content={message.content() as RemoteAttachmentContent} />
+      <Container alignSelf={isMe ? 'flex-end' : 'flex-start'}>
+        <ImageMessage content={message.content() as RemoteAttachmentContent} />
+      </Container>
     );
   }
 
diff --git a/src/components/GroupListItem.tsx b/src/components/GroupListItem.tsx
index 5d7ec33..271b2f8 100644
--- a/src/components/GroupListItem.tsx
+++ b/src/components/GroupListItem.tsx
@@ -21,7 +21,7 @@ export const GroupListItem: FC<GroupListItemProps> = ({
   display,
   lastMessageTime,
 }) => {
-  const {data: addresses} = useGroupParticipantsQuery(group.id);
+  const {data: addresses} = useGroupParticipantsQuery(group?.id);
   const {navigate} = useTypedNavigation();
   const {data, groupDisplayName} = useGroupContactInfo(addresses ?? []);
 
@@ -29,7 +29,7 @@ export const GroupListItem: FC<GroupListItemProps> = ({
     <Pressable
       onPress={() => {
         navigate(ScreenNames.Group, {
-          id: group.id,
+          id: group?.id,
         });
       }}>
       <HStack space={[2, 3]} alignItems={'center'} w={'100%'} padding={'16px'}>
diff --git a/src/components/ImageMessage.tsx b/src/components/ImageMessage.tsx
index aabf96f..a0364a2 100644
--- a/src/components/ImageMessage.tsx
+++ b/src/components/ImageMessage.tsx
@@ -48,9 +48,10 @@ export const ImageMessage: FC<ImageMessageProps> = ({content}) => {
       resizeMethod="auto"
       resizeMode="cover"
       source={{uri: downloadedUri}}
-      // source={require('../../assets/images/discover1.png')}
       height={40}
       width={40}
+      borderRadius={10}
+      alt="image message"
     />
   );
 };
diff --git a/src/components/AddGroupParticipantModal.tsx b/src/components/modals/AddGroupParticipantModal.tsx
similarity index 89%
rename from src/components/AddGroupParticipantModal.tsx
rename to src/components/modals/AddGroupParticipantModal.tsx
index c29049b..bd892d4 100644
--- a/src/components/AddGroupParticipantModal.tsx
+++ b/src/components/modals/AddGroupParticipantModal.tsx
@@ -2,17 +2,17 @@ import {Group} from '@xmtp/react-native-sdk/build/lib/Group';
 import {Box, FlatList, HStack, Input, Pressable, VStack} from 'native-base';
 import React, {FC, useCallback, useMemo, useState} from 'react';
 import {ListRenderItem, useWindowDimensions} from 'react-native';
-import {TestIds} from '../consts/TestIds';
-import {useContactInfo} from '../hooks/useContactInfo';
-import {useContacts} from '../hooks/useContacts';
-import {translate} from '../i18n';
-import {colors} from '../theme/colors';
-import {formatAddress} from '../utils/formatAddress';
-import {AvatarWithFallback} from './AvatarWithFallback';
-import {Button} from './common/Button';
-import {Icon} from './common/Icon';
-import {Modal} from './common/Modal';
-import {Text} from './common/Text';
+import {TestIds} from '../../consts/TestIds';
+import {useContactInfo} from '../../hooks/useContactInfo';
+import {useContacts} from '../../hooks/useContacts';
+import {translate} from '../../i18n';
+import {colors} from '../../theme/colors';
+import {formatAddress} from '../../utils/formatAddress';
+import {AvatarWithFallback} from '../AvatarWithFallback';
+import {Button} from '../common/Button';
+import {Icon} from '../common/Icon';
+import {Modal} from '../common/Modal';
+import {Text} from '../common/Text';
 
 export interface GroupInfoModalProps {
   shown: boolean;
diff --git a/src/components/GroupInfoModal.tsx b/src/components/modals/GroupInfoModal.tsx
similarity index 88%
rename from src/components/GroupInfoModal.tsx
rename to src/components/modals/GroupInfoModal.tsx
index bb5f5f5..281973b 100644
--- a/src/components/GroupInfoModal.tsx
+++ b/src/components/modals/GroupInfoModal.tsx
@@ -1,14 +1,14 @@
 import {Group} from '@xmtp/react-native-sdk/build/lib/Group';
 import {HStack, Pressable, VStack} from 'native-base';
 import React, {FC, useCallback} from 'react';
-import {useContactInfo} from '../hooks/useContactInfo';
-import {translate} from '../i18n';
-import {colors} from '../theme/colors';
-import {AvatarWithFallback} from './AvatarWithFallback';
-import {Button} from './common/Button';
-import {Icon} from './common/Icon';
-import {Modal} from './common/Modal';
-import {Text} from './common/Text';
+import {useContactInfo} from '../../hooks/useContactInfo';
+import {translate} from '../../i18n';
+import {colors} from '../../theme/colors';
+import {AvatarWithFallback} from '../AvatarWithFallback';
+import {Button} from '../common/Button';
+import {Icon} from '../common/Icon';
+import {Modal} from '../common/Modal';
+import {Text} from '../common/Text';
 
 export interface GroupInfoModalProps {
   shown: boolean;
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index ec187ee..0ef0786 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -57,5 +57,16 @@
   "guest_wallet": "Guest Wallet",
   "group_changed": "Group Changed",
   "add_to_group": "Add",
-  "group": "Group"
+  "group": "Group",
+
+  "dev_screen": "Dev Screen",
+  "client": "Client",
+  "address": "Address",
+  "list_queries": "List Queries",
+  "conversation_messages_queries": "Conversation Messages",
+  "group_messages_queries": "Group Messages Queries",
+  "group_members_queries": "Group Members Queries",
+  "get_conversations": "Get Conversations",
+  "get_groups": "Get Groups",
+  "get_contacts": "Get Contacts"
 }
\ No newline at end of file
diff --git a/src/navigation/AppNavigation.tsx b/src/navigation/AppNavigation.tsx
index 890fdaf..478489d 100644
--- a/src/navigation/AppNavigation.tsx
+++ b/src/navigation/AppNavigation.tsx
@@ -6,6 +6,7 @@ import {useClientContext} from '../context/ClientContext';
 import {AccountSettingsScreen} from '../screens/AccountSettingsScreen';
 import {ConversationListScreen} from '../screens/ConversationListScreen';
 import {ConversationScreen} from '../screens/ConversationScreen';
+import {DevScreen} from '../screens/DevScreen';
 import {DiscoverScreen} from '../screens/DiscoverScreen';
 import {GroupScreen} from '../screens/GroupScreen';
 import {LoadingScreen} from '../screens/LoadingScreen';
@@ -111,6 +112,15 @@ export const AppNavigation = () => {
               presentation: 'modal',
             }}
           />
+          {__DEV__ && (
+            <AuthenticatedStack.Screen
+              name={ScreenNames.Dev}
+              component={DevScreen}
+              options={{
+                presentation: 'modal',
+              }}
+            />
+          )}
         </AuthenticatedStack.Navigator>
       )}
     </NavigationContainer>
diff --git a/src/navigation/ScreenNames.ts b/src/navigation/ScreenNames.ts
index c10d755..1dd7e16 100644
--- a/src/navigation/ScreenNames.ts
+++ b/src/navigation/ScreenNames.ts
@@ -15,4 +15,5 @@ export enum ScreenNames {
   Search = 'search',
   QRCode = 'qr_code',
   UserProfiles = 'user_profiles',
+  Dev = 'dev',
 }
diff --git a/src/navigation/StackParams.ts b/src/navigation/StackParams.ts
index 5e10e72..41bafa3 100644
--- a/src/navigation/StackParams.ts
+++ b/src/navigation/StackParams.ts
@@ -19,6 +19,7 @@ export type AuthenticatedStackParams = {
   [ScreenNames.Search]: undefined;
   [ScreenNames.QRCode]: undefined;
   [ScreenNames.UserProfiles]: {address: string};
+  [ScreenNames.Dev]: undefined;
 };
 
 export type RootStackParams = LoadingStackParams &
diff --git a/src/queries/useListQuery.ts b/src/queries/useListQuery.ts
index ff369ab..206586c 100644
--- a/src/queries/useListQuery.ts
+++ b/src/queries/useListQuery.ts
@@ -5,10 +5,9 @@ import {QueryKeys} from './QueryKeys';
 
 export const useListQuery = () => {
   const {client} = useClient();
-
   return useQuery({
     queryKey: [QueryKeys.List, client?.address],
     queryFn: () => getAllListMessages(client),
-    enabled: !!client,
+    enabled: Boolean(client),
   });
 };
diff --git a/src/screens/ConversationListScreen.tsx b/src/screens/ConversationListScreen.tsx
index 6cbd5f5..621c0e5 100644
--- a/src/screens/ConversationListScreen.tsx
+++ b/src/screens/ConversationListScreen.tsx
@@ -27,11 +27,12 @@ import {colors} from '../theme/colors';
 const EmptyBackground = require('../../assets/images/Bg_asset.svg').default;
 
 const keyExtractor = (item: ListConversation | ListGroup) =>
-  'conversation' in item ? item.conversation.topic : item.group.id;
+  'conversation' in item ? item.conversation?.topic : item.group?.id ?? '';
 
 const useData = () => {
   const {client} = useClient();
-  const {data, isLoading, refetch, isRefetching} = useListMessages();
+  const {data, isLoading, refetch, isRefetching, isError, error} =
+    useListMessages();
 
   const {listItems, requests} = useMemo(() => {
     const listMessages: ListMessages = [];
@@ -58,6 +59,8 @@ const useData = () => {
     isLoading,
     refetch,
     isRefetching,
+    isError,
+    error,
   };
 };
 
@@ -85,6 +88,11 @@ const ListHeader: FC<ListHeaderProps> = ({
   const handleAccountPress = useCallback(() => {
     navigate(ScreenNames.Account);
   }, [navigate]);
+  const navigateToDev = useCallback(() => {
+    if (__DEV__) {
+      navigate(ScreenNames.Dev);
+    }
+  }, [navigate]);
   return (
     <VStack>
       <HStack
@@ -109,6 +117,7 @@ const ListHeader: FC<ListHeaderProps> = ({
           shadow={4}>
           <Box>
             <Button
+              onLongPress={navigateToDev}
               size={'sm'}
               variant={'ghost'}
               leftIcon={
@@ -203,7 +212,6 @@ export const ConversationListScreen = () => {
   const showPicker = () => {
     setShowPickerModal(true);
   };
-
   const handleNewMessagePress = useCallback(() => {
     navigate(ScreenNames.Search);
   }, [navigate]);
diff --git a/src/screens/ConversationScreen.tsx b/src/screens/ConversationScreen.tsx
index 8dfee4e..b7fa3cf 100644
--- a/src/screens/ConversationScreen.tsx
+++ b/src/screens/ConversationScreen.tsx
@@ -1,15 +1,8 @@
 import {useRoute} from '@react-navigation/native';
 import {DecodedMessage, RemoteAttachmentContent} from '@xmtp/react-native-sdk';
-import {
-  Box,
-  FlatList,
-  HStack,
-  KeyboardAvoidingView,
-  Pressable,
-  VStack,
-} from 'native-base';
+import {Box, FlatList, HStack, Pressable, VStack} from 'native-base';
 import React, {useCallback, useEffect, useState} from 'react';
-import {ListRenderItem, Platform} from 'react-native';
+import {KeyboardAvoidingView, ListRenderItem, Platform} from 'react-native';
 import {Asset} from 'react-native-image-picker';
 import {ConversationHeader} from '../components/ConversationHeader';
 import {ConversationInput} from '../components/ConversationInput';
@@ -196,9 +189,8 @@ export const ConversationScreen = () => {
           />
           <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-            height={'100%'}
-            keyboardVerticalOffset={50}
-            w="100%">
+            style={{height: '100%'}}
+            keyboardVerticalOffset={10}>
             <Box flex={1}>
               <FlatList
                 keyExtractor={item => item.id}
diff --git a/src/screens/DevScreen.tsx b/src/screens/DevScreen.tsx
new file mode 100644
index 0000000..c92127b
--- /dev/null
+++ b/src/screens/DevScreen.tsx
@@ -0,0 +1,173 @@
+import {useNavigation} from '@react-navigation/native';
+import {useQueryClient} from '@tanstack/react-query';
+import {useAddress} from '@thirdweb-dev/react-native';
+import {Box, Container, Pressable, ScrollView} from 'native-base';
+import React, {FC, useCallback, useEffect, useMemo, useState} from 'react';
+import {Icon} from '../components/common/Icon';
+import {Screen} from '../components/common/Screen';
+import {Text} from '../components/common/Text';
+import {useClient} from '../hooks/useClient';
+import {translate} from '../i18n';
+import {QueryKeys} from '../queries/QueryKeys';
+
+interface RequestItemProps {
+  title: string;
+  request: () => Promise<any>;
+}
+
+const RequestItem: FC<RequestItemProps> = ({title, request}) => {
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState<unknown>(null);
+  const [err, setErr] = useState<unknown>(null);
+
+  useEffect(() => {
+    request()
+      .then((res: any) => {
+        setData(res);
+        setLoading(false);
+      })
+      .catch((resErr: any) => {
+        setErr(resErr);
+        setLoading(false);
+      });
+  }, [request]);
+
+  const d = useMemo(() => {
+    const cache: string[] = [];
+    return JSON.stringify(data, (key, value) => {
+      if (typeof value === 'object' && value !== null) {
+        // Duplicate reference found, discard key
+        if (cache.includes(value)) return;
+
+        // Store value in our collection
+        cache.push(value);
+      }
+      return value;
+    });
+  }, [data]);
+
+  return (
+    <Container>
+      <Text typography="text-title/bold">{title}</Text>
+      <Text typography="text-base/regular" selectable>
+        Loading: {String(loading)}
+      </Text>
+      <Text typography="text-base/regular" selectable>
+        Data: {JSON.stringify(d)}
+      </Text>
+      <Text typography="text-base/regular" selectable>
+        Error: {JSON.stringify(err)}
+      </Text>
+    </Container>
+  );
+};
+
+interface DataItemProps {
+  title: string;
+  data: unknown;
+}
+
+const DataItem: FC<DataItemProps> = ({title, data}) => {
+  const d = useMemo(() => {
+    const cache: string[] = [];
+    return JSON.stringify(data, (key, value) => {
+      if (typeof value === 'object' && value !== null) {
+        // Duplicate reference found, discard key
+        if (cache.includes(value)) return;
+
+        // Store value in our collection
+        cache.push(value);
+      }
+      return value;
+    });
+  }, [data]);
+  return (
+    <Container>
+      <Text typography="text-title/bold">{title}</Text>
+      <Text typography="text-base/regular">Data:</Text>
+      <Text typography="text-base/regular" selectable>
+        {d}
+      </Text>
+    </Container>
+  );
+};
+
+export const DevScreen = () => {
+  const {client} = useClient();
+  const address = useAddress();
+  const {goBack} = useNavigation();
+  const queryClient = useQueryClient();
+  const list = queryClient.getQueriesData({queryKey: [QueryKeys.List]});
+  const conversationMessages = queryClient
+    .getQueriesData({
+      queryKey: [QueryKeys.ConversationMessages],
+    })
+    .map(x => x[1]);
+  const groupParticipants = queryClient
+    .getQueriesData({
+      queryKey: [QueryKeys.GroupParticipants],
+    })
+    .map(x => x[1]);
+  const groupMessages = queryClient
+    .getQueriesData({
+      queryKey: [QueryKeys.GroupMessages],
+    })
+    .map(x => x[1]);
+
+  const getConversations = useCallback(async () => {
+    return client?.conversations.list();
+  }, [client]);
+
+  const getGroups = useCallback(async () => {
+    return client?.conversations.listGroups();
+  }, [client]);
+
+  const getContacts = useCallback(async () => {
+    return client?.contacts.consentList();
+  }, [client]);
+
+  return (
+    <Screen
+      title={
+        <Text typography="text-lg/heavy" textAlign={'center'}>
+          {translate('dev_screen')}
+        </Text>
+      }
+      left={
+        <Pressable onPress={goBack}>
+          <Icon name="chevron-left-thick" />
+        </Pressable>
+      }
+      right={<Box />}>
+      <Box flex={1}>
+        <ScrollView height={'100%'} flex={1}>
+          <DataItem title={translate('client')} data={client} />
+          <DataItem title={translate('address')} data={address} />
+          <DataItem title={translate('list_queries')} data={list} />
+          <DataItem
+            title={translate('conversation_messages_queries')}
+            data={conversationMessages[1]}
+          />
+          <DataItem
+            title={translate('group_members_queries')}
+            data={groupParticipants[1]}
+          />
+          <DataItem
+            title={translate('group_messages_queries')}
+            data={groupMessages[1]}
+          />
+          <RequestItem
+            title={translate('get_conversations')}
+            request={getConversations}
+          />
+          <RequestItem title={translate('get_groups')} request={getGroups} />
+          <RequestItem
+            title={translate('get_contacts')}
+            request={getContacts}
+          />
+          <Box height={200} />
+        </ScrollView>
+      </Box>
+    </Screen>
+  );
+};
diff --git a/src/screens/GroupScreen.tsx b/src/screens/GroupScreen.tsx
index 3b6bef0..b890336 100644
--- a/src/screens/GroupScreen.tsx
+++ b/src/screens/GroupScreen.tsx
@@ -11,15 +11,15 @@ import {
 import React, {useCallback, useEffect, useState} from 'react';
 import {ListRenderItem, Platform} from 'react-native';
 import {Asset} from 'react-native-image-picker';
-import {AddGroupParticipantModal} from '../components/AddGroupParticipantModal';
 import {ConversationInput} from '../components/ConversationInput';
 import {ConversationMessageContent} from '../components/ConversationMessageContent';
 import {GroupHeader} from '../components/GroupHeader';
-import {GroupInfoModal} from '../components/GroupInfoModal';
 import {Button} from '../components/common/Button';
 import {Drawer} from '../components/common/Drawer';
 import {Screen} from '../components/common/Screen';
 import {Text} from '../components/common/Text';
+import {AddGroupParticipantModal} from '../components/modals/AddGroupParticipantModal';
+import {GroupInfoModal} from '../components/modals/GroupInfoModal';
 import {useClient} from '../hooks/useClient';
 import {useGroup} from '../hooks/useGroup';
 import {useGroupMessages} from '../hooks/useGroupMessages';
diff --git a/src/utils/getAllListMessages.ts b/src/utils/getAllListMessages.ts
index dd73127..dbed8e5 100644
--- a/src/utils/getAllListMessages.ts
+++ b/src/utils/getAllListMessages.ts
@@ -1,50 +1,72 @@
 import {Client} from '@xmtp/react-native-sdk';
-import {ListMessages} from '../models/ListMessages';
+import {
+  ListConversation,
+  ListGroup,
+  ListMessages,
+} from '../models/ListMessages';
 import {saveConsent} from '../services/mmkvStorage';
 
 export const getAllListMessages = async (client?: Client<any> | null) => {
   if (!client) {
     return [];
   }
+
   const consentList = await client.contacts.refreshConsentList();
+
   consentList.forEach(async item => {
     saveConsent(client.address, item.value, item.permissionType === 'allowed');
   });
   await client.conversations.syncGroups();
+
   const [convos, groups] = await Promise.all([
     client.conversations.list(),
     client.conversations.listGroups(),
   ]);
-  const allMessages: ListMessages = await Promise.all([
-    ...convos.map(async conversation => {
-      const [messages, consent] = await Promise.all([
-        conversation.messages(1),
-        conversation.consentState(),
-      ]);
-      const content = messages[0].content();
-      return {
-        conversation,
-        display:
-          typeof content === 'string' ? content : messages[0].fallback ?? '',
-        lastMessageTime: messages[0].sent,
-        isRequest: consent !== 'allowed',
-      };
-    }),
-    ...groups.map(async group => {
-      await group.sync();
-      const messages = await group.messages();
-      const content = messages?.[0].content();
-      const display =
-        typeof content === 'string' ? content : messages?.[0].fallback ?? '';
-      return {
-        group,
-        display,
-        lastMessageTime: messages[0].sent,
-        isRequest: false,
-      };
-    }),
-  ]);
-  const sorted = allMessages.sort((a, b) => {
+
+  const allMessages: PromiseSettledResult<ListConversation | ListGroup>[] =
+    await Promise.allSettled([
+      ...convos.map(async conversation => {
+        const [messages, consent] = await Promise.all([
+          conversation.messages(1),
+          conversation.consentState(),
+        ]);
+        const content = messages[0].content();
+        return {
+          conversation,
+          display:
+            typeof content === 'string' ? content : messages[0].fallback ?? '',
+          lastMessageTime: messages[0].sent,
+          isRequest: consent !== 'allowed',
+        };
+      }),
+      ...groups.map(async group => {
+        await group.sync();
+        const messages = await group.messages();
+        const content = messages?.[0].content();
+        const display =
+          typeof content === 'string' ? content : messages?.[0].fallback ?? '';
+        return {
+          group,
+          display,
+          lastMessageTime: messages[0].sent,
+          isRequest: false,
+        };
+      }),
+    ]);
+
+  // Remove the rejected promises and return the list of messages using .reduce
+  const allMessagesFiltered = allMessages.reduce<ListMessages>((acc, curr) => {
+    if (curr.status === 'fulfilled' && curr.value) {
+      if ('group' in curr.value) {
+        acc.push(curr.value);
+      } else if ('conversation' in curr.value) {
+        acc.push(curr.value);
+      }
+    }
+    return acc;
+  }, []);
+
+  const sorted = allMessagesFiltered.sort((a, b) => {
     return b.lastMessageTime - a.lastMessageTime;
   });