From fcd163dc832631557a0f820c0870d92531f24b05 Mon Sep 17 00:00:00 2001 From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com> Date: Fri, 10 Jan 2025 22:43:54 +0530 Subject: [PATCH 1/2] Add Prettier workflow for automatic code formatting --- .github/workflows/prettier.yml | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/prettier.yml diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml new file mode 100644 index 0000000000..50757011d4 --- /dev/null +++ b/.github/workflows/prettier.yml @@ -0,0 +1,56 @@ +name: Format Code with Prettier + +on: + push: + branches: + - '*' + +jobs: + format: + if: ${{ github.repository != 'RocketChat/Rocket.Chat.ReactNative' }} + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: '22' + cache: 'yarn' + + - name: Cache node_modules + uses: actions/cache@v4 + with: + path: node_modules + key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-node-modules- + + - name: Install dependencies + run: yarn install + + - name: Run Prettier + run: yarn prettier --write . + + - name: Check for changes + id: check_changes + run: | + if git diff --quiet; then + echo "No code format changes detected" + echo "changes=false" >> $GITHUB_OUTPUT + else + echo "Code format changes detected" + echo "changes=true" >> $GITHUB_OUTPUT + fi + + - name: Commit and push changes + run: | + git config user.name "${{ github.actor }}" + git config user.email "${{ github.actor }}@users.noreply.github.com" + git add . + git commit -m "chore: format code with Prettier" + git push origin ${{ github.ref_name }} \ No newline at end of file From 2fcbcc3eec7f18e3667252b78412cfb622b58aaf Mon Sep 17 00:00:00 2001 From: Rohit3523 Date: Fri, 10 Jan 2025 17:15:42 +0000 Subject: [PATCH 2/2] chore: format code with Prettier --- .detoxrc.js | 4 +-- .../ActionSheet/BottomSheetContent.tsx | 3 +- app/containers/Chip/index.tsx | 3 +- app/containers/CollapsibleText/index.tsx | 6 ++-- app/containers/EmojiPicker/Footer.tsx | 6 ++-- .../IncomingCallNotification/index.tsx | 12 +++----- .../LoginServices/ButtonService.tsx | 3 +- .../components/EmojiSearchbar.tsx | 3 +- app/containers/Passcode/Base/Button.tsx | 3 +- app/containers/RoomItem/Actions.tsx | 12 +++----- app/containers/RoomItem/Touchable.tsx | 3 +- app/containers/SearchBox/index.tsx | 2 +- app/containers/ThreadDetails.tsx | 3 +- app/containers/Toast.tsx | 2 +- app/containers/UIKit/DatePicker.tsx | 9 +++--- app/containers/UIKit/MultiSelect/Chips.tsx | 3 +- app/containers/UIKit/MultiSelect/Input.tsx | 3 +- app/containers/UIKit/Overflow.tsx | 9 ++---- app/containers/UIKit/UiKitMessage.stories.tsx | 3 +- app/containers/UIKit/UiKitModal.stories.tsx | 3 +- app/containers/markdown/Table.tsx | 3 +- app/containers/message/CallButton.tsx | 3 +- app/containers/message/Content.tsx | 3 +- app/containers/message/Discussion.tsx | 3 +- app/containers/message/Reactions.tsx | 9 ++---- app/containers/message/Thread.tsx | 3 +- app/containers/message/Urls.tsx | 4 +-- app/lib/database/model/servers/migrations.js | 4 +-- app/lib/hooks/useWorkspaceDomain.ts | 4 +-- app/stacks/types.ts | 30 +++++++++---------- app/views/DirectoryView/index.tsx | 5 ++-- app/views/DiscussionsView/Item.tsx | 3 +- app/views/RoomInfoView/Direct.tsx | 3 +- .../components/RoomInfoViewTitle.tsx | 6 ++-- app/views/RoomView/Banner.tsx | 6 ++-- app/views/RoomView/JoinCode.tsx | 3 +- app/views/RoomView/index.tsx | 13 ++++---- app/views/StatusView/index.tsx | 10 ++++++- app/views/ThreadMessagesView/Item.tsx | 3 +- 39 files changed, 90 insertions(+), 123 deletions(-) diff --git a/.detoxrc.js b/.detoxrc.js index edd1a6356c..b171c48ddd 100644 --- a/.detoxrc.js +++ b/.detoxrc.js @@ -19,13 +19,13 @@ module.exports = { type: 'ios.app', binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/Rocket.Chat Experimental.app', build: - 'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -destination \'generic/platform=iphonesimulator\' -derivedDataPath ios/build' + "xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -destination 'generic/platform=iphonesimulator' -derivedDataPath ios/build" }, 'ios.release': { type: 'ios.app', binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/Rocket.Chat Experimental.app', build: - 'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -destination \'generic/platform=iphonesimulator\' -derivedDataPath ios/build' + "xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -destination 'generic/platform=iphonesimulator' -derivedDataPath ios/build" }, 'android.debug': { type: 'android.apk', diff --git a/app/containers/ActionSheet/BottomSheetContent.tsx b/app/containers/ActionSheet/BottomSheetContent.tsx index 947f545d76..e98bebd53f 100644 --- a/app/containers/ActionSheet/BottomSheetContent.tsx +++ b/app/containers/ActionSheet/BottomSheetContent.tsx @@ -28,8 +28,7 @@ const BottomSheetContent = React.memo(({ options, hasCancel, hide, children, onL + accessibilityLabel={I18n.t('Cancel')}> {I18n.t('Cancel')} ) : null; diff --git a/app/containers/Chip/index.tsx b/app/containers/Chip/index.tsx index 6c41e86475..fc84aeb9e1 100644 --- a/app/containers/Chip/index.tsx +++ b/app/containers/Chip/index.tsx @@ -57,8 +57,7 @@ const Chip = ({ avatar, text, onPress, testID, style }: IChip) => { onPress={() => onPress?.()} android_ripple={{ color: colors.surfaceNeutral - }} - > + }}> {avatar ? : null} diff --git a/app/containers/CollapsibleText/index.tsx b/app/containers/CollapsibleText/index.tsx index 8c6e325cc2..1ddc4dcd06 100644 --- a/app/containers/CollapsibleText/index.tsx +++ b/app/containers/CollapsibleText/index.tsx @@ -67,15 +67,13 @@ const CollapsibleText = ({ msg, style = [], linesToTruncate = 1 }: ICollapsibleT } else { setShowTruncated(false); } - }} - > + }}> {m} {truncatedText ? ( setShowTruncated(true)} - style={[styles.textInfo, { color: colors.fontHint }]} - > + style={[styles.textInfo, { color: colors.fontHint }]}> {` ${I18n.t('Show_less')}`} ) : null} diff --git a/app/containers/EmojiPicker/Footer.tsx b/app/containers/EmojiPicker/Footer.tsx index 7ca04951ea..3ae8cb25ec 100644 --- a/app/containers/EmojiPicker/Footer.tsx +++ b/app/containers/EmojiPicker/Footer.tsx @@ -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'> @@ -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'> diff --git a/app/containers/InAppNotification/IncomingCallNotification/index.tsx b/app/containers/InAppNotification/IncomingCallNotification/index.tsx index a552e4d4a6..2e5378e7d3 100644 --- a/app/containers/InAppNotification/IncomingCallNotification/index.tsx +++ b/app/containers/InAppNotification/IncomingCallNotification/index.tsx @@ -49,8 +49,7 @@ const IncomingCallHeader = React.memo( { marginTop: insets.top } - ]} - > + ]}> + style={styles.closeButton}> + style={styles.cancelButton}> {i18n.t('decline')} + style={styles.acceptButton}> {i18n.t('accept')} diff --git a/app/containers/LoginServices/ButtonService.tsx b/app/containers/LoginServices/ButtonService.tsx index 2e6e581901..b0197fbda8 100644 --- a/app/containers/LoginServices/ButtonService.tsx +++ b/app/containers/LoginServices/ButtonService.tsx @@ -18,8 +18,7 @@ const ButtonService = ({ name, authType, onPress, backgroundColor, buttonText, i activeOpacity={0.5} underlayColor={colors.fontWhite} accessible - accessibilityLabel={accessibilityLabel} - > + accessibilityLabel={accessibilityLabel}> {authType === 'oauth' || authType === 'apple' ? : null} {buttonText} diff --git a/app/containers/MessageComposer/components/EmojiSearchbar.tsx b/app/containers/MessageComposer/components/EmojiSearchbar.tsx index 51905db2b5..cab98766f1 100644 --- a/app/containers/MessageComposer/components/EmojiSearchbar.tsx +++ b/app/containers/MessageComposer/components/EmojiSearchbar.tsx @@ -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'> diff --git a/app/containers/Passcode/Base/Button.tsx b/app/containers/Passcode/Base/Button.tsx index 1e6fbd5e26..008c11e258 100644 --- a/app/containers/Passcode/Base/Button.tsx +++ b/app/containers/Passcode/Base/Button.tsx @@ -25,8 +25,7 @@ const Button = React.memo(({ style, text, disabled, onPress, icon }: IPasscodeBu underlayColor={colors.buttonBackgroundSecondaryDefault} rippleColor={colors.buttonBackgroundSecondaryPress} enabled={!disabled} - onPress={press} - > + onPress={press}> {icon ? ( ) : ( diff --git a/app/containers/RoomItem/Actions.tsx b/app/containers/RoomItem/Actions.tsx index 71f5824a49..cd966d5b1d 100644 --- a/app/containers/RoomItem/Actions.tsx +++ b/app/containers/RoomItem/Actions.tsx @@ -39,8 +39,7 @@ export const LeftActions = React.memo(({ transX, isRead, width, onToggleReadPres { width: width * 2, backgroundColor: colors.badgeBackgroundLevel2, right: '100%' }, viewHeight, animatedStyles - ]} - > + ]}> + ]}> + ]}> + onPress={onHidePress}> + }}> {children} diff --git a/app/containers/SearchBox/index.tsx b/app/containers/SearchBox/index.tsx index 62c447efaf..baf6c51bdb 100644 --- a/app/containers/SearchBox/index.tsx +++ b/app/containers/SearchBox/index.tsx @@ -23,7 +23,7 @@ const SearchBox = ({ onChangeText, onSubmitEditing, testID }: TextInputProps): J }, []); return ( - + + numberOfLines={1}> {count} diff --git a/app/containers/Toast.tsx b/app/containers/Toast.tsx index 1ddf386c43..6b20980ef5 100644 --- a/app/containers/Toast.tsx +++ b/app/containers/Toast.tsx @@ -46,7 +46,7 @@ const Toast = (): React.ReactElement => { ref={getToastRef} position='center' style={[styles.toast, { backgroundColor: colors.surfaceDark }]} - textStyle={[styles.text, { color: theme === "light" ? colors.fontWhite : colors.fontPureBlack }]} + textStyle={[styles.text, { color: theme === 'light' ? colors.fontWhite : colors.fontPureBlack }]} opacity={0.9} /> ); diff --git a/app/containers/UIKit/DatePicker.tsx b/app/containers/UIKit/DatePicker.tsx index 13615ac138..1a3983d189 100644 --- a/app/containers/UIKit/DatePicker.tsx +++ b/app/containers/UIKit/DatePicker.tsx @@ -65,11 +65,12 @@ export const DatePicker = ({ element, language, action, context, loading, value, onShow(!show)} style={{ backgroundColor: themes[theme].surfaceRoom }} - background={Touchable.Ripple(themes[theme].surfaceNeutral)} - > + background={Touchable.Ripple(themes[theme].surfaceNeutral)}> + style={[ + styles.input, + { borderColor: error ? themes[theme].buttonBackgroundDangerDefault : themes[theme].strokeLight } + ]}> {currentDate.toLocaleDateString(language)} diff --git a/app/containers/UIKit/MultiSelect/Chips.tsx b/app/containers/UIKit/MultiSelect/Chips.tsx index f6a6c29649..a9cacacbdb 100644 --- a/app/containers/UIKit/MultiSelect/Chips.tsx +++ b/app/containers/UIKit/MultiSelect/Chips.tsx @@ -31,8 +31,7 @@ const Chip = ({ item, onSelect, style }: IChip) => { onPress={() => onSelect(item)} style={[styles.chip, { backgroundColor: colors.surfaceHover }, style]} background={Touchable.Ripple(colors.surfaceNeutral)} - testID={`multi-select-chip-${item.value}`} - > + testID={`multi-select-chip-${item.value}`}> <> {item.imageUrl ? : null} diff --git a/app/containers/UIKit/MultiSelect/Input.tsx b/app/containers/UIKit/MultiSelect/Input.tsx index 3e3ed6bafc..ca594dcdb9 100644 --- a/app/containers/UIKit/MultiSelect/Input.tsx +++ b/app/containers/UIKit/MultiSelect/Input.tsx @@ -24,8 +24,7 @@ const Input = ({ children, onPress, loading, inputStyle, placeholder, disabled, onPress={onPress} style={[{ backgroundColor: colors.surfaceRoom }, styles.inputBorder, inputStyle]} background={Touchable.Ripple(colors.surfaceNeutral)} - disabled={disabled} - > + disabled={disabled}> {placeholder ? {placeholder} : children} {loading ? ( diff --git a/app/containers/UIKit/Overflow.tsx b/app/containers/UIKit/Overflow.tsx index f05eb6eb71..05a8a2d1c2 100644 --- a/app/containers/UIKit/Overflow.tsx +++ b/app/containers/UIKit/Overflow.tsx @@ -30,8 +30,7 @@ const Option = ({ option: { text, value }, onOptionPress, parser, theme }: IOpti onOptionPress({ value })} background={Touchable.Ripple(themes[theme].surfaceNeutral)} - style={styles.option} - > + style={styles.option}> {parser.text(text)} ); @@ -65,8 +64,7 @@ export const Overflow = ({ element, loading, action, parser }: IOverflow) => { background={Touchable.Ripple(themes[theme].surfaceNeutral)} onPress={() => onShow(!show)} hitSlop={BUTTON_HIT_SLOP} - style={styles.menu} - > + style={styles.menu}> {!loading ? ( ) : ( @@ -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)}> diff --git a/app/containers/UIKit/UiKitMessage.stories.tsx b/app/containers/UIKit/UiKitMessage.stories.tsx index 60c44f2824..9411cd83d4 100644 --- a/app/containers/UIKit/UiKitMessage.stories.tsx +++ b/app/containers/UIKit/UiKitMessage.stories.tsx @@ -41,8 +41,7 @@ export default { onDiscussionPress: () => {}, onReactionLongPress: () => {}, threadBadgeColor: themes.light.fontInfo - }} - > + }}> diff --git a/app/containers/UIKit/UiKitModal.stories.tsx b/app/containers/UIKit/UiKitModal.stories.tsx index 3e23d0e28f..3fb7b4ad7b 100644 --- a/app/containers/UIKit/UiKitModal.stories.tsx +++ b/app/containers/UIKit/UiKitModal.stories.tsx @@ -43,8 +43,7 @@ export default { onDiscussionPress: () => {}, onReactionLongPress: () => {}, threadBadgeColor: themes.light.fontInfo - }} - > + }}> diff --git a/app/containers/markdown/Table.tsx b/app/containers/markdown/Table.tsx index 5f23903378..3f043e7eb9 100644 --- a/app/containers/markdown/Table.tsx +++ b/app/containers/markdown/Table.tsx @@ -55,8 +55,7 @@ const Table = React.memo(({ children, numColumns, theme }: ITable) => { style={[ styles.containerTable, { maxWidth: getTableWidth(), maxHeight: MAX_HEIGHT, borderColor: themes[theme].strokeLight } - ]} - > + ]}> {renderRows(false)} {I18n.t('Full_table')} diff --git a/app/containers/message/CallButton.tsx b/app/containers/message/CallButton.tsx index bef3c5ec39..733c2b9a88 100644 --- a/app/containers/message/CallButton.tsx +++ b/app/containers/message/CallButton.tsx @@ -18,8 +18,7 @@ const CallButton = React.memo(({ handleEnterCall }: IMessageCallButton) => { onPress={handleEnterCall} background={Touchable.Ripple(themes[theme].surfaceNeutral)} style={[styles.button, { backgroundColor: themes[theme].badgeBackgroundLevel2 }]} - hitSlop={BUTTON_HIT_SLOP} - > + hitSlop={BUTTON_HIT_SLOP}> <> {I18n.t('Click_to_join')} diff --git a/app/containers/message/Content.tsx b/app/containers/message/Content.tsx index 5cfaf8ad94..f5e3cc4cc5 100644 --- a/app/containers/message/Content.tsx +++ b/app/containers/message/Content.tsx @@ -45,8 +45,7 @@ const Content = React.memo( content = ( + accessibilityLabel={I18n.t('Encrypted_message')}> {I18n.t('Encrypted_message')} ); diff --git a/app/containers/message/Discussion.tsx b/app/containers/message/Discussion.tsx index 04fcfcbebe..cb9d82e70e 100644 --- a/app/containers/message/Discussion.tsx +++ b/app/containers/message/Discussion.tsx @@ -31,8 +31,7 @@ const Discussion = React.memo( onPress={onDiscussionPress} background={Touchable.Ripple(themes[theme].surfaceNeutral)} style={[styles.button, { backgroundColor: themes[theme].badgeBackgroundLevel2 }]} - hitSlop={BUTTON_HIT_SLOP} - > + hitSlop={BUTTON_HIT_SLOP}> <> {buttonText} diff --git a/app/containers/message/Reactions.tsx b/app/containers/message/Reactions.tsx index f7e30bf243..6f490f698f 100644 --- a/app/containers/message/Reactions.tsx +++ b/app/containers/message/Reactions.tsx @@ -37,8 +37,7 @@ const AddReaction = React.memo(({ theme }: { theme: TSupportedThemes }) => { testID='message-add-reaction' style={[styles.reactionButton, { backgroundColor: themes[theme].surfaceRoom }]} background={Touchable.Ripple(themes[theme].surfaceNeutral)} - hitSlop={BUTTON_HIT_SLOP} - > + hitSlop={BUTTON_HIT_SLOP}> @@ -57,14 +56,12 @@ const Reaction = React.memo(({ reaction, getCustomEmoji, theme }: IMessageReacti testID={`message-reaction-${reaction.emoji}`} style={[styles.reactionButton, { backgroundColor: reacted ? themes[theme].surfaceNeutral : themes[theme].surfaceRoom }]} background={Touchable.Ripple(themes[theme].surfaceNeutral)} - hitSlop={BUTTON_HIT_SLOP} - > + hitSlop={BUTTON_HIT_SLOP}> + ]}> + testID={`message-thread-button-${msg}`}> {I18n.t('Reply')} { const { Site_Url } = useAppSelector(state => ({ @@ -8,4 +8,4 @@ export const useWorkspaceDomain = (): string => { })); return new parse(Site_Url).hostname; -}; \ No newline at end of file +}; diff --git a/app/stacks/types.ts b/app/stacks/types.ts index 487483d098..577c4036b9 100644 --- a/app/stacks/types.ts +++ b/app/stacks/types.ts @@ -28,22 +28,22 @@ export type ChatsStackParamList = { NewMessageStack: undefined; RoomsListView: undefined; RoomView: - | { - rid: string; - t: SubscriptionType; - tmid?: string; - messageId?: string; - name?: string; - fname?: string; - prid?: string; - room?: TSubscriptionModel | { rid: string; t: string; name?: string; fname?: string; prid?: string }; - jumpToMessageId?: string; - jumpToThreadId?: string; - roomUserId?: string | null; - usedCannedResponse?: string; - status?: string; + | { + rid: string; + t: SubscriptionType; + tmid?: string; + messageId?: string; + name?: string; + fname?: string; + prid?: string; + room?: TSubscriptionModel | { rid: string; t: string; name?: string; fname?: string; prid?: string }; + jumpToMessageId?: string; + jumpToThreadId?: string; + roomUserId?: string | null; + usedCannedResponse?: string; + status?: string; } - | undefined; // Navigates back to RoomView already on stack + | undefined; // Navigates back to RoomView already on stack RoomActionsView: { room: TSubscriptionModel; member?: any; diff --git a/app/views/DirectoryView/index.tsx b/app/views/DirectoryView/index.tsx index d5d91e523c..e764bec656 100644 --- a/app/views/DirectoryView/index.tsx +++ b/app/views/DirectoryView/index.tsx @@ -30,8 +30,8 @@ import { getSubscriptionByRoomId } from '../../lib/database/services/Subscriptio interface IDirectoryViewProps { navigation: CompositeNavigationProp< - NativeStackNavigationProp, - NativeStackNavigationProp + NativeStackNavigationProp, + NativeStackNavigationProp >; baseUrl: string; isFederationEnabled: boolean; @@ -215,7 +215,6 @@ class DirectoryView extends React.Component ( diff --git a/app/views/DiscussionsView/Item.tsx b/app/views/DiscussionsView/Item.tsx index 2cac3ddf5a..ab978daada 100644 --- a/app/views/DiscussionsView/Item.tsx +++ b/app/views/DiscussionsView/Item.tsx @@ -66,8 +66,7 @@ const Item = ({ item, onPress }: IItem): React.ReactElement => { onPress(item)} testID={`discussions-view-${item.msg}`} - style={{ backgroundColor: colors.surfaceRoom }} - > + style={{ backgroundColor: colors.surfaceRoom }}> diff --git a/app/views/RoomInfoView/Direct.tsx b/app/views/RoomInfoView/Direct.tsx index 6655ab6716..ac5a0b0e79 100644 --- a/app/views/RoomInfoView/Direct.tsx +++ b/app/views/RoomInfoView/Direct.tsx @@ -21,8 +21,7 @@ const Roles = ({ roles }: { roles?: string[] }) => { + testID={`user-role-${role.replace(/ /g, '-')}`}> {role} ) : null diff --git a/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx b/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx index bcc0907b60..efbc31bc57 100644 --- a/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx +++ b/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx @@ -34,16 +34,14 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo (name ? copyInfoToClipboard(name) : {})} testID='room-info-view-name' - style={[styles.roomTitle, { color: colors.fontTitlesLabels }]} - > + style={[styles.roomTitle, { color: colors.fontTitlesLabels }]}> {name} {username && ( copyInfoToClipboard(username)} testID='room-info-view-username' - style={[styles.roomUsername, { color: colors.fontSecondaryInfo }]} - >{`@${username}`} + style={[styles.roomUsername, { color: colors.fontSecondaryInfo }]}>{`@${username}`} )} {!!statusText && ( diff --git a/app/views/RoomView/Banner.tsx b/app/views/RoomView/Banner.tsx index 32f9d30cd4..ee52c68be9 100644 --- a/app/views/RoomView/Banner.tsx +++ b/app/views/RoomView/Banner.tsx @@ -29,8 +29,7 @@ const Banner = React.memo( + onPress={toggleModal}> @@ -42,8 +41,7 @@ const Banner = React.memo( useNativeDriver isVisible={showModal} animationIn='fadeIn' - animationOut='fadeOut' - > + animationOut='fadeOut'> {title} diff --git a/app/views/RoomView/JoinCode.tsx b/app/views/RoomView/JoinCode.tsx index 05d578423f..4598c173d4 100644 --- a/app/views/RoomView/JoinCode.tsx +++ b/app/views/RoomView/JoinCode.tsx @@ -84,8 +84,7 @@ const JoinCode = React.memo( styles.content, isMasterDetail && [sharedStyles.modalFormSheet, styles.tablet], { backgroundColor: themes[theme].surfaceRoom } - ]} - > + ]}> {I18n.t('Insert_Join_Code')} { }}> - { - (!this.tmid) ? ( - - ) : null - } + {!this.tmid ? ( + + ) : null} { value={statusText} containerStyle={styles.inputContainer} onChangeText={text => setStatusText(text)} - left={} + left={ + + } inputStyle={styles.inputStyle} placeholder={I18n.t('What_are_you_doing_right_now')} testID='status-view-input' diff --git a/app/views/ThreadMessagesView/Item.tsx b/app/views/ThreadMessagesView/Item.tsx index be0771340d..bfa0a29647 100644 --- a/app/views/ThreadMessagesView/Item.tsx +++ b/app/views/ThreadMessagesView/Item.tsx @@ -77,8 +77,7 @@ const Item = ({ item, useRealName, user, badgeColor, onPress, toggleFollowThread onPress(item)} testID={`thread-messages-view-${item.msg}`} - style={{ backgroundColor: themes[theme].surfaceRoom }} - > + style={{ backgroundColor: themes[theme].surfaceRoom }}>