@planningcenter/chat-react-native 3.26.1-qa-559.0 → 3.26.1-qa-563.0

package/src/components/conversation/messages_disabled_banners.tsx

@@ -2,30 +2,22 @@ import { StyleSheet, View, type ViewStyle } from 'react-native'
 import { useTheme } from '../../hooks'
 import { Text } from '../display'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { useFeatures } from '../../hooks/use_features'
-import { availableFeatures } from '../../hooks/use_features'
 
 export const LeaderMessagesDisabledBanner = () => {
-  const { featureEnabled } = useFeatures()
-  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
-
-  const description = repliesEnabled
-    ? 'Only leaders can send messages in this conversation.'
-    : 'Replies are frozen for everyone else.'
-
-  return <MessagesDisabledBanner description={description} />
+  return (
+    <MessagesDisabledBanner description="Only leaders can send messages in this conversation." />
+  )
 }
 
 export const MemberMessagesDisabledBanner = () => {
   const styles = useStyles()
-  const { featureEnabled } = useFeatures()
-  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
 
-  const description = repliesEnabled
-    ? 'Only leaders can send messages, but you can still add reactions.'
-    : 'Replies have been disabled by a leader, but you can still add reactions.'
-
-  return <MessagesDisabledBanner description={description} style={styles.memberBanner} />
+  return (
+    <MessagesDisabledBanner
+      description="Only leaders can send messages, but you can still add reactions."
+      style={styles.memberBanner}
+    />
+  )
 }
 
 interface MessagesDisabledBannerProps {

package/src/contexts/session_context.tsx

@@ -5,7 +5,6 @@ import React, {
   useCallback,
   useEffect,
   useMemo,
-  useRef,
   useState,
 } from 'react'
 import { Alert } from 'react-native'
@@ -118,9 +117,11 @@ export function SessionContextProvider({
 
   const { token } = currentSession
 
-  const isRefreshingTokenRef = useRef(false)
-
-  const { mutate: refreshToken, isError: isRefreshError } = useMutation({
+  const {
+    mutate: refreshToken,
+    isPending: isRefreshingToken,
+    isError: isRefreshError,
+  } = useMutation({
     mutationKey: ['refresh-token', token?.refresh_token],
     mutationFn: () => {
       if (!token?.refresh_token) {
@@ -130,9 +131,6 @@ export function SessionContextProvider({
         handleTokenUpdate
       )
     },
-    onSettled: () => {
-      isRefreshingTokenRef.current = false
-    },
     onError: (t: Partial<FailedResponse>) => {
       handleRefreshFailed(t)
     },
@@ -246,12 +244,11 @@ export function SessionContextProvider({
       )
       const isExpiredToken = errors.some((e: { detail?: string }) => /baboon/i.test(e.detail || ''))
 
-      if (!isRefreshingTokenRef.current || isExpiredToken || isForcedLogout) {
-        isRefreshingTokenRef.current = true
+      if (!isRefreshingToken || isExpiredToken || isForcedLogout) {
         refreshToken()
       }
     },
-    [refreshToken]
+    [refreshToken, isRefreshingToken]
   )
 
   const sessionContextValue: SessionContextValue = {

package/src/hooks/use_features.ts

@@ -34,7 +34,6 @@ export function useFeatures() {
 }
 
 export const availableFeatures = {
-  threaded_replies: 'ROLLOUT_MOBILE_threaded_replies_v1',
   message_reporting: 'ROLLOUT_MOBILE_message_reporting',
   granular_notifications_ui: 'ROLLOUT_granular_notification_preferences_ui',
 }

package/src/screens/conversation_screen.tsx

@@ -39,7 +39,6 @@ import { CONVERSATION_MESSAGE_LIST_PADDING_HORIZONTAL } from '../utils/styles'
 import { useConversationJoltEvents } from '../hooks/use_conversation_jolt_events'
 import { JumpToBottomButton } from '../components/conversation/jump_to_bottom_button'
 import { ReplyShadowMessage } from '../components/conversation/reply_shadow_message'
-import { availableFeatures, useFeatures } from '../hooks/use_features'
 import { ConversationContextProvider } from '../contexts/conversation_context'
 
 export type ConversationRouteProps = {
@@ -92,12 +91,9 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
   useConversationMessagesJoltEvents({ conversationId: conversation_id })
   useEnsureConversationsRouteExists()
   useMarkLatestMessageRead({ conversation, messages })
-  const { featureEnabled } = useFeatures()
-  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
   const messagesWithSeparators = groupMessages({
     ms: messages,
     inReplyScreen: !!reply_root_id,
-    repliesEnabled,
   })
   const noMessages = messagesWithSeparators.length === 0
 
@@ -199,7 +195,6 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
                   conversation_id={conversation_id}
                   latestReadMessageSortKey={conversation?.latestReadMessageSortKey}
                   inReplyScreen={!!reply_root_id}
-                  repliesEnabled={repliesEnabled}
                 />
               )
             }}
@@ -288,14 +283,9 @@ type ReplyShadowMessage = {
 interface GroupMessagesProps {
   ms: MessageResource[]
   inReplyScreen?: boolean
-  repliesEnabled?: boolean
 }
 
-export const groupMessages = ({
-  ms,
-  inReplyScreen,
-  repliesEnabled = false,
-}: GroupMessagesProps) => {
+export const groupMessages = ({ ms, inReplyScreen }: GroupMessagesProps) => {
   let enrichedMessages: (MessageResource | DateSeparator | ReplyShadowMessage)[] = []
   let encounteredOneOfMyMessages = false
 
@@ -339,7 +329,6 @@ export const groupMessages = ({
         prevMessageDifferentThread ||
         prevMessageIsDateSeparator)
     const nextIsReplyShadowMessage =
-      repliesEnabled &&
       nextMessageInThread &&
       !nextMessageThreadRoot &&
       (nextMessageDifferentThread || nextMessageIsDateSeparator)
@@ -373,7 +362,7 @@ export const groupMessages = ({
 
     enrichedMessages.push(message)
 
-    if (insertReplyShadowMessage && repliesEnabled) {
+    if (insertReplyShadowMessage) {
       enrichedMessages.push({
         type: 'ReplyShadowMessage',
         id: `${message.id}-${message.replyRootId}`,

package/src/screens/message_actions_screen.tsx

@@ -78,7 +78,6 @@ function MessageActionsScreenContent({
   const apiClient = useApiClient()
   const styles = useStyles()
   const { featureEnabled } = useFeatures()
-  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
   const expandedLink = message.attachments.find(attachment => attachment.type === 'ExpandedLink')
   const hasExpandedLink = !!expandedLink
 
@@ -242,7 +241,7 @@ function MessageActionsScreenContent({
         ))}
       </View>
       <View style={styles.actions}>
-        {repliesEnabled && !inReplyScreen && (
+        {!inReplyScreen && (
           <FormSheet.Action
             onPress={handleReplyPress}
             title="Reply to message"