diff --git a/src/languages/en.ts b/src/languages/en.ts index 9451407c822f..e7871a9b7f36 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1399,7 +1399,6 @@ export default { localTime: 'Local time', }, newChatPage: { - createChat: 'Create chat', startGroup: 'Start group', addToGroup: 'Add to group', }, diff --git a/src/languages/es.ts b/src/languages/es.ts index a56c8ac2739d..9b11e3c54904 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1403,7 +1403,6 @@ export default { localTime: 'Hora local', }, newChatPage: { - createChat: 'Crear chat', startGroup: 'Grupo de inicio', addToGroup: 'AƱadir al grupo', }, diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx index 8137bb0e8515..5f14f8576cb5 100755 --- a/src/pages/NewChatPage.tsx +++ b/src/pages/NewChatPage.tsx @@ -244,25 +244,18 @@ function NewChatPage({isGroupChat}: NewChatPageProps) { [selectedOptions, setSelectedOptions, styles, translate], ); - const footerContent = useMemo(() => { - /** - * Creates a new group chat with all the selected options and the current user, - * or navigates to the existing chat if one with those participants already exists. - */ - const createGroup = () => { - if (selectedOptions.length === 1) { - createChat(); - } - if (!personalData || !personalData.login || !personalData.accountID) { - return; - } - const selectedParticipants: SelectedParticipant[] = selectedOptions.map((option: OptionData) => ({login: option.login ?? '', accountID: option.accountID ?? -1})); - const logins = [...selectedParticipants, {login: personalData.login, accountID: personalData.accountID}]; - Report.setGroupDraft({participants: logins}); - Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM); - }; - - return ( + const createGroup = useCallback(() => { + if (!personalData || !personalData.login || !personalData.accountID) { + return; + } + const selectedParticipants: SelectedParticipant[] = selectedOptions.map((option: OptionData) => ({login: option.login ?? '', accountID: option.accountID ?? -1})); + const logins = [...selectedParticipants, {login: personalData.login, accountID: personalData.accountID}]; + Report.setGroupDraft({participants: logins}); + Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM); + }, [selectedOptions, personalData]); + + const footerContent = useMemo( + () => ( <> 1 ? translate('common.next') : translate('newChatPage.createChat')} + text={translate('common.next')} onPress={createGroup} pressOnEnter /> )} - ); - }, [createChat, personalData, selectedOptions, styles.mb5, translate]); + ), + [createGroup, selectedOptions.length, styles.mb5, translate], + ); return ( (selectedOptions.length > 0 ? createGroup() : createChat(option))} rightHandSideComponent={itemRightSideComponent} footerContent={footerContent} showLoadingPlaceholder={!areOptionsInitialized}