@planningcenter/chat-react-native 4.4.1-qa-staging.22 → 4.4.1-qa-staging.24

package/src/screens/conversation_details_screen.tsx

@@ -127,6 +127,7 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
     conversation?.conversationMembership?.notificationLevelDescription
   const archived = isArchivedConversation(conversation)
   const canUpdate = conversation.memberAbility?.canUpdate || false
+  const canSaveTitle = canUpdate && !emptyTitle
   const canDelete = conversation.memberAbility?.canDelete || false
   const canArchive = manualArchivingEnabled && (conversation.memberAbility?.canArchive || false)
   const isLeader = conversation.memberAbility?.leader || false
@@ -252,7 +253,7 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
     icon: 'general.check',
     accessibilityLabel: 'Done',
     onPress: () => {
-      if (canUpdate) saveTitle({ title: trimmedTitle || conversation.title })
+      if (canSaveTitle) saveTitle({ title: trimmedTitle })
       navigation.goBack()
     },
   })

package/src/screens/get_help_screen.tsx

@@ -1,12 +1,12 @@
 import { StaticScreenProps, useNavigation } from '@react-navigation/native'
 import { useCallback, useMemo } from 'react'
-import { Alert, Linking as RNLinking, StyleSheet, View } from 'react-native'
+import { Alert, Linking, StyleSheet, View } from 'react-native'
 import { Heading, PressableRow, Text, TextInlineButton } from '../components'
 import { useApiGet, useTheme } from '../hooks'
 import { useAppName } from '../hooks/use_app_name'
 import { useOrganization } from '../hooks/use_organization'
 import { ResourceObject } from '../types'
-import { Clipboard, Linking } from '../utils'
+import { Clipboard } from '../utils'
 
 type GetHelpScreenRouteProps = {
   type?: 'chat' | 'general'
@@ -119,7 +119,7 @@ export function sendEmail(email: string) {
 
   const url = encodeURI(`mailto:${email}`)
 
-  RNLinking.openURL(url).catch(() => {
+  Linking.openURL(url).catch(() => {
     Alert.alert('Oops', `Unable to open: ${email}`, [
       { text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(email) },
       { text: 'OK' },
@@ -132,7 +132,7 @@ export function placePhoneCall(phoneNumber: string) {
 
   const url = encodeURI(`tel:${phoneNumber}`)
 
-  RNLinking.openURL(url).catch(() => {
+  Linking.openURL(url).catch(() => {
     Alert.alert('Oops', `Unable to open: ${phoneNumber}`, [
       { text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(phoneNumber) },
       { text: 'OK' },

package/src/__tests__/components/conversation/attachments/giphy_attachment.test.tsx

@@ -1,76 +0,0 @@
-import { DefaultTheme, ThemeProvider } from '@react-navigation/native'
-import { fireEvent, render } from '@testing-library/react-native'
-import React from 'react'
-import { Linking as RNLinking } from 'react-native'
-import { GiphyAttachment } from '../../../../components/conversation/attachments/giphy_attachment'
-import {
-  DenormalizedGiphyAttachmentResource,
-  GiphyAttachmentVariant,
-} from '../../../../types/resources/denormalized_attachment_resource'
-import {
-  AudioAdapter,
-  ChatAdapters,
-  ClipboardAdapter,
-  ImagePickerAdapter,
-  LinkingAdapter,
-  VideoAdapter,
-} from '../../../../utils/native_adapters'
-
-const variant: GiphyAttachmentVariant = {
-  url: 'https://media.giphy.com/cat.gif',
-  width: '200',
-  height: '100',
-  size: '1',
-  frames: '1',
-}
-
-const attachment: DenormalizedGiphyAttachmentResource = {
-  type: 'giphy',
-  id: '1',
-  title: 'cat',
-  titleLink: 'https://giphy.com/gifs/cat',
-  thumbUrl: variant.url,
-  giphy: {
-    original: variant,
-    fixedHeight: variant,
-    fixedHeightStill: variant,
-    fixedHeightDownsampled: variant,
-    fixedWidth: variant,
-    fixedWidthStill: variant,
-    fixedWidthDownsampled: variant,
-  },
-}
-
-const hostOpenURL = jest.fn(async (_: string) => {})
-
-describe('GiphyAttachment', () => {
-  beforeAll(() => {
-    ChatAdapters.configure({
-      clipboard: new ClipboardAdapter({
-        getStringAsync: async () => '',
-        setStringAsync: async () => {},
-      }),
-      audio: new AudioAdapter({ useAudio: () => ({}) as any }),
-      video: new VideoAdapter({ Player: React.forwardRef(() => null) }),
-      imagePicker: new ImagePickerAdapter({
-        openCameraAsync: async () => ({ canceled: true, assets: null }),
-        openImageLibraryAsync: async () => ({ canceled: true, assets: null }),
-      }),
-      linking: new LinkingAdapter({ openURL: hostOpenURL, canOpenURL: async () => true }),
-    })
-  })
-
-  it("opens the Giphy link through the host app's linking adapter", () => {
-    const rnOpenURL = jest.spyOn(RNLinking, 'openURL')
-    const { getByText } = render(
-      <ThemeProvider value={DefaultTheme}>
-        <GiphyAttachment attachment={attachment} onMessageLongPress={jest.fn()} />
-      </ThemeProvider>
-    )
-
-    fireEvent.press(getByText('/giphy'))
-
-    expect(hostOpenURL).toHaveBeenCalledWith('https://giphy.com/gifs/cat')
-    expect(rnOpenURL).not.toHaveBeenCalled()
-  })
-})

package/src/__tests__/screens/get_help_screen.test.ts

@@ -1,40 +0,0 @@
-import React from 'react'
-import { Linking as RNLinking } from 'react-native'
-import { sendEmail } from '../../screens/get_help_screen'
-import {
-  AudioAdapter,
-  ChatAdapters,
-  ClipboardAdapter,
-  ImagePickerAdapter,
-  LinkingAdapter,
-  VideoAdapter,
-} from '../../utils/native_adapters'
-
-const hostOpenURL = jest.fn(async (_: string) => {})
-
-describe('sendEmail', () => {
-  beforeAll(() => {
-    ChatAdapters.configure({
-      clipboard: new ClipboardAdapter({
-        getStringAsync: async () => '',
-        setStringAsync: async () => {},
-      }),
-      audio: new AudioAdapter({ useAudio: () => ({}) as any }),
-      video: new VideoAdapter({ Player: React.forwardRef(() => null) }),
-      imagePicker: new ImagePickerAdapter({
-        openCameraAsync: async () => ({ canceled: true, assets: null }),
-        openImageLibraryAsync: async () => ({ canceled: true, assets: null }),
-      }),
-      linking: new LinkingAdapter({ openURL: hostOpenURL, canOpenURL: async () => true }),
-    })
-  })
-
-  it("opens mailto with the system, not the host app's linking adapter", () => {
-    const rnOpenURL = jest.spyOn(RNLinking, 'openURL').mockResolvedValue(undefined)
-
-    sendEmail('help@example.com')
-
-    expect(rnOpenURL).toHaveBeenCalledWith('mailto:help@example.com')
-    expect(hostOpenURL).not.toHaveBeenCalled()
-  })
-})