Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions src/pages/tasks/TaskAssigneeSelectorModal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable es/no-optional-chaining */
import React, {useState, useEffect, useCallback, useMemo} from 'react';
import React, {useState, useEffect, useMemo} from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import {withOnyx} from 'react-native-onyx';
Expand All @@ -10,13 +10,11 @@ import styles from '../../styles/styles';
import Navigation from '../../libs/Navigation/Navigation';
import HeaderWithBackButton from '../../components/HeaderWithBackButton';
import ScreenWrapper from '../../components/ScreenWrapper';
import Timing from '../../libs/actions/Timing';
import CONST from '../../CONST';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import compose from '../../libs/compose';
import personalDetailsPropType from '../personalDetailsPropType';
import reportPropTypes from '../reportPropTypes';
import Performance from '../../libs/Performance';
import ROUTES from '../../ROUTES';

import * as TaskUtils from '../../libs/actions/Task';
Expand Down Expand Up @@ -86,7 +84,7 @@ function TaskAssigneeSelectorModal(props) {
setFilteredCurrentUserOption(results.currentUserOption);
}, [props]);

const updateOptions = useCallback(() => {
useEffect(() => {
const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getNewChatOptions(
props.reports,
props.personalDetails,
Expand All @@ -105,21 +103,8 @@ function TaskAssigneeSelectorModal(props) {
setFilteredCurrentUserOption(currentUserOption);
}, [props, searchValue]);

useEffect(() => {
Timing.start(CONST.TIMING.SEARCH_RENDER);
Performance.markStart(CONST.TIMING.SEARCH_RENDER);

updateOptions();

return () => {
Timing.end(CONST.TIMING.SEARCH_RENDER);
Performance.markEnd(CONST.TIMING.SEARCH_RENDER);
};
}, [updateOptions]);

const onChangeText = (newSearchTerm = '') => {
setSearchValue(newSearchTerm);
updateOptions();
};

const sections = useMemo(() => {
Expand Down Expand Up @@ -205,10 +190,6 @@ function TaskAssigneeSelectorModal(props) {
showTitleTooltip
shouldShowOptions={didScreenTransitionEnd}
placeholderText={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
onLayout={() => {
Timing.end(CONST.TIMING.SEARCH_RENDER);
Performance.markEnd(CONST.TIMING.SEARCH_RENDER);
}}
safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
/>
</View>
Expand Down
23 changes: 2 additions & 21 deletions src/pages/tasks/TaskShareDestinationSelectorModal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable es/no-optional-chaining */
import React, {useState, useEffect, useCallback} from 'react';
import React, {useState, useEffect} from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import {withOnyx} from 'react-native-onyx';
Expand All @@ -10,13 +10,11 @@ import styles from '../../styles/styles';
import Navigation from '../../libs/Navigation/Navigation';
import HeaderWithBackButton from '../../components/HeaderWithBackButton';
import ScreenWrapper from '../../components/ScreenWrapper';
import Timing from '../../libs/actions/Timing';
import CONST from '../../CONST';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import compose from '../../libs/compose';
import personalDetailsPropType from '../personalDetailsPropType';
import reportPropTypes from '../reportPropTypes';
import Performance from '../../libs/Performance';
import * as TaskUtils from '../../libs/actions/Task';
import ROUTES from '../../ROUTES';

Expand Down Expand Up @@ -56,7 +54,7 @@ function TaskShareDestinationSelectorModal(props) {
setFilteredPersonalDetails(results.personalDetails);
}, [props]);

const updateOptions = useCallback(() => {
useEffect(() => {
const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getShareDestinationOptions(
props.reports,
props.personalDetails,
Expand All @@ -74,21 +72,8 @@ function TaskShareDestinationSelectorModal(props) {
setFilteredPersonalDetails(personalDetails);
}, [props, searchValue]);

useEffect(() => {
Timing.start(CONST.TIMING.SEARCH_RENDER);
Performance.markStart(CONST.TIMING.SEARCH_RENDER);

updateOptions();

return () => {
Timing.end(CONST.TIMING.SEARCH_RENDER);
Performance.markEnd(CONST.TIMING.SEARCH_RENDER);
};
}, [updateOptions]);

const onChangeText = (newSearchTerm = '') => {
setSearchValue(newSearchTerm);
updateOptions();
};

const getSections = () => {
Expand Down Expand Up @@ -158,10 +143,6 @@ function TaskShareDestinationSelectorModal(props) {
showTitleTooltip
shouldShowOptions={didScreenTransitionEnd}
placeholderText={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
onLayout={() => {
Timing.end(CONST.TIMING.SEARCH_RENDER);
Performance.markEnd(CONST.TIMING.SEARCH_RENDER);
}}
safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
/>
</View>
Expand Down