diff --git a/native/chat/chat-context-provider.react.js b/native/chat/chat-context-provider.react.js
index 4115cf778..940c4368e 100644
--- a/native/chat/chat-context-provider.react.js
+++ b/native/chat/chat-context-provider.react.js
@@ -1,174 +1,168 @@
 // @flow
 
 import * as React from 'react';
 
 import type { ChatMessageItem } from 'lib/selectors/chat-selectors';
 import type { ThreadInfo } from 'lib/types/thread-types';
 
 import type { ChatMessageItemWithHeight } from '../types/chat-types';
 import { ChatContext } from './chat-context';
 import type { SidebarAnimationType } from './chat-context';
 import ChatItemHeightMeasurer from './chat-item-height-measurer.react';
 
 type Props = {
   +children: React.Node,
 };
 
 export type MeasurementTask = {
   +messages: $ReadOnlyArray<ChatMessageItem>,
   +threadInfo: ThreadInfo,
   +onMessagesMeasured: (
     messagesWithHeight: $ReadOnlyArray<ChatMessageItemWithHeight>,
     measuredHeights: $ReadOnlyMap<string, number>,
   ) => mixed,
   +measurerID: number,
   +initialMeasuredHeights: ?$ReadOnlyMap<string, number>,
 };
 
 function ChatContextProvider(props: Props): React.Node {
   const [measurements, setMeasurements] = React.useState<
     $ReadOnlyArray<MeasurementTask>,
   >([]);
   const nextMeasurerID = React.useRef(0);
   const measuredHeights = React.useRef<
     Map<number, $ReadOnlyMap<string, number>>,
   >(new Map());
 
   const measureMessages = React.useCallback(
     (
       messages: $ReadOnlyArray<ChatMessageItem>,
       threadInfo: ?ThreadInfo,
       onMessagesMeasured: ($ReadOnlyArray<ChatMessageItemWithHeight>) => mixed,
       measurerID: number,
     ) => {
       if (!threadInfo) {
         // When threadInfo is not present, we can't measure the messages: we can
         // determine the height, but we can't merge the result as it requires
         // threadInfo to be present.
         return;
       }
 
       const measureCallback = (
         messagesWithHeight: $ReadOnlyArray<ChatMessageItemWithHeight>,
         newMeasuredHeights: $ReadOnlyMap<string, number>,
       ) => {
         measuredHeights.current.set(measurerID, newMeasuredHeights);
         onMessagesMeasured(messagesWithHeight);
       };
 
       let initialMeasuredHeights = null;
       const isMeasurementPresent = measuredHeights.current.has(measurerID);
       if (!isMeasurementPresent) {
         const sourceMeasurerID = measurements.find(
           measurement => measurement.threadInfo.id === threadInfo.id,
         )?.measurerID;
         initialMeasuredHeights = sourceMeasurerID
           ? measuredHeights.current.get(sourceMeasurerID)
           : null;
       }
 
       const newMeasurement = {
         messages,
         threadInfo,
         onMessagesMeasured: measureCallback,
         measurerID,
         initialMeasuredHeights,
       };
       setMeasurements(prevMeasurements => {
         const withoutCurrentMeasurement = prevMeasurements.filter(
           measurement => measurement.measurerID !== measurerID,
         );
         return [...withoutCurrentMeasurement, newMeasurement];
       });
     },
     [measurements],
   );
 
   const registerMeasurer = React.useCallback(() => {
     const measurerID = nextMeasurerID.current++;
     return {
       measure: (
         messages: $ReadOnlyArray<ChatMessageItem>,
         threadInfo: ?ThreadInfo,
         onMessagesMeasured: (
           $ReadOnlyArray<ChatMessageItemWithHeight>,
         ) => mixed,
       ) =>
         measureMessages(messages, threadInfo, onMessagesMeasured, measurerID),
       unregister: () => {
         setMeasurements(prevMeasurements =>
           prevMeasurements.filter(
             measurement => measurement.measurerID !== measurerID,
           ),
         );
         measuredHeights.current.delete(measurerID);
       },
     };
   }, [measureMessages]);
 
   const [
     currentTransitionSidebarSourceID,
     setCurrentTransitionSidebarSourceID,
   ] = React.useState<?string>(null);
 
   const chatInputBarHeights = React.useRef<Map<string, number>>(new Map());
   const setChatInputBarHeight = React.useCallback(
     (threadID: string, height: number) =>
       chatInputBarHeights.current.set(threadID, height),
     [],
   );
   const deleteChatInputBarHeight = React.useCallback(
     (threadID: string) => chatInputBarHeights.current.delete(threadID),
     [],
   );
 
   const [
     sidebarAnimationType,
     setSidebarAnimationType,
   ] = React.useState<SidebarAnimationType>('move_source_message');
-  const setSidebarAnimationTypeCallback = React.useCallback(
-    (animationType: SidebarAnimationType) =>
-      setSidebarAnimationType(animationType),
-    [],
-  );
 
   const contextValue = React.useMemo(
     () => ({
       registerMeasurer,
       currentTransitionSidebarSourceID,
       setCurrentTransitionSidebarSourceID,
       setChatInputBarHeight,
       deleteChatInputBarHeight,
       chatInputBarHeights: chatInputBarHeights.current,
       sidebarAnimationType,
-      setSidebarAnimationType: setSidebarAnimationTypeCallback,
+      setSidebarAnimationType,
     }),
     [
       currentTransitionSidebarSourceID,
       deleteChatInputBarHeight,
       registerMeasurer,
       setChatInputBarHeight,
-      setSidebarAnimationTypeCallback,
       sidebarAnimationType,
     ],
   );
 
   const heightMeasurers = React.useMemo(
     () =>
       measurements.map(measurement => (
         <ChatItemHeightMeasurer
           key={measurement.measurerID}
           measurement={measurement}
         />
       )),
     [measurements],
   );
   return (
     <ChatContext.Provider value={contextValue}>
       {heightMeasurers}
       {props.children}
     </ChatContext.Provider>
   );
 }
 
 export default ChatContextProvider;
diff --git a/native/chat/utils.js b/native/chat/utils.js
index 9eda4f05e..da4b9fa8b 100644
--- a/native/chat/utils.js
+++ b/native/chat/utils.js
@@ -1,421 +1,414 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import Animated from 'react-native-reanimated';
 
 import { useMessageListData } from 'lib/selectors/chat-selectors';
 import type { ChatMessageItem } from 'lib/selectors/chat-selectors';
 import { messageKey } from 'lib/shared/message-utils';
 import { colorIsDark, viewerIsMember } from 'lib/shared/thread-utils';
 import type { ThreadInfo } from 'lib/types/thread-types';
 
 import { KeyboardContext } from '../keyboard/keyboard-state';
 import { OverlayContext } from '../navigation/overlay-context';
 import {
   MultimediaMessageTooltipModalRouteName,
   RobotextMessageTooltipModalRouteName,
   TextMessageTooltipModalRouteName,
 } from '../navigation/route-names';
 import { useSelector } from '../redux/redux-utils';
 import type {
   ChatMessageInfoItemWithHeight,
   ChatMessageItemWithHeight,
   ChatRobotextMessageInfoItemWithHeight,
   ChatTextMessageInfoItemWithHeight,
 } from '../types/chat-types';
 import type { LayoutCoordinates, VerticalBounds } from '../types/layout-types';
 import type { AnimatedViewStyle } from '../types/styles';
 import { clusterEndHeight, inlineEngagementStyle } from './chat-constants';
 import { ChatContext, useHeightMeasurer } from './chat-context';
 import { failedSendHeight } from './failed-send.react';
 import { authorNameHeight } from './message-header.react';
 import { multimediaMessageItemHeight } from './multimedia-message-utils';
 import { getUnresolvedSidebarThreadInfo } from './sidebar-navigation';
 import textMessageSendFailed from './text-message-send-failed';
 import { timestampHeight } from './timestamp.react';
 
 /* eslint-disable import/no-named-as-default-member */
 const {
   Node,
   Extrapolate,
   interpolateNode,
   interpolateColors,
   block,
   call,
   eq,
   cond,
   sub,
 } = Animated;
 /* eslint-enable import/no-named-as-default-member */
 
 function textMessageItemHeight(
   item: ChatTextMessageInfoItemWithHeight,
 ): number {
   const { messageInfo, contentHeight, startsCluster, endsCluster } = item;
   const { isViewer } = messageInfo.creator;
   let height = 5 + contentHeight; // 5 from marginBottom in ComposedMessage
   if (!isViewer && startsCluster) {
     height += authorNameHeight;
   }
   if (endsCluster) {
     height += clusterEndHeight;
   }
   if (textMessageSendFailed(item)) {
     height += failedSendHeight;
   }
   if (item.threadCreatedFromMessage || item.reactions.size > 0) {
     height +=
       inlineEngagementStyle.height +
       inlineEngagementStyle.marginTop +
       inlineEngagementStyle.marginBottom;
   }
   return height;
 }
 
 function robotextMessageItemHeight(
   item: ChatRobotextMessageInfoItemWithHeight,
 ): number {
   if (item.threadCreatedFromMessage || item.reactions.size > 0) {
     return item.contentHeight + inlineEngagementStyle.height;
   }
   return item.contentHeight;
 }
 
 function messageItemHeight(item: ChatMessageInfoItemWithHeight): number {
   let height = 0;
   if (item.messageShapeType === 'text') {
     height += textMessageItemHeight(item);
   } else if (item.messageShapeType === 'multimedia') {
     height += multimediaMessageItemHeight(item);
   } else {
     height += robotextMessageItemHeight(item);
   }
   if (item.startsConversation) {
     height += timestampHeight;
   }
   return height;
 }
 
 function chatMessageItemHeight(item: ChatMessageItemWithHeight): number {
   if (item.itemType === 'loader') {
     return 56;
   }
   return messageItemHeight(item);
 }
 
 function useMessageTargetParameters(
   sourceMessage: ChatMessageInfoItemWithHeight,
   initialCoordinates: LayoutCoordinates,
   messageListVerticalBounds: VerticalBounds,
   currentInputBarHeight: number,
   targetInputBarHeight: number,
   sidebarThreadInfo: ?ThreadInfo,
 ): {
   +position: number,
   +color: string,
 } {
   const messageListData = useMessageListData({
     searching: false,
     userInfoInputArray: [],
     threadInfo: sidebarThreadInfo,
   });
 
   const [
     messagesWithHeight,
     setMessagesWithHeight,
   ] = React.useState<?$ReadOnlyArray<ChatMessageItemWithHeight>>(null);
   const measureMessages = useHeightMeasurer();
 
   React.useEffect(() => {
     if (messageListData) {
       measureMessages(
         messageListData,
         sidebarThreadInfo,
         setMessagesWithHeight,
       );
     }
   }, [measureMessages, messageListData, sidebarThreadInfo]);
 
   const sourceMessageID = sourceMessage.messageInfo?.id;
   const targetDistanceFromBottom = React.useMemo(() => {
     if (!messagesWithHeight) {
       return 0;
     }
 
     let offset = 0;
     for (const message of messagesWithHeight) {
       offset += chatMessageItemHeight(message);
       if (message.messageInfo && message.messageInfo.id === sourceMessageID) {
         return offset;
       }
     }
 
     return (
       messageListVerticalBounds.height + chatMessageItemHeight(sourceMessage)
     );
   }, [
     messageListVerticalBounds.height,
     messagesWithHeight,
     sourceMessage,
     sourceMessageID,
   ]);
 
   if (!sidebarThreadInfo) {
     return {
       position: 0,
       color: sourceMessage.threadInfo.color,
     };
   }
 
   const authorNameComponentHeight = sourceMessage.messageInfo.creator.isViewer
     ? 0
     : authorNameHeight;
   const currentDistanceFromBottom =
     messageListVerticalBounds.height +
     messageListVerticalBounds.y -
     initialCoordinates.y +
     timestampHeight +
     authorNameComponentHeight +
     currentInputBarHeight;
   return {
     position:
       targetDistanceFromBottom +
       targetInputBarHeight -
       currentDistanceFromBottom,
     color: sidebarThreadInfo.color,
   };
 }
 
 type AnimatedMessageArgs = {
   +sourceMessage: ChatMessageInfoItemWithHeight,
   +initialCoordinates: LayoutCoordinates,
   +messageListVerticalBounds: VerticalBounds,
   +progress: Node,
   +targetInputBarHeight: ?number,
 };
 
 function useAnimatedMessageTooltipButton({
   sourceMessage,
   initialCoordinates,
   messageListVerticalBounds,
   progress,
   targetInputBarHeight,
 }: AnimatedMessageArgs): {
   +style: AnimatedViewStyle,
   +threadColorOverride: ?Node,
   +isThreadColorDarkOverride: ?boolean,
 } {
   const chatContext = React.useContext(ChatContext);
   invariant(chatContext, 'chatContext should be set');
   const {
     currentTransitionSidebarSourceID,
     setCurrentTransitionSidebarSourceID,
     chatInputBarHeights,
     sidebarAnimationType,
     setSidebarAnimationType,
   } = chatContext;
 
   const viewerID = useSelector(
     state => state.currentUserInfo && state.currentUserInfo.id,
   );
   const sidebarThreadInfo = React.useMemo(
     () => getUnresolvedSidebarThreadInfo({ sourceMessage, viewerID }),
     [sourceMessage, viewerID],
   );
 
   const currentInputBarHeight =
     chatInputBarHeights.get(sourceMessage.threadInfo.id) ?? 0;
   const keyboardState = React.useContext(KeyboardContext);
-  const viewerIsSidebarMember = viewerIsMember(sidebarThreadInfo);
+
+  const newSidebarAnimationType =
+    !currentInputBarHeight ||
+    !targetInputBarHeight ||
+    keyboardState?.keyboardShowing ||
+    !viewerIsMember(sidebarThreadInfo)
+      ? 'fade_source_message'
+      : 'move_source_message';
   React.useEffect(() => {
-    const newSidebarAnimationType =
-      !currentInputBarHeight ||
-      !targetInputBarHeight ||
-      keyboardState?.keyboardShowing ||
-      !viewerIsSidebarMember
-        ? 'fade_source_message'
-        : 'move_source_message';
     setSidebarAnimationType(newSidebarAnimationType);
-  }, [
-    currentInputBarHeight,
-    keyboardState?.keyboardShowing,
-    setSidebarAnimationType,
-    sidebarThreadInfo,
-    targetInputBarHeight,
-    viewerIsSidebarMember,
-  ]);
+  }, [setSidebarAnimationType, newSidebarAnimationType]);
 
   const {
     position: targetPosition,
     color: targetColor,
   } = useMessageTargetParameters(
     sourceMessage,
     initialCoordinates,
     messageListVerticalBounds,
     currentInputBarHeight,
     targetInputBarHeight ?? currentInputBarHeight,
     sidebarThreadInfo,
   );
 
   React.useEffect(() => {
     return () => setCurrentTransitionSidebarSourceID(null);
   }, [setCurrentTransitionSidebarSourceID]);
 
   const bottom = React.useMemo(
     () =>
       interpolateNode(progress, {
         inputRange: [0.3, 1],
         outputRange: [targetPosition, 0],
         extrapolate: Extrapolate.CLAMP,
       }),
     [progress, targetPosition],
   );
 
   const [
     isThreadColorDarkOverride,
     setThreadColorDarkOverride,
   ] = React.useState<?boolean>(null);
   const setThreadColorBrightness = React.useCallback(() => {
     const isSourceThreadDark = colorIsDark(sourceMessage.threadInfo.color);
     const isTargetThreadDark = colorIsDark(targetColor);
     if (isSourceThreadDark !== isTargetThreadDark) {
       setThreadColorDarkOverride(isTargetThreadDark);
     }
   }, [sourceMessage.threadInfo.color, targetColor]);
 
   const threadColorOverride = React.useMemo(() => {
     if (
       sourceMessage.messageShapeType !== 'text' ||
       !currentTransitionSidebarSourceID
     ) {
       return null;
     }
     return block([
       cond(eq(progress, 1), call([], setThreadColorBrightness)),
       interpolateColors(progress, {
         inputRange: [0, 1],
         outputColorRange: [
           `#${targetColor}`,
           `#${sourceMessage.threadInfo.color}`,
         ],
       }),
     ]);
   }, [
     currentTransitionSidebarSourceID,
     progress,
     setThreadColorBrightness,
     sourceMessage.messageShapeType,
     sourceMessage.threadInfo.color,
     targetColor,
   ]);
 
   const messageContainerStyle = React.useMemo(() => {
     return {
       bottom: currentTransitionSidebarSourceID ? bottom : 0,
       opacity:
         currentTransitionSidebarSourceID &&
         sidebarAnimationType === 'fade_source_message'
           ? 0
           : 1,
     };
   }, [bottom, currentTransitionSidebarSourceID, sidebarAnimationType]);
 
   return {
     style: messageContainerStyle,
     threadColorOverride,
     isThreadColorDarkOverride,
   };
 }
 
 function getMessageTooltipKey(item: ChatMessageInfoItemWithHeight): string {
   return `tooltip|${messageKey(item.messageInfo)}`;
 }
 
 function isMessageTooltipKey(key: string): boolean {
   return key.startsWith('tooltip|');
 }
 
 function useOverlayPosition(item: ChatMessageInfoItemWithHeight) {
   const overlayContext = React.useContext(OverlayContext);
   invariant(overlayContext, 'should be set');
 
   for (const overlay of overlayContext.visibleOverlays) {
     if (
       (overlay.routeName === MultimediaMessageTooltipModalRouteName ||
         overlay.routeName === TextMessageTooltipModalRouteName ||
         overlay.routeName === RobotextMessageTooltipModalRouteName) &&
       overlay.routeKey === getMessageTooltipKey(item)
     ) {
       return overlay.position;
     }
   }
   return undefined;
 }
 
 function useContentAndHeaderOpacity(
   item: ChatMessageInfoItemWithHeight,
 ): number | Node {
   const overlayPosition = useOverlayPosition(item);
   const chatContext = React.useContext(ChatContext);
   return React.useMemo(
     () =>
       overlayPosition &&
       chatContext?.sidebarAnimationType === 'move_source_message'
         ? sub(
             1,
             interpolateNode(overlayPosition, {
               inputRange: [0.05, 0.06],
               outputRange: [0, 1],
               extrapolate: Extrapolate.CLAMP,
             }),
           )
         : 1,
     [chatContext?.sidebarAnimationType, overlayPosition],
   );
 }
 
 function useDeliveryIconOpacity(
   item: ChatMessageInfoItemWithHeight,
 ): number | Node {
   const overlayPosition = useOverlayPosition(item);
   const chatContext = React.useContext(ChatContext);
   return React.useMemo(() => {
     if (
       !overlayPosition ||
       !chatContext?.currentTransitionSidebarSourceID ||
       chatContext?.sidebarAnimationType === 'fade_source_message'
     ) {
       return 1;
     }
     return interpolateNode(overlayPosition, {
       inputRange: [0.05, 0.06, 1],
       outputRange: [1, 0, 0],
       extrapolate: Extrapolate.CLAMP,
     });
   }, [
     chatContext?.currentTransitionSidebarSourceID,
     chatContext?.sidebarAnimationType,
     overlayPosition,
   ]);
 }
 
 function chatMessageItemKey(
   item: ChatMessageItemWithHeight | ChatMessageItem,
 ): string {
   if (item.itemType === 'loader') {
     return 'loader';
   }
   return messageKey(item.messageInfo);
 }
 
 export {
   chatMessageItemKey,
   chatMessageItemHeight,
   useAnimatedMessageTooltipButton,
   messageItemHeight,
   getMessageTooltipKey,
   isMessageTooltipKey,
   useContentAndHeaderOpacity,
   useDeliveryIconOpacity,
 };