diff --git a/app/components/chips/base_chip.tsx b/app/components/chips/base_chip.tsx index a52fb869d..a1fe166c3 100644 --- a/app/components/chips/base_chip.tsx +++ b/app/components/chips/base_chip.tsx @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. import React from 'react'; -import {Text, TouchableOpacity, useWindowDimensions} from 'react-native'; +import {Platform, Text, TouchableOpacity, useWindowDimensions} from 'react-native'; import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'; import CompassIcon from '@components/compass_icon'; @@ -103,10 +103,13 @@ export default function BaseChip({ ); } + + // https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 + const useFadeOut = showAnimation && Platform.OS !== 'android'; return ( diff --git a/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx b/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx index 0039da9aa..37d63dc09 100644 --- a/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx +++ b/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx @@ -145,7 +145,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu > diff --git a/app/screens/find_channels/filtered_list/filtered_list.tsx b/app/screens/find_channels/filtered_list/filtered_list.tsx index 6d9414b7d..6d7cb6948 100644 --- a/app/screens/find_channels/filtered_list/filtered_list.tsx +++ b/app/screens/find_channels/filtered_list/filtered_list.tsx @@ -4,7 +4,7 @@ import {debounce, type DebouncedFunc} from 'lodash'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {useIntl} from 'react-intl'; -import {Alert, FlatList, type ListRenderItemInfo, StyleSheet, View} from 'react-native'; +import {Alert, FlatList, type ListRenderItemInfo, Platform, StyleSheet, View} from 'react-native'; import Animated, {FadeInDown, FadeOutUp} from 'react-native-reanimated'; import {switchToGlobalThreads} from '@actions/local/thread'; @@ -336,7 +336,7 @@ const FilteredList = ({ return ( { return ( diff --git a/app/screens/find_channels/unfiltered_list/unfiltered_list.tsx b/app/screens/find_channels/unfiltered_list/unfiltered_list.tsx index ccd45a4e0..4cb1fb494 100644 --- a/app/screens/find_channels/unfiltered_list/unfiltered_list.tsx +++ b/app/screens/find_channels/unfiltered_list/unfiltered_list.tsx @@ -3,7 +3,7 @@ import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {useIntl} from 'react-intl'; -import {SectionList, type SectionListRenderItemInfo, StyleSheet} from 'react-native'; +import {Platform, SectionList, type SectionListRenderItemInfo, StyleSheet} from 'react-native'; import Animated, {FadeInDown, FadeOutUp} from 'react-native-reanimated'; import {switchToChannelById} from '@actions/remote/channel'; @@ -81,7 +81,7 @@ const UnfilteredList = ({close, keyboardOverlap, recentChannels, showTeamName, t return (