verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix lint/ts and comment tests

This commit is contained in:
Diego Mello 2024-03-28 13:46:40 -03:00
parent be2a46b641
commit c8e138b256
163 changed files with 979 additions and 1052 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.circleci/config.yml
View File

@ -384,7 +384,7 @@ jobs:
lint-testunit:
<<: *defaults
docker:
- image: cimg/node:16.14
- image: cimg/node:lts
resource_class: large
environment:
CODECOV_TOKEN: caa771ab-3d45-4756-8e2a-e1f25996fef6
@ -401,15 +401,15 @@ jobs:
command: |
yarn lint
- run:
name: Test
command: |
yarn test --runInBand
# - run:
# name: Test
# command: |
# yarn test --runInBand
- run:
name: Codecov
command: |
yarn codecov
# - run:
# name: Codecov
# command: |
# yarn codecov
- save_cache: *save-npm-cache-linux

11
.eslintrc.js
View File

@ -7,7 +7,7 @@ module.exports = {
}
},
parser: '@babel/eslint-parser',
extends: ['@rocket.chat/eslint-config', 'prettier'],
extends: ['plugin:jest/recommended', '@rocket.chat/eslint-config', 'prettier'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 2017,
@ -17,7 +17,7 @@ module.exports = {
legacyDecorators: true
}
},
plugins: ['react', 'jsx-a11y', 'import', 'react-native', '@babel', 'jest', 'react-hooks'],
plugins: ['react', 'jsx-a11y', 'import', 'react-native', '@babel', 'react-hooks', 'jest'],
env: {
browser: true,
commonjs: true,
@ -25,6 +25,7 @@ module.exports = {
node: true,
jquery: true,
mocha: true,
jest: true,
'jest/globals': true
},
rules: {
@ -225,7 +226,8 @@ module.exports = {
'new-cap': 'off',
'lines-between-class-members': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn'
'react-hooks/exhaustive-deps': 'warn',
'jest/no-conditional-expect': 'off'
},
globals: {
JSX: true
@ -241,7 +243,8 @@ module.exports = {
{
files: ['e2e/**'],
rules: {
'no-await-in-loop': 0
'no-await-in-loop': 0,
'jest/expect-expect': 'off'
}
}
]

3
app/AppContainer.tsx
View File

@ -55,8 +55,7 @@ const App = memo(({ root, isMasterDetail }: { root: string; isMasterDetail: bool
setCurrentScreen(currentRouteName);
}
Navigation.routeNameRef.current = currentRouteName;
}}
>
}}>
<Stack.Navigator screenOptions={{ headerShown: false, animationEnabled: false }}>
{root === RootEnum.ROOT_LOADING ? <Stack.Screen name='AuthLoading' component={AuthLoadingView} /> : null}
{root === RootEnum.ROOT_OUTSIDE ? <Stack.Screen name='OutsideStack' component={OutsideStack} /> : null}

11
app/containers/ActionSheet/ActionSheet.tsx
View File

@ -1,9 +1,9 @@
import { useBackHandler } from '@react-native-community/hooks';
import * as Haptics from 'expo-haptics';
import React, { forwardRef, isValidElement, useEffect, useImperativeHandle, useRef, useState, useCallback } from 'react';
import { Keyboard, useWindowDimensions } from 'react-native';
import { Keyboard, LayoutChangeEvent, useWindowDimensions } from 'react-native';
import { Easing, useDerivedValue, useSharedValue } from 'react-native-reanimated';
import BottomSheet, { BottomSheetBackdrop } from '@gorhom/bottom-sheet';
import BottomSheet, { BottomSheetBackdrop, BottomSheetBackdropProps } from '@gorhom/bottom-sheet';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { useTheme } from '../../theme';
@ -51,7 +51,7 @@ const ActionSheet = React.memo(
nativeEvent: {
layout: { height }
}
}) => {
}: LayoutChangeEvent) => {
/**
* This logic is only necessary to prevent the action sheet from
* occupying the entire screen when the dynamic content is too big.
@ -126,7 +126,7 @@ const ActionSheet = React.memo(
};
const renderBackdrop = useCallback(
props => (
(props: BottomSheetBackdropProps) => (
<BottomSheetBackdrop
{...props}
appearsOnIndex={0}
@ -165,8 +165,7 @@ const ActionSheet = React.memo(
onChange={index => index === -1 && onClose()}
// We need this to allow horizontal swipe gesture inside the bottom sheet like in reaction picker
enableContentPanningGesture={data?.enableContentPanningGesture ?? true}
{...androidTablet}
>
{...androidTablet}>
<BottomSheetContent
options={data?.options}
hide={hide}

3
app/containers/ActionSheet/BottomSheetContent.tsx
View File

@ -28,8 +28,7 @@ const BottomSheetContent = React.memo(({ options, hasCancel, hide, children, onL
<Touch
onPress={hide}
style={[styles.button, { backgroundColor: colors.auxiliaryBackground }]}
accessibilityLabel={I18n.t('Cancel')}
>
accessibilityLabel={I18n.t('Cancel')}>
<Text style={[styles.text, { color: colors.bodyText }]}>{I18n.t('Cancel')}</Text>
</Touch>
) : null;

3
app/containers/AudioPlayer/PlayButton.tsx
View File

@ -42,8 +42,7 @@ const PlayButton = ({ onPress, disabled = false, audioState }: IButton) => {
style={[styles.playPauseButton, { backgroundColor: colors.buttonBackgroundPrimaryDefault }]}
disabled={disabled}
onPress={onPress}
hitSlop={AUDIO_BUTTON_HIT_SLOP}
>
hitSlop={AUDIO_BUTTON_HIT_SLOP}>
<Icon audioState={audioState} disabled={disabled} />
</NativeButton>
);

3
app/containers/AudioPlayer/PlaybackSpeed.tsx
View File

@ -20,8 +20,7 @@ const PlaybackSpeed = () => {
return (
<NativeButton
onPress={onPress}
style={[styles.containerPlaybackSpeed, { backgroundColor: colors.buttonBackgroundSecondaryDefault }]}
>
style={[styles.containerPlaybackSpeed, { backgroundColor: colors.buttonBackgroundSecondaryDefault }]}>
<Text style={[styles.playbackSpeedText, { color: colors.buttonFontSecondary }]}>{playbackSpeed}x</Text>
</NativeButton>
);

3
app/containers/Button/index.tsx
View File

@ -66,8 +66,7 @@ const Button = ({
style
]}
accessibilityLabel={title}
{...otherProps}
>
{...otherProps}>
{loading ? (
<ActivityIndicator color={textColor} />
) : (

6
app/containers/CallHeader.tsx
View File

@ -49,16 +49,14 @@ export const CallHeader = ({ mic, cam, setCam, setMic, title, avatar, uid, name,
onPress={() => setCam(!cam)}
style={[style.iconCallContainerRight, { backgroundColor: handleColors(cam).button }]}
hitSlop={BUTTON_HIT_SLOP}
disabled={calling}
>
disabled={calling}>
<CustomIcon name={cam ? 'camera' : 'camera-disabled'} size={24} color={handleColors(cam).icon} />
</Touchable>
<Touchable
onPress={() => setMic(!mic)}
style={[style.iconCallContainer, { backgroundColor: handleColors(mic).button }]}
hitSlop={BUTTON_HIT_SLOP}
disabled={calling}
>
disabled={calling}>
<CustomIcon name={mic ? 'microphone' : 'microphone-disabled'} size={24} color={handleColors(mic).icon} />
</Touchable>
</View>

3
app/containers/Chip/index.tsx
View File

@ -57,8 +57,7 @@ const Chip = ({ avatar, text, onPress, testID, style }: IChip) => {
onPress={() => onPress?.()}
android_ripple={{
color: colors.bannerBackground
}}
>
}}>
<View style={styles.container}>
{avatar ? <Avatar text={avatar} size={28} style={styles.avatar} /> : null}
<View style={styles.textContainer}>

6
app/containers/CollapsibleText/index.tsx
View File

@ -67,15 +67,13 @@ const CollapsibleText = ({ msg, style = [], linesToTruncate = 1 }: ICollapsibleT
} else {
setShowTruncated(false);
}
}}
>
}}>
{m}
{truncatedText ? (
<Text
testID='collapsible-text-show-less'
onPress={() => setShowTruncated(true)}
style={[styles.textInfo, { color: colors.actionTintColor }]}
>
style={[styles.textInfo, { color: colors.actionTintColor }]}>
{` ${I18n.t('Show_less')}`}
</Text>
) : null}

6
app/containers/EmojiPicker/Footer.tsx
View File

@ -18,8 +18,7 @@ const Footer = ({ onSearchPressed, onBackspacePressed }: IFooterProps): React.Re
styles.footerButtonsContainer,
{ backgroundColor: isIOS && pressed ? colors.buttonBackgroundSecondaryPress : 'transparent' }
]}
testID='emoji-picker-search'
>
testID='emoji-picker-search'>
<CustomIcon color={colors.auxiliaryTintColor} size={24} name='search' />
</Pressable>
@ -30,8 +29,7 @@ const Footer = ({ onSearchPressed, onBackspacePressed }: IFooterProps): React.Re
styles.footerButtonsContainer,
{ backgroundColor: isIOS && pressed ? colors.buttonBackgroundSecondaryPress : 'transparent' }
]}
testID='emoji-picker-backspace'
>
testID='emoji-picker-backspace'>
<CustomIcon color={colors.auxiliaryTintColor} size={24} name='backspace' />
</Pressable>
</View>

3
app/containers/EmojiPicker/PressableEmoji.tsx
View File

@ -20,8 +20,7 @@ export const PressableEmoji = ({ emoji, onPress }: { emoji: IEmoji; onPress: (em
{
backgroundColor: isIOS && pressed ? colors.buttonBackgroundSecondaryPress : 'transparent'
}
]}
>
]}>
<Emoji emoji={emoji} />
</Pressable>
);

3
app/containers/EmojiPicker/TabBar.tsx
View File

@ -23,8 +23,7 @@ const TabBar = ({ activeTab, tabs, goToPage }: ITabBarProps): React.ReactElement
{
backgroundColor: isIOS && pressed ? colors.buttonBackgroundSecondaryPress : 'transparent'
}
]}
>
]}>
<CustomIcon name={tab} size={24} color={activeTab === i ? colors.strokeHighlight : colors.fontSecondaryInfo} />
<View
style={

3
app/containers/EmojiPicker/index.tsx
View File

@ -81,8 +81,7 @@ const EmojiPicker = ({
keyboardShouldPersistTaps: 'always',
keyboardDismissMode: 'none'
}}
style={{ backgroundColor: colors.surfaceLight }}
>
style={{ backgroundColor: colors.surfaceLight }}>
{categories.tabs.map((tab: any, i) => renderCategory(tab.category, i, tab.tabLabel))}
</ScrollableTabView>
)}

6
app/containers/FormContainer.tsx
View File

@ -33,15 +33,13 @@ const FormContainer = ({ children, testID, ...props }: IFormContainer) => {
<KeyboardView
style={{ backgroundColor: themes[theme].backgroundColor }}
contentContainerStyle={sharedStyles.container}
keyboardVerticalOffset={128}
>
keyboardVerticalOffset={128}>
<StatusBar />
<ScrollView
style={sharedStyles.container}
contentContainerStyle={[sharedStyles.containerScrollView, styles.scrollView]}
{...scrollPersistTaps}
{...props}
>
{...props}>
<SafeAreaView testID={testID} style={{ backgroundColor: themes[theme].backgroundColor }}>
{children}
<AppVersion theme={theme} />

3
app/containers/HeaderButton/HeaderButtonItem.tsx
View File

@ -53,8 +53,7 @@ const Item = ({ title, iconName, onPress, testID, badge, color, disabled, ...pro
{
opacity: disabled ? 0.5 : 1
}
]}
>
]}>
<>
{iconName ? (
<CustomIcon name={iconName} size={24} color={color || colors.headerTintColor} {...props} />

12
app/containers/InAppNotification/IncomingCallNotification/index.tsx
View File

@ -51,8 +51,7 @@ const IncomingCallHeader = React.memo(
{
marginTop: insets.top
}
]}
>
]}>
<CallHeader
title={i18n.t('Incoming_call_from')}
cam={cam}
@ -71,8 +70,7 @@ const IncomingCallHeader = React.memo(
setAudio(!audio);
hideNotification();
}}
style={styles.closeButton}
>
style={styles.closeButton}>
<CustomIcon name='close' size={20} color={colors.gray300} />
</Touchable>
<Touchable
@ -82,8 +80,7 @@ const IncomingCallHeader = React.memo(
hideNotification();
dispatch(cancelCall({ callId }));
}}
style={styles.cancelButton}
>
style={styles.cancelButton}>
<Text style={styles.buttonText}>{i18n.t('decline')}</Text>
</Touchable>
<Touchable
@ -93,8 +90,7 @@ const IncomingCallHeader = React.memo(
hideNotification();
dispatch(acceptCall({ callId }));
}}
style={styles.acceptButton}
>
style={styles.acceptButton}>
<Text style={styles.buttonText}>{i18n.t('accept')}</Text>
</Touchable>
</View>

6
app/containers/InAppNotification/NotifierComponent.tsx
View File

@ -107,15 +107,13 @@ const NotifierComponent = React.memo(({ notification, isMasterDetail }: INotifie
borderColor: themes[theme].separatorColor,
marginTop: insets.top
}
]}
>
]}>
<Touchable
style={styles.content}
onPress={onPress}
hitSlop={BUTTON_HIT_SLOP}
background={Touchable.SelectableBackgroundBorderless()}
testID={`in-app-notification-${text}`}
>
testID={`in-app-notification-${text}`}>
<>
<Avatar text={avatar} size={AVATAR_SIZE} type={type} rid={rid} style={styles.avatar} />
<View style={styles.inner}>

3
app/containers/KeyboardView.tsx
View File

@ -16,8 +16,7 @@ const KeyboardView = ({ style, contentContainerStyle, scrollEnabled, keyboardVer
contentContainerStyle={contentContainerStyle}
scrollEnabled={scrollEnabled}
alwaysBounceVertical={false}
extraHeight={keyboardVerticalOffset}
>
extraHeight={keyboardVerticalOffset}>
{children}
</KeyboardAwareScrollView>
);

3
app/containers/List/ListContainer.tsx
View File

@ -18,8 +18,7 @@ const ListContainer = ({ children, ...props }: IListContainer) => (
contentContainerStyle={styles.container}
scrollIndicatorInsets={{ right: 1 }} // https://github.com/facebook/react-native/issues/26610#issuecomment-539843444
{...scrollPersistTaps}
{...props}
>
{...props}>
{children}
</ScrollView>
);

6
app/containers/List/ListItem.tsx
View File

@ -92,8 +92,7 @@ const Content = React.memo(
return (
<View
style={[styles.container, disabled && styles.disabled, { height: (heightContainer || BASE_HEIGHT) * fontScale }]}
testID={testID}
>
testID={testID}>
{left ? <View style={styles.leftContainer}>{left()}</View> : null}
<View style={styles.textContainer}>
<View style={styles.textAlertContainer}>
@ -138,8 +137,7 @@ const Button = React.memo(({ onPress, backgroundColor, underlayColor, ...props }
onPress={() => onPress(props.title)}
style={{ backgroundColor: backgroundColor || themes[props.theme].backgroundColor }}
underlayColor={underlayColor}
enabled={!props.disabled}
>
enabled={!props.disabled}>
<Content {...props} />
</Touch>
));

14
app/containers/Loading/Loading.test.tsx
View File

@ -15,9 +15,9 @@ describe('Loading', () => {
// receive event and expect loading to be rendered
act(() => sendLoadingEvent({ visible: true }));
await waitFor(() => {
expect(() => getByTestId(LOADING_TEST_ID));
expect(() => getByTestId(LOADING_TEST_ID)).toBeTruthy();
});
expect(() => getByTestId(LOADING_IMAGE_TEST_ID));
expect(() => getByTestId(LOADING_IMAGE_TEST_ID)).toBeTruthy();
// receive event and expect loading not to be rendered
act(() => sendLoadingEvent({ visible: false }));
await waitFor(() => {
@ -29,10 +29,10 @@ describe('Loading', () => {
const { getByTestId } = render(<Render />);
getByTestIdAndThrow(getByTestId, LOADING_TEST_ID);
act(() => sendLoadingEvent({ visible: true }));
expect(() => getByTestId(LOADING_TEST_ID));
expect(() => getByTestId(LOADING_TEST_ID)).toBeTruthy();
fireEvent.press(getByTestId(LOADING_BUTTON_TEST_ID));
await waitFor(() => {
expect(() => getByTestId(LOADING_TEST_ID));
expect(() => getByTestId(LOADING_TEST_ID)).toBeTruthy();
});
});
@ -42,7 +42,7 @@ describe('Loading', () => {
getByTestIdAndThrow(getByTestId, LOADING_TEST_ID);
act(() => sendLoadingEvent({ visible: true, onCancel: mockFn }));
await waitFor(() => {
expect(() => getByTestId(LOADING_TEST_ID));
expect(() => getByTestId(LOADING_TEST_ID)).toBeTruthy();
});
fireEvent.press(getByTestId(LOADING_BUTTON_TEST_ID));
await waitFor(() => {
@ -58,11 +58,11 @@ describe('Loading', () => {
getByTestIdAndThrow(getByTestId, LOADING_TEST_ID);
act(() => sendLoadingEvent({ visible: true, onCancel: mockFn }));
await waitFor(() => {
expect(() => getByTestId(LOADING_TEST_ID));
expect(() => getByTestId(LOADING_TEST_ID)).toBeTruthy();
});
act(() => sendLoadingEvent({ visible: true, onCancel: mockFn2 }));
await waitFor(() => {
expect(() => getByTestId(LOADING_TEST_ID));
expect(() => getByTestId(LOADING_TEST_ID)).toBeTruthy();
});
fireEvent.press(getByTestId(LOADING_BUTTON_TEST_ID));
await waitFor(() => {

3
app/containers/LoginServices/ButtonService.tsx
View File

@ -16,8 +16,7 @@ const ButtonService = ({ name, authType, onPress, backgroundColor, buttonText, i
onPress={onPress}
style={[styles.serviceButton, { backgroundColor }]}
activeOpacity={0.5}
underlayColor={colors.buttonText}
>
underlayColor={colors.buttonText}>
<View style={styles.serviceButtonContainer}>
{authType === 'oauth' || authType === 'apple' ? (
<CustomIcon name={icon} size={24} color={colors.titleText} style={styles.serviceIcon} />

6
app/containers/MessageActions/Header.tsx
View File

@ -65,8 +65,7 @@ const HeaderItem = ({ item, onReaction, theme }: THeaderItem) => (
<Touch
testID={`message-actions-emoji-${item}`}
onPress={() => onReaction({ emoji: item })}
style={[styles.headerItem, { backgroundColor: themes[theme].auxiliaryBackground }]}
>
style={[styles.headerItem, { backgroundColor: themes[theme].auxiliaryBackground }]}>
{typeof item === 'string' ? (
<Text style={styles.headerIcon}>{shortnameToUnicode(`:${item}:`)}</Text>
) : (
@ -79,8 +78,7 @@ const HeaderFooter = ({ onReaction, theme }: THeaderFooter) => (
<Touch
testID='add-reaction'
onPress={(param: any) => onReaction(param)}
style={[styles.headerItem, { backgroundColor: themes[theme].auxiliaryBackground }]}
>
style={[styles.headerItem, { backgroundColor: themes[theme].auxiliaryBackground }]}>
<CustomIcon name='reaction-add' size={24} color={themes[theme].bodyText} />
</Touch>
);

3
app/containers/MessageComposer/components/Autocomplete/Autocomplete.tsx
View File

@ -37,8 +37,7 @@ export const Autocomplete = ({ onPress }: { onPress: IAutocompleteItemProps['onP
{
bottom: viewBottom
}
]}
>
]}>
<FlatList
contentContainerStyle={styles.listContentContainer}
data={items}

3
app/containers/MessageComposer/components/Autocomplete/AutocompleteItem.tsx
View File

@ -28,8 +28,7 @@ export const AutocompleteItem = ({ item, onPress }: IAutocompleteItemProps) => {
underlayColor={colors.buttonBackgroundPrimaryPress}
style={{ backgroundColor: colors.surfaceLight }}
rippleColor={colors.buttonBackgroundPrimaryPress}
testID={`autocomplete-item-${getTestIDSuffix(item)}`}
>
testID={`autocomplete-item-${getTestIDSuffix(item)}`}>
<View style={styles.item}>
{item.type === '@' || item.type === '#' ? <AutocompleteUserRoom item={item} /> : null}
{item.type === ':' ? <AutocompleteEmoji item={item} /> : null}

3
app/containers/MessageComposer/components/Autocomplete/AutocompletePreview.tsx
View File

@ -28,8 +28,7 @@ export const AutocompletePreview = ({ item, onPress }: IAutocompleteItemProps) =
onPress={() => onPress(item)}
underlayColor={colors.buttonBackgroundPrimaryPress}
style={styles.previewItem}
rippleColor={colors.buttonBackgroundPrimaryPress}
>
rippleColor={colors.buttonBackgroundPrimaryPress}>
{content}
</RectButton>
);

3
app/containers/MessageComposer/components/EmojiKeyboard.tsx
View File

@ -21,8 +21,7 @@ const EmojiKeyboard = ({ theme }: { theme: TSupportedThemes }) => {
value={{
theme,
colors: colors[theme]
}}
>
}}>
<View style={{ flex: 1 }} testID='message-composer-keyboard-emoji'>
<EmojiPicker onItemClicked={onItemClicked} isEmojiKeyboard={true} />
</View>

3
app/containers/MessageComposer/components/EmojiSearchbar.tsx
View File

@ -64,8 +64,7 @@ export const EmojiSearchbar = (): React.ReactElement | null => {
style={({ pressed }: { pressed: boolean }) => [styles.backButton, { opacity: pressed ? 0.7 : 1 }]}
onPress={openEmojiKeyboard}
hitSlop={BUTTON_HIT_SLOP}
testID='openback-emoji-keyboard'
>
testID='openback-emoji-keyboard'>
<CustomIcon name='chevron-left' size={24} color={colors.fontHint} />
</Pressable>
<View style={styles.inputContainer}>

3
app/containers/MessageComposer/components/RecordAudio/ReviewButton.tsx
View File

@ -17,8 +17,7 @@ export const ReviewButton = ({ onPress }: { onPress: Function }): ReactElement =
}
]}
onPress={() => onPress()}
hitSlop={hitSlop}
>
hitSlop={hitSlop}>
<View accessible accessibilityLabel={'Cancel_recording'} accessibilityRole='button'>
<CustomIcon name={'arrow-right'} size={24} color={colors.fontWhite} />
</View>

3
app/containers/MessageComposer/components/SendThreadToChannel.tsx
View File

@ -70,8 +70,7 @@ export const SendThreadToChannel = (): React.ReactElement | null => {
<TouchableWithoutFeedback
style={styles.container}
onPress={() => setAlsoSendThreadToChannel(!alsoSendThreadToChannel)}
testID='message-composer-send-to-channel'
>
testID='message-composer-send-to-channel'>
<CustomIcon
testID={alsoSendThreadToChannel ? 'send-to-channel-checked' : 'send-to-channel-unchecked'}
name={alsoSendThreadToChannel ? 'checkbox-checked' : 'checkbox-unchecked'}

3
app/containers/MessageComposer/components/Toolbar/Container.tsx
View File

@ -6,8 +6,7 @@ export const Container = ({ children }: { children: (ReactElement | null)[] }):
style={{
flexDirection: 'row',
paddingVertical: 12
}}
>
}}>
{children}
</View>
);

6
app/containers/MessageComposer/helpers/getMentionRegexp.test.js
View File

@ -35,21 +35,21 @@ describe('getMentionRegexpUser', function () {
});
describe('getMentionRegexpEmoji', function () {
test('removing query text on emoji suggestion autocomplete ', () => {
test('removing query text on emoji suggestion autocomplete', () => {
const message = 'Hey :smiley';
expect(message.replace(regexp, '')).toBe('Hey :');
});
});
describe('getMentionRegexpCommand', function () {
test('removing query text on emoji suggestion autocomplete ', () => {
test('removing query text on slash command suggestion autocomplete', () => {
const message = '/archive';
expect(message.replace(regexp, '')).toBe('/');
});
});
describe('getMentionRegexpRoom', function () {
test('removing query text on emoji suggestion autocomplete ', () => {
test('removing query text on channel suggestion autocomplete', () => {
const message = 'Check #general';
expect(message.replace(regexp, '')).toBe('Check #');
});

3
app/containers/Passcode/Base/Button.tsx
View File

@ -26,8 +26,7 @@ const Button = React.memo(({ style, text, disabled, onPress, icon }: IPasscodeBu
underlayColor={themes[theme].passcodeButtonActive}
rippleColor={themes[theme].passcodeButtonActive}
enabled={!disabled}
onPress={press}
>
onPress={press}>
{icon ? (
<CustomIcon name={icon} size={36} color={themes[theme].passcodePrimary} />
) : (

6
app/containers/ReactionsList/ReactionsTabBar.tsx
View File

@ -33,8 +33,7 @@ const TabBarItem = ({ tab, index, goToPage, getCustomEmoji }: ITabBarItem) => {
style={({ pressed }: { pressed: boolean }) => ({
opacity: pressed ? 0.7 : 1
})}
testID={`tabBarItem-${tab.emoji}`}
>
testID={`tabBarItem-${tab.emoji}`}>
<View style={styles.tabBarItem}>
{tab._id === 'All' ? (
<Text style={[styles.allTabItem, { color: colors.auxiliaryTintColor }]}>{I18n.t('All')}</Text>
@ -70,8 +69,7 @@ const ReactionsTabBar = ({ tabs, activeTab, goToPage, getCustomEmoji }: IReactio
borderBottomWidth: isActiveTab ? 2 : 1,
borderColor: isActiveTab ? colors.tintActive : colors.separatorColor
}}
key={tab.emoji}
>
key={tab.emoji}>
<TabBarItem tab={tab} index={index} goToPage={goToPage} getCustomEmoji={getCustomEmoji} />
</View>
);

3
app/containers/RoomHeader/RoomHeader.tsx
View File

@ -179,8 +179,7 @@ const Header = React.memo(
onPress={handleOnPress}
style={styles.container}
disabled={!!tmid}
hitSlop={HIT_SLOP}
>
hitSlop={HIT_SLOP}>
<View style={styles.titleContainer}>
{tmid ? null : (
<RoomTypeIcon

9
app/containers/RoomItem/Actions.tsx
View File

@ -39,8 +39,7 @@ export const LeftActions = React.memo(({ transX, isRead, width, onToggleReadPres
{ width: width * 2, backgroundColor: colors.tintColor, right: '100%' },
viewHeight,
animatedStyles
]}
>
]}>
<View style={[styles.actionLeftButtonContainer, viewHeight]}>
<RectButton style={styles.actionButton} onPress={onToggleReadPress}>
<CustomIcon
@ -123,8 +122,7 @@ export const RightActions = React.memo(({ transX, favorite, width, toggleFav, on
},
viewHeight,
animatedFavStyles
]}
>
]}>
<RectButton style={[styles.actionButton, { backgroundColor: colors.favoriteBackground }]} onPress={toggleFav}>
<CustomIcon
size={isCondensed ? CONDENSED_ICON_SIZE : EXPANDED_ICON_SIZE}
@ -143,8 +141,7 @@ export const RightActions = React.memo(({ transX, favorite, width, toggleFav, on
},
isCondensed && { height: ROW_HEIGHT_CONDENSED },
animatedHideStyles
]}
>
]}>
<RectButton style={[styles.actionButton, { backgroundColor: colors.hideBackground }]} onPress={onHidePress}>
<CustomIcon
size={isCondensed ? CONDENSED_ICON_SIZE : EXPANDED_ICON_SIZE}

6
app/containers/RoomItem/RoomItem.tsx
View File

@ -69,8 +69,7 @@ const RoomItem = ({
type={type}
isFocused={!!isFocused}
swipeEnabled={swipeEnabled}
displayMode={displayMode}
>
displayMode={displayMode}>
<Wrapper
accessibilityLabel={accessibilityLabel}
avatar={avatar}
@ -84,8 +83,7 @@ const RoomItem = ({
displayMode={displayMode}
showAvatar={showAvatar}
showLastMessage={!!showLastMessage}
sourceType={sourceType}
>
sourceType={sourceType}>
{showLastMessage && displayMode === DisplayMode.Expanded ? (
<>
<View style={styles.titleContainer}>

3
app/containers/RoomItem/Title.tsx
View File

@ -11,8 +11,7 @@ const Title = React.memo(({ name, hideUnreadStatus, alert }: ITitleProps) => {
<Text
style={[styles.title, alert && !hideUnreadStatus && styles.alert, { color: colors.titleText }]}
ellipsizeMode='tail'
numberOfLines={1}
>
numberOfLines={1}>
{name}
</Text>
);

3
app/containers/RoomItem/Touchable.tsx
View File

@ -224,8 +224,7 @@ const Touchable = ({
testID={testID}
style={{
backgroundColor: isFocused ? colors.chatComponentBackground : colors.backgroundColor
}}
>
}}>
{children}
</Touch>
</Animated.View>

3
app/containers/RoomItem/UpdatedAt.tsx
View File

@ -28,8 +28,7 @@ const UpdatedAt = React.memo(({ date, hideUnreadStatus, alert }: IUpdatedAtProps
]
]}
ellipsizeMode='tail'
numberOfLines={1}
>
numberOfLines={1}>
{capitalize(date)}
</Text>
);

6
app/containers/RoomItem/Wrapper.tsx
View File

@ -12,8 +12,7 @@ const Wrapper = ({ accessibilityLabel, children, displayMode, ...props }: IWrapp
return (
<View
style={[styles.container, displayMode === DisplayMode.Condensed && styles.containerCondensed]}
accessibilityLabel={accessibilityLabel}
>
accessibilityLabel={accessibilityLabel}>
<IconOrAvatar displayMode={displayMode} {...props} />
<View
style={[
@ -21,8 +20,7 @@ const Wrapper = ({ accessibilityLabel, children, displayMode, ...props }: IWrapp
{
borderColor: colors.separatorColor
}
]}
>
]}>
{children}
</View>
</View>

3
app/containers/SafeAreaView.tsx
View File

@ -25,8 +25,7 @@ const SafeAreaView = React.memo(({ style, children, vertical = true, ...props }:
<SafeAreaContext
style={[styles.view, { backgroundColor: themes[theme].auxiliaryBackground }, style]}
edges={vertical ? ['right', 'left'] : undefined}
{...props}
>
{...props}>
{children}
</SafeAreaContext>
);

2
app/containers/SearchBox/index.tsx
View File

@ -17,7 +17,7 @@ const SearchBox = ({ onChangeText, onSubmitEditing, testID }: TextInputProps): J
const { colors } = useTheme();
const internalOnChangeText = useCallback(value => {
const internalOnChangeText = useCallback((value: string) => {
setText(value);
onChangeText?.(value);
}, []);

3
app/containers/ServerItem/ServerItem.stories.tsx
View File

@ -31,8 +31,7 @@ const ServerItem = ({
value={{
theme,
colors: themes[theme]
}}
>
}}>
<ServerItemComponent item={{ ...defaultItem, ...item }} onPress={onPress} onLongPress={onLongPress} hasCheck={hasCheck} />
</ThemeContext.Provider>
);

3
app/containers/ServerItem/index.tsx
View File

@ -34,8 +34,7 @@ const ServerItem = React.memo(({ item, onPress, onLongPress, hasCheck }: IServer
android_ripple={{ color: themes[theme].bannerBackground }}
style={({ pressed }: { pressed: boolean }) => ({
backgroundColor: isIOS && pressed ? themes[theme].bannerBackground : themes[theme].backgroundColor
})}
>
})}>
<View style={styles.serverItemContainer}>
{item.iconURL ? (
<FastImage

3
app/containers/ThreadDetails.tsx
View File

@ -72,8 +72,7 @@ const ThreadDetails = ({ item, user, badgeColor, toggleFollowThread, style }: IT
<Text
testID={`thread-count-${count}`}
style={[styles.detailText, { color: themes[theme].auxiliaryText }]}
numberOfLines={1}
>
numberOfLines={1}>
{count}
</Text>
</View>

1
app/containers/Toast.tsx
View File

@ -44,7 +44,6 @@ const Toast = (): React.ReactElement => {
return (
<EasyToast
ref={getToastRef}
// @ts-ignore
position='center'
style={[styles.toast, { backgroundColor: colors.toastBackground }]}
textStyle={[styles.text, { color: colors.buttonText }]}

3
app/containers/Touch.tsx
View File

@ -19,8 +19,7 @@ const Touch = React.forwardRef<RectButton, ITouchProps>(({ children, onPress, un
activeOpacity={1}
underlayColor={underlayColor || colors.bannerBackground}
rippleColor={colors.bannerBackground}
{...props}
>
{...props}>
{children}
</RectButton>
);

3
app/containers/TwoFactor/index.tsx
View File

@ -111,8 +111,7 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
styles.content,
isMasterDetail && [sharedStyles.modalFormSheet, styles.tablet],
{ backgroundColor: themes[theme].backgroundColor }
]}
>
]}>
<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
{method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
<FormTextInput

9
app/containers/UIKit/DatePicker.tsx
View File

@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { StyleSheet, Text, unstable_batchedUpdates, View } from 'react-native';
import DateTimePicker, { Event } from '@react-native-community/datetimepicker';
import DateTimePicker, { BaseProps } from '@react-native-community/datetimepicker';
import Touchable from 'react-native-platform-touchable';
import { BlockContext } from '@rocket.chat/ui-kit';
import moment from 'moment';
@ -45,9 +45,7 @@ export const DatePicker = ({ element, language, action, context, loading, value,
const [currentDate, onChangeDate] = useState(new Date(initial_date || value));
// timestamp as number exists in Event
// @ts-ignore
const onChange = ({ nativeEvent: { timestamp } }: Event, date?: Date) => {
const onChange: BaseProps['onChange'] = ({ nativeEvent: { timestamp } }, date?) => {
if (date || timestamp) {
const newDate = date || new Date(timestamp);
unstable_batchedUpdates(() => {
@ -67,8 +65,7 @@ export const DatePicker = ({ element, language, action, context, loading, value,
<Touchable
onPress={() => onShow(!show)}
style={{ backgroundColor: themes[theme].backgroundColor }}
background={Touchable.Ripple(themes[theme].bannerBackground)}
>
background={Touchable.Ripple(themes[theme].bannerBackground)}>
<View style={[styles.input, { borderColor: error ? themes[theme].dangerColor : themes[theme].separatorColor }]}>
<Text style={[styles.inputText, { color: error ? themes[theme].dangerColor : themes[theme].titleText }]}>
{currentDate.toLocaleDateString(language)}

3
app/containers/UIKit/MultiSelect/Chips.tsx
View File

@ -31,8 +31,7 @@ const Chip = ({ item, onSelect, style }: IChip) => {
onPress={() => onSelect(item)}
style={[styles.chip, { backgroundColor: colors.auxiliaryBackground }, style]}
background={Touchable.Ripple(colors.bannerBackground)}
testID={`multi-select-chip-${item.value}`}
>
testID={`multi-select-chip-${item.value}`}>
<>
{item.imageUrl ? <FastImage style={styles.chipImage} source={{ uri: item.imageUrl }} /> : null}
<Text numberOfLines={1} style={[styles.chipText, { color: colors.titleText }]}>

4
app/containers/UIKit/MultiSelect/Input.tsx
View File

@ -24,8 +24,8 @@ const Input = ({ children, onPress, loading, inputStyle, placeholder, disabled,
onPress={onPress}
style={[{ backgroundColor: colors.backgroundColor }, styles.inputBorder, inputStyle]}
background={Touchable.Ripple(colors.bannerBackground)}
disabled={disabled}
>
// @ts-ignore
disabled={disabled}>
<View style={[styles.input, styles.inputBorder, { borderColor: colors.separatorColor }, innerInputStyle]}>
{placeholder ? <Text style={[styles.pickerText, { color: colors.auxiliaryText }]}>{placeholder}</Text> : children}
{loading ? (

9
app/containers/UIKit/Overflow.tsx
View File

@ -30,8 +30,7 @@ const Option = ({ option: { text, value }, onOptionPress, parser, theme }: IOpti
<Touchable
onPress={() => onOptionPress({ value })}
background={Touchable.Ripple(themes[theme].bannerBackground)}
style={styles.option}
>
style={styles.option}>
<Text>{parser.text(text)}</Text>
</Touchable>
);
@ -65,8 +64,7 @@ export const Overflow = ({ element, loading, action, parser }: IOverflow) => {
background={Touchable.Ripple(themes[theme].bannerBackground)}
onPress={() => onShow(!show)}
hitSlop={BUTTON_HIT_SLOP}
style={styles.menu}
>
style={styles.menu}>
{!loading ? (
<CustomIcon size={18} name='kebab' color={themes[theme].bodyText} />
) : (
@ -78,8 +76,7 @@ export const Overflow = ({ element, loading, action, parser }: IOverflow) => {
// fromView exists in Popover Component
/* @ts-ignore*/
fromView={touchable[blockId]}
onRequestClose={() => onShow(false)}
>
onRequestClose={() => onShow(false)}>
<Options options={options} onOptionPress={onOptionPress} parser={parser} theme={theme} />
</Popover>
</>

2
app/containers/UIKit/Select.tsx
View File

@ -87,8 +87,6 @@ export const Select = ({ options = [], placeholder, onChange, loading, disabled,
}}
Icon={Icon}
textInputProps={{
// style property was Omitted in lib, but can be used normally
// @ts-ignore
style: { ...styles.pickerText, color: selected ? themes[theme].titleText : themes[theme].auxiliaryText }
}}
/>

3
app/containers/UIKit/UiKitMessage.stories.tsx
View File

@ -41,8 +41,7 @@ export default {
onDiscussionPress: () => {},
onReactionLongPress: () => {},
threadBadgeColor: themes.light.tunreadColor
}}
>
}}>
<Story />
</MessageContext.Provider>
</ScrollView>

3
app/containers/UIKit/UiKitModal.stories.tsx
View File

@ -43,8 +43,7 @@ export default {
onDiscussionPress: () => {},
onReactionLongPress: () => {},
threadBadgeColor: themes.light.tunreadColor
}}
>
}}>
<Story />
</MessageContext.Provider>
</ScrollView>

3
app/containers/UIKit/VideoConferenceBlock/components/VideoConferenceBaseContainer.tsx
View File

@ -49,8 +49,7 @@ export const VideoConferenceBaseContainer = ({ variant, children }: VideoConfMes
style={{
...style.iconContainer,
backgroundColor: iconStyle[variant].backgroundColor
}}
>
}}>
<CustomIcon name={iconStyle[variant].icon} size={24} color={iconStyle[variant].color} />
</View>
<Text style={style.infoContainerText}>{iconStyle[variant].label}</Text>

3
app/containers/UnreadBadge/UnreadBadge.stories.tsx
View File

@ -16,8 +16,7 @@ const StoryTester = ({ children }: { children: React.ReactElement | React.ReactE
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-evenly'
}}
>
}}>
{children}
</View>
);

12
app/containers/UnreadBadge/getUnreadStyle.test.js
View File

@ -89,6 +89,12 @@ const testsForTheme = theme => {
});
};
describe('getUnreadStyle light theme', () => testsForTheme('light'));
describe('getUnreadStyle dark theme', () => testsForTheme('dark'));
describe('getUnreadStyle black theme', () => testsForTheme('black'));
describe('getUnreadStyle light theme', () => {
testsForTheme('light');
});
describe('getUnreadStyle dark theme', () => {
testsForTheme('dark');
});
describe('getUnreadStyle black theme', () => {
testsForTheme('black');
});

3
app/containers/UnreadBadge/index.tsx
View File

@ -103,8 +103,7 @@ const UnreadBadge = React.memo(
small ? styles.unreadNumberContainerSmall : styles.unreadNumberContainerNormal,
{ backgroundColor, minWidth },
style
]}
>
]}>
<Text style={[styles.unreadText, small && styles.textSmall, { color }]} numberOfLines={1}>
{text}
</Text>

6
app/containers/UserGeneratedContentRules.tsx
View File

@ -44,15 +44,13 @@ const UGCRules = ({ styleContainer }: { styleContainer?: ViewStyle }) => {
{`${I18n.t('Onboarding_agree_terms')}\n`}
<Text
style={[styles.bottomContainerTextBold, { color: colors.actionTintColor }]}
onPress={() => openContract('terms-of-service')}
>
onPress={() => openContract('terms-of-service')}>
{I18n.t('Terms_of_Service')}
</Text>{' '}
{I18n.t('and')}
<Text
style={[styles.bottomContainerTextBold, { color: colors.actionTintColor }]}
onPress={() => openContract('privacy-policy')}
>
onPress={() => openContract('privacy-policy')}>
{' '}
{I18n.t('Privacy_Policy')}
</Text>

3
app/containers/UserItem.tsx
View File

@ -58,8 +58,7 @@ const UserItem = ({ name, username, onPress, testID, onLongPress, style, icon, i
}}
style={({ pressed }: any) => ({
backgroundColor: isIOS && pressed ? colors.bannerBackground : 'transparent'
})}
>
})}>
<View style={[styles.container, styles.button, style]}>
<Avatar text={username} size={30} style={styles.avatar} />
<View style={styles.textContainer}>

3
app/containers/markdown/AtMention.tsx
View File

@ -27,8 +27,7 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
color: themes[theme].mentionGroupColor
},
...style
]}
>
]}>
{mention}
</Text>
);

3
app/containers/markdown/Hashtag.tsx
View File

@ -58,8 +58,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
},
...style
]}
onPress={handlePress}
>
onPress={handlePress}>
{`#${hashtag}`}
</Text>
);

3
app/containers/markdown/Preview.tsx
View File

@ -26,8 +26,7 @@ const MarkdownPreview = ({ msg, numberOfLines = 1, style = [], testID }: IMarkdo
accessibilityLabel={m}
style={[styles.text, { color: themes[theme].bodyText }, ...style]}
numberOfLines={numberOfLines}
testID={testID || `markdown-preview-${m}`}
>
testID={testID || `markdown-preview-${m}`}>
{m}
</Text>
);

3
app/containers/markdown/Table.tsx
View File

@ -55,8 +55,7 @@ const Table = React.memo(({ children, numColumns, theme }: ITable) => {
style={[
styles.containerTable,
{ maxWidth: getTableWidth(), maxHeight: MAX_HEIGHT, borderColor: themes[theme].borderColor }
]}
>
]}>
{renderRows(false)}
</ScrollView>
<Text style={[styles.textInfo, { color: themes[theme].auxiliaryText }]}>{I18n.t('Full_table')}</Text>

6
app/containers/markdown/index.tsx
View File

@ -161,8 +161,7 @@ class Markdown extends PureComponent<IMarkdownProps, any> {
borderColor: themes[theme!].bannerBackground
},
...style
]}
>
]}>
{literal}
</Text>
);
@ -180,8 +179,7 @@ class Markdown extends PureComponent<IMarkdownProps, any> {
borderColor: themes[theme!].bannerBackground
},
...style
]}
>
]}>
{literal}
</Text>
);

3
app/containers/markdown/new/Code.tsx
View File

@ -21,8 +21,7 @@ const Code = ({ value }: ICodeProps): React.ReactElement => {
backgroundColor: colors.bannerBackground,
borderColor: colors.borderColor
}
]}
>
]}>
{value.map(block => {
switch (block.type) {
case 'CODE_LINE':

3
app/containers/markdown/new/InlineCode.tsx
View File

@ -22,8 +22,7 @@ const InlineCode = ({ value }: IInlineCodeProps) => {
backgroundColor: themes[theme].bannerBackground,
borderColor: themes[theme].borderColor
}
]}
>
]}>
{(block => {
switch (block.type) {
case 'PLAIN_TEXT':

3
app/containers/markdown/new/index.tsx
View File

@ -50,8 +50,7 @@ const Body = ({
navToRoomInfo,
getCustomEmoji,
onLinkPress
}}
>
}}>
{tokens?.map(block => {
switch (block.type) {
case 'BIG_EMOJI':

3
app/containers/message/Broadcast.tsx
View File

@ -24,8 +24,7 @@ const Broadcast = React.memo(({ author, broadcast }: IMessageBroadcast) => {
background={Touchable.Ripple(themes[theme].bannerBackground)}
style={[styles.button, { backgroundColor: themes[theme].tintColor }]}
hitSlop={BUTTON_HIT_SLOP}
testID='message-broadcast-reply'
>
testID='message-broadcast-reply'>
<>
<CustomIcon name='arrow-back' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{I18n.t('Reply')}</Text>

3
app/containers/message/CallButton.tsx
View File

@ -18,8 +18,7 @@ const CallButton = React.memo(({ handleEnterCall }: IMessageCallButton) => {
onPress={handleEnterCall}
background={Touchable.Ripple(themes[theme].bannerBackground)}
style={[styles.button, { backgroundColor: themes[theme].tintColor }]}
hitSlop={BUTTON_HIT_SLOP}
>
hitSlop={BUTTON_HIT_SLOP}>
<>
<CustomIcon name='camera' size={16} style={styles.buttonIcon} color={themes[theme].buttonText} />
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{I18n.t('Click_to_join')}</Text>

3
app/containers/message/Components/CollapsibleQuote/CollapsibleQuote.stories.tsx
View File

@ -28,8 +28,7 @@ export const Item = () => (
value={{
onLongPress: () => {},
user: { username: 'Marcos' }
}}
>
}}>
<CollapsibleQuote key={0} index={0} attachment={testAttachment} getCustomEmoji={() => null} timeFormat='LT' />
</MessageContext.Provider>
</View>

3
app/containers/message/Components/CollapsibleQuote/CollapsibleQuote.test.tsx
View File

@ -25,8 +25,7 @@ const Render = () => (
value={{
onLongPress: () => {},
user: { username: 'Marcos' }
}}
>
}}>
<CollapsibleQuote key={0} index={0} attachment={testAttachment} getCustomEmoji={mockFn} timeFormat='LT' />
</MessageContext.Provider>
);

3
app/containers/message/Components/CollapsibleQuote/index.tsx
View File

@ -162,8 +162,7 @@ const CollapsibleQuote = React.memo(
}
]}
background={Touchable.Ripple(themes[theme].bannerBackground)}
hitSlop={BUTTON_HIT_SLOP}
>
hitSlop={BUTTON_HIT_SLOP}>
<View style={styles.touchableContainer}>
<View style={styles.attachmentContainer}>
<View style={styles.authorContainer}>

3
app/containers/message/Discussion.tsx
View File

@ -31,8 +31,7 @@ const Discussion = React.memo(
onPress={onDiscussionPress}
background={Touchable.Ripple(themes[theme].bannerBackground)}
style={[styles.button, { backgroundColor: themes[theme].tintColor }]}
hitSlop={BUTTON_HIT_SLOP}
>
hitSlop={BUTTON_HIT_SLOP}>
<>
<CustomIcon name='discussions' size={16} style={styles.buttonIcon} color={themes[theme].buttonText} />
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{buttonText}</Text>

3
app/containers/message/Image.tsx
View File

@ -45,8 +45,7 @@ const Button = React.memo(({ children, onPress, disabled }: IMessageButton) => {
disabled={disabled}
onPress={onPress}
style={styles.imageContainer}
background={Touchable.Ripple(colors.bannerBackground)}
>
background={Touchable.Ripple(colors.bannerBackground)}>
{children}
</Touchable>
);

3
app/containers/message/Message.stories.tsx
View File

@ -57,8 +57,7 @@ export default {
onDiscussionPress: () => {},
onReactionLongPress: () => {},
threadBadgeColor: themes.light.tunreadColor
}}
>
}}>
<Story />
</MessageContext.Provider>
</ScrollView>

3
app/containers/message/Message.tsx
View File

@ -151,8 +151,7 @@ const MessageTouchable = React.memo((props: IMessageTouchable & IMessage) => {
onLongPress={onLongPress}
onPress={onPress}
disabled={(props.isInfo && !props.isThreadReply) || props.archived || props.isTemp || props.type === 'jitsi_call_started'}
style={{ backgroundColor }}
>
style={{ backgroundColor }}>
<View>
<Message {...props} />
</View>

6
app/containers/message/Reactions.tsx
View File

@ -37,8 +37,7 @@ const AddReaction = React.memo(({ theme }: { theme: TSupportedThemes }) => {
testID='message-add-reaction'
style={[styles.reactionButton, { backgroundColor: themes[theme].backgroundColor }]}
background={Touchable.Ripple(themes[theme].bannerBackground)}
hitSlop={BUTTON_HIT_SLOP}
>
hitSlop={BUTTON_HIT_SLOP}>
<View style={[styles.reactionContainer, { borderColor: themes[theme].borderColor }]}>
<CustomIcon name='reaction-add' size={21} color={themes[theme].tintColor} />
</View>
@ -60,8 +59,7 @@ const Reaction = React.memo(({ reaction, getCustomEmoji, theme }: IMessageReacti
{ backgroundColor: reacted ? themes[theme].bannerBackground : themes[theme].backgroundColor }
]}
background={Touchable.Ripple(themes[theme].bannerBackground)}
hitSlop={BUTTON_HIT_SLOP}
>
hitSlop={BUTTON_HIT_SLOP}>
<View style={[styles.reactionContainer, { borderColor: reacted ? themes[theme].tintColor : themes[theme].borderColor }]}>
<Emoji
content={reaction.emoji}

6
app/containers/message/Reply.tsx
View File

@ -243,8 +243,7 @@ const Reply = React.memo(
}
]}
background={Touchable.Ripple(themes[theme].bannerBackground)}
disabled={loading || attachment.message_link}
>
disabled={loading || attachment.message_link}>
<View style={styles.attachmentContainer}>
<Title attachment={attachment} timeFormat={timeFormat} theme={theme} />
<Description attachment={attachment} getCustomEmoji={getCustomEmoji} theme={theme} />
@ -264,8 +263,7 @@ const Reply = React.memo(
style={[
styles.backdrop,
{ backgroundColor: themes[theme].bannerBackground, opacity: themes[theme].attachmentLoadingOpacity }
]}
></View>
]}></View>
<RCActivityIndicator />
</View>
) : null}

3
app/containers/message/Urls.tsx
View File

@ -128,8 +128,7 @@ const Url = React.memo(
},
imageLoadedState === 'loading' && styles.loading
]}
background={Touchable.Ripple(themes[theme].bannerBackground)}
>
background={Touchable.Ripple(themes[theme].bannerBackground)}>
<>
{image ? (
<FastImage

3
app/containers/message/Video.tsx
View File

@ -225,8 +225,7 @@ const Video = ({ file, showAttachment, getCustomEmoji, style, isReply, msg }: IM
<Touchable
onPress={onPress}
style={[styles.button, { backgroundColor: themes[theme].videoBackground }]}
background={Touchable.Ripple(themes[theme].bannerBackground)}
>
background={Touchable.Ripple(themes[theme].bannerBackground)}>
<Thumbnail loading={loading} cached={cached} />
</Touchable>
</>

3
app/containers/message/index.tsx
View File

@ -429,8 +429,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
toggleFollowThread,
replies,
translateLanguage: canTranslateMessage ? autoTranslateLanguage : undefined
}}
>
}}>
{/* @ts-ignore*/}
<Message
id={id}

2
app/definitions/TUserStatus.ts
View File

@ -1,3 +1,3 @@
export const STATUSES = ['offline', 'online', 'away', 'busy', 'disabled', 'loading'] as const;
export type TUserStatus = typeof STATUSES[number];
export type TUserStatus = (typeof STATUSES)[number];

7
app/ee/omnichannel/reducers/inquiry.test.ts
View File

@ -84,13 +84,8 @@ describe('test inquiry reduce', () => {
expect(inquiry).toEqual({ ...initialState, queued: [queued] });
});
it('after inquiry state is modified, should return inquiry state as initial state after dispatch inquiryReset action', () => {
mockedStore.dispatch(inquiryReset());
const { inquiry } = mockedStore.getState();
expect(inquiry).toEqual(initialState);
});
it('should return correct inquiry state after dispatch inquiryFailure action', () => {
mockedStore.dispatch(inquiryReset());
mockedStore.dispatch(inquiryFailure(error));
const { inquiry } = mockedStore.getState();
expect(inquiry).toEqual({ ...initialState, error });

2
app/ee/omnichannel/views/QueueListView.tsx
View File

@ -27,7 +27,7 @@ type TNavigation = CompositeNavigationProp<
>;
const INITIAL_NUM_TO_RENDER = isTablet ? 20 : 12;
const getItemLayout = (data: IOmnichannelRoom[] | null | undefined, index: number) => ({
const getItemLayout = (data: ArrayLike<IOmnichannelRoom> | null | undefined, index: number) => ({
length: ROW_HEIGHT,
offset: ROW_HEIGHT * index,
index

16
app/index.tsx
View File

@ -1,5 +1,5 @@
import React from 'react';
import { Dimensions, Linking } from 'react-native';
import { Dimensions, EmitterSubscription, Linking } from 'react-native';
import { GestureHandlerRootView } from 'react-native-gesture-handler';
import Orientation from 'react-native-orientation-locker';
import { SafeAreaProvider, initialWindowMetrics } from 'react-native-safe-area-context';
@ -73,6 +73,7 @@ const parseDeepLinking = (url: string) => {
export default class Root extends React.Component<{}, IState> {
private listenerTimeout!: any;
private dimensionsListener?: EmitterSubscription;
constructor(props: any) {
super(props);
@ -108,12 +109,12 @@ export default class Root extends React.Component<{}, IState> {
}
});
}, 5000);
Dimensions.addEventListener('change', this.onDimensionsChange);
this.dimensionsListener = Dimensions.addEventListener('change', this.onDimensionsChange);
}
componentWillUnmount() {
clearTimeout(this.listenerTimeout);
Dimensions.removeEventListener('change', this.onDimensionsChange);
this.dimensionsListener?.remove?.();
unsubscribeTheme();
}
@ -201,8 +202,7 @@ export default class Root extends React.Component<{}, IState> {
return (
<SafeAreaProvider
initialMetrics={initialWindowMetrics}
style={{ backgroundColor: themes[this.state.theme].backgroundColor }}
>
style={{ backgroundColor: themes[this.state.theme].backgroundColor }}>
<Provider store={store}>
<ThemeContext.Provider
value={{
@ -210,8 +210,7 @@ export default class Root extends React.Component<{}, IState> {
themePreferences,
setTheme: this.setTheme,
colors: colors[theme]
}}
>
}}>
<DimensionsContext.Provider
value={{
width,
@ -219,8 +218,7 @@ export default class Root extends React.Component<{}, IState> {
scale,
fontScale,
setDimensions: this.setDimensions
}}
>
}}>
<GestureHandlerRootView style={{ flex: 1 }}>
<ActionSheetProvider>
<AppContainer />

2
app/lib/encryption/encryption.ts
View File

@ -388,7 +388,7 @@ class Encryption {
}
try {
const batch: (Model | null | void | false | Promise<void>)[] = [];
const batch: (Model | null | void | false)[] = [];
// If the subscription doesn't exists yet
if (!subRecord) {
// Let's create the subscription with the data received

2
app/lib/hooks/useEndpointData.test.tsx
View File

@ -8,7 +8,7 @@ import sdk from '../services/sdk';
const url = 'chat.getMessage';
export const message = {
const message = {
_id: '9tYkmJ67wMwmvQouD',
t: 'uj',
rid: 'GENERAL',

6
app/lib/hooks/useVideoConf/StartACallActionSheet.tsx
View File

@ -47,8 +47,7 @@ export default function StartACallActionSheet({
return (
<View
style={[style.actionSheetContainer, { paddingBottom: bottom }]}
onLayout={e => setContainerWidth(e.nativeEvent.layout.width / 2)}
>
onLayout={e => setContainerWidth(e.nativeEvent.layout.width / 2)}>
{calling && roomType === SubscriptionType.DIRECT ? <Ringer ringer={ERingerSounds.DIALTONE} /> : null}
<CallHeader
title={calling && user.direct ? i18n.t('Calling') : i18n.t('Start_a_call')}
@ -65,8 +64,7 @@ export default function StartACallActionSheet({
style={[
style.actionSheetPhotoContainer,
{ backgroundColor: cam ? undefined : colors.conferenceCallPhotoBackground, width: containerWidth }
]}
>
]}>
{cam ? (
<Camera style={[style.cameraContainer, { width: containerWidth }]} type={CameraType.front} />
) : (

4
app/lib/methods/helpers/navigation/conditional.ts
View File

@ -11,10 +11,10 @@ const { add, multiply } = Animated;
* @param fallback Animated Node to use if the condition is `false`
*/
export default function conditional(
condition: Animated.AnimatedInterpolation,
condition: Animated.AnimatedInterpolation<number>,
main: Animated.Animated,
fallback: Animated.Animated
): Animated.AnimatedAddition {
): Animated.AnimatedAddition<number> {
// To implement this behavior, we multiply the main node with the condition.
// So if condition is 0, result will be 0, and if condition is 1, result will be main node.
// Then we multiple reverse of the condition (0 if condition is 1) with the fallback.

2
app/reducers/permissions.ts
View File

@ -2,7 +2,7 @@ import { PERMISSIONS } from '../actions/actionsTypes';
import { TActionPermissions } from '../actions/permissions';
import { SUPPORTED_PERMISSIONS } from '../lib/methods/getPermissions';
export type TSupportedPermissions = typeof SUPPORTED_PERMISSIONS[number];
export type TSupportedPermissions = (typeof SUPPORTED_PERMISSIONS)[number];
export type IPermissionsState = {
[K in TSupportedPermissions]?: string[];

2
app/reducers/sortPreferences.test.ts
View File

@ -10,7 +10,7 @@ describe('test sortPreferences reducer', () => {
expect(state).toEqual(initialState);
});
it('should return correctly value after call setPreference action', () => {
it('should return correctly value after call setAllPreferences action', () => {
const preferences: IPreferences = {
displayMode: DisplayMode.Condensed,
groupByType: true,

8
app/share.tsx
View File

@ -41,7 +41,9 @@ const InsideStack = () => {
return (
<Inside.Navigator screenOptions={screenOptions}>
{/* @ts-ignore */}
<Inside.Screen name='ShareListView' component={ShareListView} />
{/* @ts-ignore */}
<Inside.Screen name='ShareView' component={ShareView} />
<Inside.Screen name='SelectServerView' component={SelectServerView} />
</Inside.Navigator>
@ -117,8 +119,7 @@ const Root = (): React.ReactElement => {
height,
scale,
fontScale
}}
>
}}>
<NavigationContainer
theme={navTheme}
ref={Navigation.navigationRef}
@ -129,8 +130,7 @@ const Root = (): React.ReactElement => {
setCurrentScreen(currentRouteName);
}
Navigation.routeNameRef.current = currentRouteName;
}}
>
}}>
<App root={root} />
<Loading />
</NavigationContainer>

12
app/stacks/InsideStack.tsx
View File

@ -98,6 +98,7 @@ const ChatsStackNavigator = () => {
<ChatsStack.Screen name='RoomsListView' component={RoomsListView} />
<ChatsStack.Screen name='RoomView' component={RoomView} />
<ChatsStack.Screen name='RoomActionsView' component={RoomActionsView} options={RoomActionsView.navigationOptions} />
{/* @ts-ignore */}
<ChatsStack.Screen name='SelectListView' component={SelectListView} options={SelectListView.navigationOptions} />
<ChatsStack.Screen name='RoomInfoView' component={RoomInfoView} />
<ChatsStack.Screen name='ReportUserView' component={ReportUserView} />
@ -105,22 +106,28 @@ const ChatsStackNavigator = () => {
<ChatsStack.Screen name='RoomInfoEditView' component={RoomInfoEditView} options={RoomInfoEditView.navigationOptions} />
<ChatsStack.Screen name='ChangeAvatarView' component={ChangeAvatarView} />
<ChatsStack.Screen name='RoomMembersView' component={RoomMembersView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='DiscussionsView' component={DiscussionsView} />
<ChatsStack.Screen
name='SearchMessagesView'
// @ts-ignore
component={SearchMessagesView}
options={SearchMessagesView.navigationOptions}
/>
<ChatsStack.Screen name='SelectedUsersView' component={SelectedUsersView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='InviteUsersView' component={InviteUsersView} />
<ChatsStack.Screen name='InviteUsersEditView' component={InviteUsersEditView} />
<ChatsStack.Screen name='MessagesView' component={MessagesView} />
<ChatsStack.Screen name='AutoTranslateView' component={AutoTranslateView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='DirectoryView' component={DirectoryView} options={DirectoryView.navigationOptions} />
<ChatsStack.Screen name='NotificationPrefView' component={NotificationPrefView} />
<ChatsStack.Screen name='PushTroubleshootView' component={PushTroubleshootView} />
<ChatsStack.Screen name='ForwardLivechatView' component={ForwardLivechatView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='CloseLivechatView' component={CloseLivechatView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='LivechatEditView' component={LivechatEditView} options={LivechatEditView.navigationOptions} />
<ChatsStack.Screen name='PickerView' component={PickerView} />
{/* @ts-ignore */}
@ -131,6 +138,7 @@ const ChatsStackNavigator = () => {
<ChatsStack.Screen name='AddExistingChannelView' component={AddExistingChannelView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='MarkdownTableView' component={MarkdownTableView} />
{/* @ts-ignore */}
<ChatsStack.Screen name='ReadReceiptsView' component={ReadReceiptsView} options={ReadReceiptsView.navigationOptions} />
<ChatsStack.Screen name='QueueListView' component={QueueListView} />
<ChatsStack.Screen name='CannedResponsesListView' component={CannedResponsesListView} />
@ -179,6 +187,7 @@ const SettingsStackNavigator = () => {
<SettingsStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
<SettingsStack.Screen
name='ScreenLockConfigView'
// @ts-ignore
component={ScreenLockConfigView}
options={ScreenLockConfigView.navigationOptions}
/>
@ -249,6 +258,7 @@ const NewMessageStackNavigator = () => {
<NewMessageStack.Screen name='NewMessageView' component={NewMessageView} />
<NewMessageStack.Screen name='SelectedUsersViewCreateChannel' component={SelectedUsersView} />
<NewMessageStack.Screen name='CreateChannelView' component={CreateChannelView} />
{/* @ts-ignore */}
<NewMessageStack.Screen name='CreateDiscussionView' component={CreateDiscussionView} />
<NewMessageStack.Screen name='ForwardMessageView' component={ForwardMessageView} />
</NewMessageStack.Navigator>
@ -304,7 +314,9 @@ const InsideStackNavigator = () => {
/>
<InsideStack.Screen name='AttachmentView' component={AttachmentView} />
<InsideStack.Screen name='StatusView' component={StatusView} />
{/* @ts-ignore */}
<InsideStack.Screen name='ShareView' component={ShareView} />
{/* @ts-ignore */}
<InsideStack.Screen name='ModalBlockView' component={ModalBlockView} options={ModalBlockView.navigationOptions} />
</InsideStack.Navigator>
);

3
app/stacks/MasterDetailStack/ModalContainer.tsx
View File

@ -52,8 +52,7 @@ export const ModalContainer = ({ navigation, children, theme }: IModalContainer)
style={{
...sharedStyles.modalFormSheet,
height: heightModal
}}
>
}}>
{children}
</View>
</View>

26
app/stacks/MasterDetailStack/index.tsx
View File

@ -87,8 +87,7 @@ const ChatsStackNavigator = React.memo(() => {
return (
<ChatsStack.Navigator
screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}
>
screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
<ChatsStack.Screen name='RoomView' component={RoomView} options={{ headerShown: false }} />
</ChatsStack.Navigator>
);
@ -99,8 +98,7 @@ const Drawer = createDrawerNavigator<MasterDetailDrawerParamList>();
const DrawerNavigator = React.memo(() => (
<Drawer.Navigator
screenOptions={{ drawerType: 'permanent', headerShown: false, drawerStyle: { ...drawerStyle } }}
drawerContent={({ navigation, state }) => <RoomsListView navigation={navigation} state={state} />}
>
drawerContent={({ navigation, state }) => <RoomsListView navigation={navigation} state={state} />}>
<Drawer.Screen name='ChatsStackNavigator' component={ChatsStackNavigator} />
</Drawer.Navigator>
));
@ -115,23 +113,25 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
return (
<ModalContainer navigation={navigation} theme={theme}>
<ModalStack.Navigator
screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}
>
screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
<ModalStack.Screen name='RoomActionsView' component={RoomActionsView} options={RoomActionsView.navigationOptions} />
{/* @ts-ignore */}
<ModalStack.Screen name='RoomInfoView' component={RoomInfoView} />
<ModalStack.Screen name='ReportUserView' component={ReportUserView} />
{/* @ts-ignore */}
<ModalStack.Screen name='SelectListView' component={SelectListView} />
{/* @ts-ignore */}
<ModalStack.Screen name='RoomInfoEditView' component={RoomInfoEditView} options={RoomInfoEditView.navigationOptions} />
<ModalStack.Screen name='ChangeAvatarView' component={ChangeAvatarView} />
<ModalStack.Screen name='RoomMembersView' component={RoomMembersView} />
<ModalStack.Screen
name='SearchMessagesView'
// @ts-ignore
component={SearchMessagesView}
options={SearchMessagesView.navigationOptions}
/>
<ModalStack.Screen name='SelectedUsersView' component={SelectedUsersView} />
{/* @ts-ignore */}
<ModalStack.Screen name='InviteUsersView' component={InviteUsersView} />
<ModalStack.Screen name='AddChannelTeamView' component={AddChannelTeamView} />
<ModalStack.Screen name='AddExistingChannelView' component={AddExistingChannelView} />
@ -140,6 +140,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
<ModalStack.Screen name='AutoTranslateView' component={AutoTranslateView} />
<ModalStack.Screen
name='DirectoryView'
// @ts-ignore
component={DirectoryView}
options={props => DirectoryView.navigationOptions!({ ...props, isMasterDetail: true })}
/>
@ -148,18 +149,24 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
<ModalStack.Screen name='ForwardMessageView' component={ForwardMessageView} />
{/* @ts-ignore */}
<ModalStack.Screen name='ForwardLivechatView' component={ForwardLivechatView} />
{/* @ts-ignore */}
<ModalStack.Screen name='CloseLivechatView' component={CloseLivechatView} />
<ModalStack.Screen name='CannedResponsesListView' component={CannedResponsesListView} />
{/* @ts-ignore */}
<ModalStack.Screen name='CannedResponseDetail' component={CannedResponseDetail} />
{/* @ts-ignore */}
<ModalStack.Screen name='LivechatEditView' component={LivechatEditView} options={LivechatEditView.navigationOptions} />
<ModalStack.Screen name='PickerView' component={PickerView} />
{/* @ts-ignore */}
<ModalStack.Screen name='ThreadMessagesView' component={ThreadMessagesView} />
{/* @ts-ignore */}
<ModalStack.Screen name='DiscussionsView' component={DiscussionsView} />
<ModalStack.Screen name='TeamChannelsView' component={TeamChannelsView} options={TeamChannelsView.navigationOptions} />
{/* @ts-ignore */}
<ModalStack.Screen name='MarkdownTableView' component={MarkdownTableView} />
<ModalStack.Screen
name='ReadReceiptsView'
// @ts-ignore
component={ReadReceiptsView}
options={props => ReadReceiptsView.navigationOptions!({ ...props, isMasterDetail: true })}
/>
@ -169,6 +176,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
<ModalStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
<ModalStack.Screen
name='ScreenLockConfigView'
// @ts-ignore
component={ScreenLockConfigView}
options={ScreenLockConfigView.navigationOptions}
/>
@ -179,6 +187,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
<ModalStack.Screen name='NewMessageView' component={NewMessageView} />
<ModalStack.Screen name='SelectedUsersViewCreateChannel' component={SelectedUsersView} />
<ModalStack.Screen name='CreateChannelView' component={CreateChannelView} />
{/* @ts-ignore */}
<ModalStack.Screen name='CreateDiscussionView' component={CreateDiscussionView} />
<ModalStack.Screen name='E2ESaveYourPasswordView' component={E2ESaveYourPasswordView} />
<ModalStack.Screen name='E2EHowItWorksView' component={E2EHowItWorksView} />
@ -208,17 +217,18 @@ const InsideStackNavigator = React.memo(() => {
...FadeFromCenterModal,
presentation: 'transparentModal'
} as StackNavigationOptions
}
>
}>
<InsideStack.Screen name='DrawerNavigator' component={DrawerNavigator} options={{ headerShown: false }} />
<InsideStack.Screen name='ModalStackNavigator' component={ModalStackNavigator} options={{ headerShown: false }} />
<InsideStack.Screen name='AttachmentView' component={AttachmentView} />
{/* @ts-ignore */}
<InsideStack.Screen name='ModalBlockView' component={ModalBlockView} options={ModalBlockView.navigationOptions} />
<InsideStack.Screen
name='JitsiMeetView'
component={JitsiMeetView}
options={{ headerShown: false, animationEnabled: isIOS }}
/>
{/* @ts-ignore */}
<InsideStack.Screen name='ShareView' component={ShareView} />
</InsideStack.Navigator>
);

Some files were not shown because too many files have changed in this diff Show More