Merge 3af28d9 into a7ae6b9

lifeomic · Mar 21, 2024 · 690652a · 690652a
2 parents a7ae6b9 + 3af28d9
commit 690652a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/components/Messaging/SearchRecipientsModal.tsx b/src/components/Messaging/SearchRecipientsModal.tsx
@@ -7,7 +7,7 @@ import {
   ViewStyle,
 } from 'react-native';
 import { GiftedAvatar, User as GiftedUser } from 'react-native-gifted-chat';
-import { Button, Divider, List, Searchbar } from 'react-native-paper';
+import { Button, Divider, List, Searchbar, Text } from 'react-native-paper';
 import { tID } from '../TrackTile/common/testID';
 import { useStyles, useUser } from '../../hooks';
 import { createStyles, useIcons } from '../BrandConfigProvider';
@@ -77,6 +77,16 @@ export const SearchRecipientsModal = ({
         clearIcon={ClearList}
         testID={tID('search-bar')}
       />
+      {others.length < 1 && (
+        <View>
+          <Text style={{ textAlign: 'center' }}>
+            {t(
+              'no-recipients-message',
+              'No available message recipients. \nYou must be added to a messaging group to use this feature. Ask your administrator for more information.',
+            )}
+          </Text>
+        </View>
+      )}
       <ScrollView
         scrollEventThrottle={400}
         contentContainerStyle={styles.scrollView}

diff --git a/src/screens/MessageScreen.tsx b/src/screens/MessageScreen.tsx
@@ -236,6 +236,18 @@ export function MessageScreen<ParamList extends ParamListBase>({
             </TouchableOpacity>
           </Swipeable>
         ))}
+        {!conversations?.length && !isLoading && (
+          <Swipeable>
+            <List.Item
+              titleStyle={styles.listItemText}
+              title={t('no-direct-messages', 'No message history.')}
+              style={styles.listItemView}
+              description={t('no-direct-messages', 'New messages appear here.')}
+              descriptionStyle={styles.listItemSubtitleText}
+            />
+            <Divider style={styles.listItemDividerView} />
+          </Swipeable>
+        )}
         {isLoading ? (
           <ActivityIndicatorView />
         ) : (