diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..c44a1c76f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,23 @@ +version: 2.1 + + +jobs: + test: + working_directory: ~/mattermost-mobile + docker: + - image: circleci/node:10 + steps: + - checkout + - run: | + echo assets/base/config.json + cat assets/base/config.json + # Avoid installing pods + touch .podinstall + # Run tests + make test || exit 1 + +workflows: + version: 2 + pr-test: + jobs: + - test diff --git a/android/app/build.gradle b/android/app/build.gradle index 6c466df8c..7e2a9f707 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -123,7 +123,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57_5" - versionCode 232 + versionCode 233 versionName "1.24.0" multiDexEnabled = true ndk { diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js index 00cecd461..54d9d1a49 100644 --- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js +++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js @@ -15,6 +15,8 @@ import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers'; import AutocompleteDivider from 'app/components/autocomplete/autocomplete_divider'; import Emoji from 'app/components/emoji'; +import {BuiltInEmojis} from 'app/utils/emojis'; +import {getEmojiByName} from 'app/utils/emoji_utils'; import {makeStyleSheetFromTheme} from 'app/utils/theme'; const EMOJI_REGEX = /(^|\s|^\+|^-)(:([^:\s]*))$/i; @@ -138,10 +140,16 @@ export default class EmojiSuggestion extends Component { // We are going to set a double : on iOS to prevent the auto correct from taking over and replacing it // with the wrong value, this is a hack but I could not found another way to solve it let completedDraft; + let prefix = ':'; if (Platform.OS === 'ios') { - completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `::${emoji}: `); + prefix = '::'; + } + + const emojiData = getEmojiByName(emoji); + if (emojiData?.filename && !BuiltInEmojis.includes(emojiData.filename)) { + completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, String.fromCodePoint(parseInt(emojiData.filename, 16))); } else { - completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `:${emoji}: `); + completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `${prefix}${emoji}: `); } if (value.length > cursorPosition) { @@ -150,7 +158,7 @@ export default class EmojiSuggestion extends Component { onChangeText(completedDraft); - if (Platform.OS === 'ios') { + if (Platform.OS === 'ios' && (!emojiData?.filename || BuiltInEmojis.includes(emojiData?.filename))) { // This is the second part of the hack were we replace the double : with just one // after the auto correct vanished setTimeout(() => { @@ -178,6 +186,7 @@ export default class EmojiSuggestion extends Component { @@ -225,6 +234,10 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => { fontSize: 13, color: theme.centerChannelColor, }, + emojiText: { + color: '#000', + fontWeight: 'bold', + }, listView: { flex: 1, backgroundColor: theme.centerChannelBg, diff --git a/app/components/emoji/emoji.js b/app/components/emoji/emoji.js index d0ff7f7d3..30a8a2358 100644 --- a/app/components/emoji/emoji.js +++ b/app/components/emoji/emoji.js @@ -38,6 +38,7 @@ export default class Emoji extends React.PureComponent { literal: PropTypes.string, size: PropTypes.number, textStyle: CustomPropTypes.Style, + unicode: PropTypes.string, }; static defaultProps = { @@ -116,6 +117,19 @@ export default class Emoji extends React.PureComponent { // force a new image to be rendered when the size changes const key = Platform.OS === 'android' ? (height + '-' + width) : null; + if (this.props.unicode && !this.props.imageUrl) { + const codeArray = this.props.unicode.split('-'); + const code = codeArray.reduce((acc, c) => { + return acc + String.fromCodePoint(parseInt(c, 16)); + }, ''); + + return ( + + {code} + + ); + } + if (!imageUrl) { return ( - ); - } else { - listComponent = ( - - ); - } - const searchBarInput = { backgroundColor: theme.centerChannelBg, color: theme.centerChannelColor, @@ -87,7 +46,7 @@ export default class EmojiPicker extends EmojiPickerBase { /> - {listComponent} + {this.renderListComponent(2)} {!searchTerm && diff --git a/app/components/emoji_picker/emoji_picker.ios.js b/app/components/emoji_picker/emoji_picker.ios.js index 4391679b6..ff532738b 100644 --- a/app/components/emoji_picker/emoji_picker.ios.js +++ b/app/components/emoji_picker/emoji_picker.ios.js @@ -3,9 +3,7 @@ import React from 'react'; import { - FlatList, KeyboardAvoidingView, - SectionList, View, } from 'react-native'; import {KeyboardTrackingView} from 'react-native-keyboard-tracking-view'; @@ -16,58 +14,17 @@ import SearchBar from 'app/components/search_bar'; import {DeviceTypes} from 'app/constants'; import {changeOpacity, getKeyboardAppearanceFromTheme} from 'app/utils/theme'; -import EmojiPickerBase, {getStyleSheetFromTheme, SECTION_MARGIN} from './emoji_picker_base'; - -const SCROLLVIEW_NATIVE_ID = 'emojiPicker'; +import EmojiPickerBase, {getStyleSheetFromTheme, SCROLLVIEW_NATIVE_ID} from './emoji_picker_base'; export default class EmojiPicker extends EmojiPickerBase { render() { const {formatMessage} = this.context.intl; - const {deviceWidth, isLandscape, theme} = this.props; - const {emojis, filteredEmojis, searchTerm} = this.state; + const {isLandscape, theme} = this.props; + const {searchTerm} = this.state; const styles = getStyleSheetFromTheme(theme); const shorten = DeviceTypes.IS_IPHONE_WITH_INSETS && isLandscape ? 6 : 2; - let listComponent; - if (searchTerm) { - listComponent = ( - - ); - } else { - listComponent = ( - - ); - } - let keyboardOffset = DeviceTypes.IS_IPHONE_WITH_INSETS ? 50 : 30; if (isLandscape) { keyboardOffset = DeviceTypes.IS_IPHONE_WITH_INSETS ? 0 : 10; @@ -111,7 +68,7 @@ export default class EmojiPicker extends EmojiPickerBase { /> - {listComponent} + {this.renderListComponent(shorten)} {!searchTerm && { - return EMOJI_SIZE + (EMOJI_GUTTER * 2); + return (EMOJI_SIZE + 5) + (EMOJI_GUTTER * 2); }, getSectionHeaderHeight: () => SECTION_HEADER_HEIGHT, }); @@ -198,10 +201,6 @@ export default class EmojiPicker extends PureComponent { }); }; - filterEmojiAliases = (aliases, searchTerm) => { - return aliases.findIndex((alias) => alias.includes(searchTerm)) !== -1; - }; - searchEmojis = (searchTerm) => { const {emojis, fuse} = this.props; const searchTermLowerCase = searchTerm.toLowerCase(); @@ -232,6 +231,54 @@ export default class EmojiPicker extends PureComponent { ); }; + renderListComponent = (shorten) => { + const {deviceWidth, theme} = this.props; + const {emojis, filteredEmojis, searchTerm} = this.state; + const styles = getStyleSheetFromTheme(theme); + + let listComponent; + if (searchTerm) { + listComponent = ( + + ); + } else { + listComponent = ( + + ); + } + + return listComponent; + }; + flatListKeyExtractor = (item) => item; flatListRenderItem = ({item}) => { @@ -271,7 +318,7 @@ export default class EmojiPicker extends PureComponent { } this.props.actions.incrementEmojiPickerPage(); - } + }; onScroll = (e) => { if (this.state.jumpToSection) { @@ -324,7 +371,7 @@ export default class EmojiPicker extends PureComponent { this.scrollToSection(index); }, 200); } - } + }; renderSectionHeader = ({section}) => { const {theme} = this.props; @@ -351,7 +398,7 @@ export default class EmojiPicker extends PureComponent { if (isCustomSection && this.props.customEmojiPage === 0) { this.loadMoreCustomEmojis(); } - } + }; renderSectionIcons = () => { const {theme} = this.props; @@ -393,7 +440,7 @@ export default class EmojiPicker extends PureComponent { ); - } + }; } export const getStyleSheetFromTheme = makeStyleSheetFromTheme((theme) => { diff --git a/app/components/emoji_picker/emoji_picker_row.js b/app/components/emoji_picker/emoji_picker_row.js index 4f69eccac..af0ae6bef 100644 --- a/app/components/emoji_picker/emoji_picker_row.js +++ b/app/components/emoji_picker/emoji_picker_row.js @@ -27,11 +27,12 @@ export default class EmojiPickerRow extends Component { renderEmojis = (emoji, index, emojis) => { const {emojiGutter, emojiSize} = this.props; + const size = emojiSize + 5; const style = [ styles.emoji, { - width: emojiSize, - height: emojiSize, + width: size, + height: size, marginHorizontal: emojiGutter, }, ]; @@ -60,6 +61,7 @@ export default class EmojiPickerRow extends Component { > @@ -79,7 +81,7 @@ export default class EmojiPickerRow extends Component { const styles = StyleSheet.create({ columnStyle: { - alignSelf: 'stretch', + flex: 1, flexDirection: 'row', justifyContent: 'space-between', }, @@ -88,6 +90,10 @@ const styles = StyleSheet.create({ justifyContent: 'center', overflow: 'hidden', }, + emojiText: { + color: '#000', + fontWeight: 'bold', + }, emojiLeft: { marginLeft: 0, }, diff --git a/app/components/emoji_picker/index.js b/app/components/emoji_picker/index.js index 4254a9b6a..1713593c1 100644 --- a/app/components/emoji_picker/index.js +++ b/app/components/emoji_picker/index.js @@ -12,7 +12,7 @@ import {getCustomEmojis, searchCustomEmojis} from 'mattermost-redux/actions/emoj import {incrementEmojiPickerPage} from 'app/actions/views/emoji'; import {getDimensions, isLandscape} from 'app/selectors/device'; -import {CategoryNames, Emojis, EmojiIndicesByAlias, EmojiIndicesByCategory} from 'app/utils/emojis'; +import {BuiltInEmojis, CategoryNames, Emojis, EmojiIndicesByAlias, EmojiIndicesByCategory} from 'app/utils/emojis'; import {t} from 'app/utils/i18n'; import EmojiPicker from './emoji_picker'; @@ -96,6 +96,11 @@ const getEmojisBySection = createSelector( }); const customEmojiItems = []; + BuiltInEmojis.forEach((emoji) => { + customEmojiItems.push({ + name: emoji, + }); + }); for (const [key] of customEmojis) { customEmojiItems.push({ diff --git a/app/components/post_body/index.js b/app/components/post_body/index.js index 5d4b9ef26..5c6d21f27 100644 --- a/app/components/post_body/index.js +++ b/app/components/post_body/index.js @@ -32,7 +32,7 @@ import PostBody from './post_body'; const POST_TIMEOUT = 20000; -function makeMapStateToProps() { +export function makeMapStateToProps() { const memoizeHasEmojisOnly = memoizeResult((message, customEmojis) => hasEmojisOnly(message, customEmojis)); const getReactionsForPost = makeGetReactionsForPost(); @@ -61,9 +61,10 @@ function makeMapStateToProps() { const roles = getCurrentUserId(state) ? getCurrentUserRoles(state) : ''; const isAdmin = checkIsAdmin(roles); const isSystemAdmin = checkIsSystemAdmin(roles); + const channelIsArchived = channel?.delete_at !== 0; //eslint-disable-line camelcase let canDelete = false; - if (post && !ownProps.channelIsArchived) { + if (post && !channelIsArchived) { canDelete = canDeletePost(state, config, license, currentTeamId, currentChannelId, currentUserId, post, isAdmin, isSystemAdmin); } diff --git a/app/components/post_body/index.test.js b/app/components/post_body/index.test.js new file mode 100644 index 000000000..dd329fe0f --- /dev/null +++ b/app/components/post_body/index.test.js @@ -0,0 +1,116 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {getChannel} from 'mattermost-redux/selectors/entities/channels'; +import * as PostUtils from 'mattermost-redux/utils/post_utils'; + +import {makeMapStateToProps} from './index.js'; + +jest.mock('mattermost-redux/selectors/entities/channels', () => { + const channels = require.requireActual('mattermost-redux/selectors/entities/channels'); + + return { + ...channels, + getChannel: jest.fn(), + canManageChannelMembers: jest.fn(), + getCurrentChannelId: jest.fn(), + }; +}); + +jest.mock('mattermost-redux/selectors/entities/preferences', () => { + const preferences = require.requireActual('mattermost-redux/selectors/entities/preferences'); + return { + ...preferences, + getTheme: jest.fn(), + }; +}); + +jest.mock('mattermost-redux/selectors/entities/general', () => { + const general = require.requireActual('mattermost-redux/selectors/entities/general'); + return { + ...general, + getConfig: jest.fn(), + getLicense: jest.fn().mockReturnValue({}), + }; +}); + +jest.mock('mattermost-redux/selectors/entities/users', () => { + const users = require.requireActual('mattermost-redux/selectors/entities/users'); + return { + ...users, + getCurrentUserId: jest.fn(), + getCurrentUserRoles: jest.fn(), + }; +}); + +jest.mock('mattermost-redux/selectors/entities/teams', () => { + const teams = require.requireActual('mattermost-redux/selectors/entities/teams'); + return { + ...teams, + getCurrentTeamId: jest.fn(), + }; +}); + +jest.mock('mattermost-redux/selectors/entities/emojis', () => { + const emojis = require.requireActual('mattermost-redux/selectors/entities/emojis'); + return { + ...emojis, + getCustomEmojisByName: jest.fn(), + }; +}); + +jest.mock('mattermost-redux/selectors/entities/posts', () => { + const posts = require.requireActual('mattermost-redux/selectors/entities/posts'); + return { + ...posts, + makeGetReactionsForPost: () => jest.fn(), + }; +}); + +jest.mock('app/selectors/device', () => ({ + getDimensions: jest.fn(), +})); + +describe('makeMapStateToProps', () => { + const defaultState = { + entities: { + general: { + serverVersion: '', + }, + }, + }; + const defaultOwnProps = { + post: {}, + }; + + test('should not call canDeletePost if post is not defined', () => { + const canDeletePost = jest.spyOn(PostUtils, 'canDeletePost'); + const mapStateToProps = makeMapStateToProps(); + const ownProps = { + post: '', + }; + + const props = mapStateToProps(defaultState, ownProps); + expect(props.canDelete).toBe(false); + expect(canDeletePost).not.toHaveBeenCalled(); + }); + + test('should not call canDeletePost if post is defined and channel is archived', () => { + const canDeletePost = jest.spyOn(PostUtils, 'canDeletePost'); + const mapStateToProps = makeMapStateToProps(); + + getChannel.mockReturnValueOnce({delete_at: 1}); //eslint-disable-line camelcase + const props = mapStateToProps(defaultState, defaultOwnProps); + expect(props.canDelete).toBe(false); + expect(canDeletePost).not.toHaveBeenCalled(); + }); + + test('should call canDeletePost if post is defined and channel is not archived', () => { + const canDeletePost = jest.spyOn(PostUtils, 'canDeletePost'); + const mapStateToProps = makeMapStateToProps(); + + getChannel.mockReturnValue({delete_at: 0}); //eslint-disable-line camelcase + mapStateToProps(defaultState, defaultOwnProps); + expect(canDeletePost).toHaveBeenCalledTimes(1); + }); +}); \ No newline at end of file diff --git a/app/components/post_list/post_list.js b/app/components/post_list/post_list.js index 588e8ae8c..fb5a9c7a6 100644 --- a/app/components/post_list/post_list.js +++ b/app/components/post_list/post_list.js @@ -299,7 +299,7 @@ export default class PostList extends PureComponent { scrollToBottom = () => { setTimeout(() => { - if (this.flatListRef?.current) { + if (this.flatListRef.current) { this.flatListRef.current.scrollToOffset({offset: 0, animated: true}); } }, 250); @@ -316,7 +316,7 @@ export default class PostList extends PureComponent { scrollToIndex = (index) => { this.animationFrameInitialIndex = requestAnimationFrame(() => { - if (this.flatListRef?.current && index > 0 && index <= this.getItemCount()) { + if (this.flatListRef.current && index > 0 && index <= this.getItemCount()) { this.flatListScrollToIndex(index); } }); diff --git a/app/components/post_list/post_list.test.js b/app/components/post_list/post_list.test.js index ffcf4e76b..fe7c684b7 100644 --- a/app/components/post_list/post_list.test.js +++ b/app/components/post_list/post_list.test.js @@ -64,7 +64,9 @@ describe('PostList', () => { const indexInRange = baseProps.postIds.length; const indexOutOfRange = [-1, indexInRange + 1]; - instance.flatListRef = {}; + instance.flatListRef = { + current: null, + }; instance.scrollToIndex(indexInRange); expect(flatListScrollToIndex).not.toHaveBeenCalled(); diff --git a/app/components/post_textbox/post_textbox.test.js b/app/components/post_textbox/post_textbox.test.js index 5888cadb3..7086c92ef 100644 --- a/app/components/post_textbox/post_textbox.test.js +++ b/app/components/post_textbox/post_textbox.test.js @@ -7,11 +7,12 @@ import assert from 'assert'; import {shallowWithIntl} from 'test/intl-test-helper'; import Preferences from 'mattermost-redux/constants/preferences'; +import EventEmitter from 'mattermost-redux/utils/event_emitter'; import Fade from 'app/components/fade'; import SendButton from 'app/components/send_button'; import PasteableTextInput from 'app/components/pasteable_text_input'; -import EventEmitter from 'mattermost-redux/utils/event_emitter'; +import EphemeralStore from 'app/store/ephemeral_store'; import PostTextbox from './post_textbox.ios'; @@ -62,6 +63,7 @@ describe('PostTextBox', () => { cursorPositionEvent: '', valueEvent: '', isLandscape: false, + screenId: 'NavigationScreen1', }; test('should match, full snapshot', () => { @@ -343,6 +345,7 @@ describe('PostTextBox', () => { test('should show error dialog if error occured', () => { jest.spyOn(Alert, 'alert').mockReturnValue(null); const wrapper = shallowWithIntl(); + EphemeralStore.addNavigationComponentId('NavigationScreen1'); wrapper.find(PasteableTextInput).first().simulate('paste', {error: 'some error'}, []); expect(Alert.alert).toHaveBeenCalled(); }); @@ -350,6 +353,7 @@ describe('PostTextBox', () => { test('should show file max warning and not uploading', () => { jest.spyOn(EventEmitter, 'emit').mockReturnValue(null); const wrapper = shallowWithIntl(); + EphemeralStore.addNavigationComponentId('NavigationScreen1'); wrapper.find(PasteableTextInput).first().simulate('paste', null, [ { fileSize: 1000, @@ -414,6 +418,7 @@ describe('PostTextBox', () => { test('should upload images', () => { const wrapper = shallowWithIntl(); + EphemeralStore.addNavigationComponentId('NavigationScreen1'); wrapper.find(PasteableTextInput).first().simulate('paste', null, [ { fileSize: 1000, @@ -424,6 +429,20 @@ describe('PostTextBox', () => { ]); expect(baseProps.actions.initUploadFiles).toHaveBeenCalled(); }); + + test('should NOT upload images when not the top most screen', () => { + const wrapper = shallowWithIntl(); + EphemeralStore.addNavigationComponentId('NavigationScreen2'); + wrapper.find(PasteableTextInput).first().simulate('paste', null, [ + { + fileSize: 1000, + fileName: 'fileName.png', + type: 'images/png', + url: 'path/to/image', + }, + ]); + expect(baseProps.actions.initUploadFiles).not.toHaveBeenCalled(); + }); }); }); diff --git a/app/components/post_textbox/post_textbox_base.js b/app/components/post_textbox/post_textbox_base.js index f35b133ad..2cc9837b7 100644 --- a/app/components/post_textbox/post_textbox_base.js +++ b/app/components/post_textbox/post_textbox_base.js @@ -24,11 +24,12 @@ import AttachmentButton from 'app/components/attachment_button'; import Fade from 'app/components/fade'; import FormattedMarkdownText from 'app/components/formatted_markdown_text'; import FormattedText from 'app/components/formatted_text'; -import SendButton from 'app/components/send_button'; import PasteableTextInput from 'app/components/pasteable_text_input'; - +import {paddingHorizontal as padding} from 'app/components/safe_area_view/iphone_x_spacing'; +import SendButton from 'app/components/send_button'; import {INSERT_TO_COMMENT, INSERT_TO_DRAFT, IS_REACTION_REGEX, MAX_CONTENT_HEIGHT, MAX_FILE_COUNT} from 'app/constants/post_textbox'; import {NOTIFY_ALL_MEMBERS} from 'app/constants/view'; +import EphemeralStore from 'app/store/ephemeral_store'; import {t} from 'app/utils/i18n'; import {confirmOutOfOfficeDisabled} from 'app/utils/status'; import { @@ -36,7 +37,6 @@ import { makeStyleSheetFromTheme, getKeyboardAppearanceFromTheme, } from 'app/utils/theme'; -import {paddingHorizontal as padding} from 'app/components/safe_area_view/iphone_x_spacing'; const {RNTextInputReset} = NativeModules; @@ -83,6 +83,7 @@ export default class PostTextBoxBase extends PureComponent { isTimezoneEnabled: PropTypes.bool, currentChannel: PropTypes.object, isLandscape: PropTypes.bool.isRequired, + screenId: PropTypes.string.isRequired, }; static defaultProps = { @@ -412,19 +413,19 @@ export default class PostTextBoxBase extends PureComponent { this.props.actions.initUploadFiles(images, this.props.rootId); }; - isFileLoading() { + isFileLoading = () => { const {files} = this.props; return files.some((file) => file.loading); - } + }; - isSendButtonVisible() { + isSendButtonVisible = () => { return this.canSend() || this.isFileLoading(); - } + }; - isSendButtonEnabled() { + isSendButtonEnabled = () => { return this.canSend() && !this.isFileLoading() && !this.state.sendingMessage; - } + }; sendMessage = () => { const {value} = this.state; @@ -445,7 +446,7 @@ export default class PostTextBoxBase extends PureComponent { textContainsAtAllAtChannel = (text) => { const textWithoutCode = text.replace(/(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)| *(`{3,}|~{3,})[ .]*(\S+)? *\n([\s\S]*?\s*)\3 *(?:\n+|$)/g, ''); return (/\B@(all|channel)\b/i).test(textWithoutCode); - } + }; showSendToAllOrChannelAlert = (currentMembersCount) => { const {intl} = this.context; @@ -505,7 +506,7 @@ export default class PostTextBoxBase extends PureComponent { }, ], ); - } + }; doSubmitMessage = () => { const {actions, currentUserId, channelId, files, rootId} = this.props; @@ -562,7 +563,7 @@ export default class PostTextBoxBase extends PureComponent { } EventEmitter.emit('scroll-to-bottom'); - } + }; getStatusFromSlashCommand = (message) => { const tokens = message.split(' '); @@ -704,29 +705,31 @@ export default class PostTextBoxBase extends PureComponent { }, ] ); - } + }; handlePasteImages = (error, images) => { - if (error) { - this.showPasteImageErrorDialog(); - return; - } + if (this.props.screenId === EphemeralStore.getNavigationTopComponentId()) { + if (error) { + this.showPasteImageErrorDialog(); + return; + } - const {maxFileSize, files} = this.props; - const availableCount = MAX_FILE_COUNT - files.length; - if (images.length > availableCount) { - this.onShowFileMaxWarning(); - return; - } + const {maxFileSize, files} = this.props; + const availableCount = MAX_FILE_COUNT - files.length; + if (images.length > availableCount) { + this.onShowFileMaxWarning(); + return; + } - const largeImage = images.find((image) => image.fileSize > maxFileSize); - if (largeImage) { - this.onShowFileSizeWarning(largeImage.fileName); - return; - } + const largeImage = images.find((image) => image.fileSize > maxFileSize); + if (largeImage) { + this.onShowFileSizeWarning(largeImage.fileName); + return; + } - this.handleUploadFiles(images); - } + this.handleUploadFiles(images); + } + }; renderDeactivatedChannel = () => { const {intl} = this.context; @@ -740,7 +743,7 @@ export default class PostTextBoxBase extends PureComponent { })} ); - } + }; renderTextBox = () => { const {intl} = this.context; diff --git a/app/components/reactions/reaction.js b/app/components/reactions/reaction.js index c5c669030..3d2d13252 100644 --- a/app/components/reactions/reaction.js +++ b/app/components/reactions/reaction.js @@ -4,6 +4,7 @@ import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; import { + Platform, Text, TouchableOpacity, } from 'react-native'; @@ -46,6 +47,7 @@ export default class Reaction extends PureComponent { {count} @@ -73,8 +75,12 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { marginRight: 6, marginBottom: 5, marginTop: 10, - paddingVertical: 2, paddingHorizontal: 6, + ...Platform.select({ + android: { + paddingBottom: 2, + }, + }), }, }; }); diff --git a/app/i18n/index.js b/app/i18n/index.js index 1fe215879..bafaf7151 100644 --- a/app/i18n/index.js +++ b/app/i18n/index.js @@ -108,12 +108,8 @@ function loadTranslation(locale) { } } -let momentLocale = DEFAULT_LOCALE; - -function setMomentLocale(locale) { - if (momentLocale !== locale) { - momentLocale = moment.locale(locale); - } +export function resetMomentLocale() { + moment.locale(DEFAULT_LOCALE); } export function getTranslations(locale) { @@ -121,8 +117,6 @@ export function getTranslations(locale) { loadTranslation(locale); } - setMomentLocale(locale.toLowerCase()); - return TRANSLATIONS[locale] || TRANSLATIONS[DEFAULT_LOCALE]; } diff --git a/app/init/global_event_handler.js b/app/init/global_event_handler.js index 964351108..9f477ec6e 100644 --- a/app/init/global_event_handler.js +++ b/app/init/global_event_handler.js @@ -18,7 +18,7 @@ import {selectDefaultChannel} from 'app/actions/views/channel'; import {showOverlay} from 'app/actions/navigation'; import {loadConfigAndLicense, setDeepLinkURL, startDataCleanup} from 'app/actions/views/root'; import {NavigationTypes, ViewTypes} from 'app/constants'; -import {getTranslations} from 'app/i18n'; +import {getTranslations, resetMomentLocale} from 'app/i18n'; import mattermostManaged from 'app/mattermost_managed'; import PushNotifications from 'app/push_notifications'; import {getCurrentLocale} from 'app/selectors/i18n'; @@ -145,6 +145,7 @@ class GlobalEventHandler { this.store.dispatch(setServerVersion('')); deleteFileCache(); removeAppCredentials(); + resetMomentLocale(); PushNotifications.clearNotifications(); diff --git a/app/init/global_event_handler.test.js b/app/init/global_event_handler.test.js index 7b22e9f5e..19fcee89a 100644 --- a/app/init/global_event_handler.test.js +++ b/app/init/global_event_handler.test.js @@ -6,6 +6,7 @@ import thunk from 'redux-thunk'; import intitialState from 'app/initial_state'; import PushNotification from 'app/push_notifications'; +import * as I18n from 'app/i18n'; import GlobalEventHandler from './global_event_handler'; @@ -35,11 +36,13 @@ GlobalEventHandler.store = store; // TODO: Add Android test as part of https://mattermost.atlassian.net/browse/MM-17110 describe('GlobalEventHandler', () => { - it('should clear notifications on logout', async () => { + it('should clear notifications and reset moment locale on logout', async () => { const clearNotifications = jest.spyOn(PushNotification, 'clearNotifications'); + const resetMomentLocale = jest.spyOn(I18n, 'resetMomentLocale'); await GlobalEventHandler.onLogout(); expect(clearNotifications).toHaveBeenCalled(); + expect(resetMomentLocale).toHaveBeenCalledWith(); }); it('should call onAppStateChange after configuration', () => { diff --git a/app/screens/channel/channel.android.js b/app/screens/channel/channel.android.js index 866911888..478a7ef08 100644 --- a/app/screens/channel/channel.android.js +++ b/app/screens/channel/channel.android.js @@ -37,6 +37,7 @@ export default class ChannelAndroid extends ChannelBase { diff --git a/app/screens/channel_info/channel_info.js b/app/screens/channel_info/channel_info.js index 11b77a2f4..ff9385a0b 100644 --- a/app/screens/channel_info/channel_info.js +++ b/app/screens/channel_info/channel_info.js @@ -268,7 +268,7 @@ export default class ChannelInfo extends PureComponent { defaultMessage: "We couldn't archive the channel {displayName}. Please check your connection and try again.", }, { - displayName: channel.display_name, + displayName: channel.display_name.trim(), } ); if (result.error.server_error_id === 'api.channel.delete_channel.deleted.app_error') { @@ -290,7 +290,7 @@ export default class ChannelInfo extends PureComponent { message, { term: term.toLowerCase(), - name: channel.display_name, + name: channel.display_name.trim(), } ), [{ diff --git a/app/screens/channel_info/channel_info_row.js b/app/screens/channel_info/channel_info_row.js index 43e0e4f33..d77a1ade8 100644 --- a/app/screens/channel_info/channel_info_row.js +++ b/app/screens/channel_info/channel_info_row.js @@ -60,9 +60,7 @@ function channelInfoRow(props) { value={detail} /> ); - } - - if (rightArrow) { + } else if (rightArrow) { actionElement = ( ); } else { diff --git a/app/screens/thread/thread.ios.js b/app/screens/thread/thread.ios.js index b53125797..e094fe784 100644 --- a/app/screens/thread/thread.ios.js +++ b/app/screens/thread/thread.ios.js @@ -72,12 +72,13 @@ export default class ThreadIOS extends ThreadBase { accessoriesContainerID={ACCESSORIES_CONTAINER_NATIVE_ID} > diff --git a/app/utils/emoji_utils.js b/app/utils/emoji_utils.js index 0dfc88f81..75503da7e 100644 --- a/app/utils/emoji_utils.js +++ b/app/utils/emoji_utils.js @@ -3,7 +3,7 @@ import emojiRegex from 'emoji-regex'; -import {EmojiIndicesByAlias} from './emojis'; +import {Emojis, EmojiIndicesByAlias} from './emojis'; const RE_NAMED_EMOJI = /(:([a-zA-Z0-9_-]+):)/g; @@ -105,3 +105,11 @@ export function doesMatchNamedEmoji(emojiName) { return false; } + +export function getEmojiByName(emojiName) { + if (EmojiIndicesByAlias.has(emojiName)) { + return Emojis[EmojiIndicesByAlias.get(emojiName)]; + } + + return null; +} diff --git a/app/utils/emojis.js b/app/utils/emojis.js index dbdb27a85..b61aa4a2e 100644 --- a/app/utils/emojis.js +++ b/app/utils/emojis.js @@ -13,3 +13,23 @@ export const CategoryNames = ["people","nature","foods","activity","places","obj export const EmojiIndicesByCategory = new Map([["people",[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290]],["nature",[291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449]],["foods",[450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535]],["activity",[536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615]],["places",[616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734]],["objects",[735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,900,901,902,903,904,905,906,907]],["symbols",[908,909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178]],["flags",[1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431]],["custom",[1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447]]]); /* eslint-enable */ + +export const BuiltInEmojis = [ + 'bowtie', + 'feelsgood', + 'finnadie', + 'goberserk', + 'godmode', + 'hurtrealbad', + 'neckbeard', + 'octocat', + 'rage1', + 'rage2', + 'rage3', + 'rage4', + 'squirrel', + 'shipit', + 'suspect', + 'trollface', + 'mattermost', +]; diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index fdc397669..5c48a57d4 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2836,7 +2836,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 232; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2897,7 +2897,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 232; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index 36b3c2127..6a4a1c345 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 232 + 233 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index baf00d8bb..801574d8c 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.24.0 CFBundleVersion - 232 + 233 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index ce8e67638..f83047c87 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 232 + 233 diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist index 69b9354d4..5783c5044 100644 --- a/ios/NotificationService/Info.plist +++ b/ios/NotificationService/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.24.0 CFBundleVersion - 232 + 233 NSExtension NSExtensionPointIdentifier