Merge pull request #32371 from paultsimura/fix/31800-search-spinner

fix: Discard loading state on empty search request
Expensify · Dec 4, 2023 · 520622f · 520622f
2 parents e7db68c + 3abc582
commit 520622f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -2481,7 +2481,7 @@ const debouncedSearchInServer = lodashDebounce(searchForReports, CONST.TIMING.SE
  * @param {string} searchInput
  */
 function searchInServer(searchInput) {
- if (isNetworkOffline) {
+ if (isNetworkOffline || !searchInput.trim().length) {
  Onyx.set(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, false);
  return;
  }

diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
@@ -210,9 +210,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, translate, i
 
  // When search term updates we will fetch any reports
  const setSearchTermAndSearchInServer = useCallback((text = '') => {
- if (text.length) {
- Report.searchInServer(text);
- }
+ Report.searchInServer(text);
  setSearchTerm(text);
  }, []);
 

diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
@@ -84,10 +84,7 @@ class SearchPage extends Component {
  }
 
  onChangeText(searchValue = '') {
- if (searchValue.length) {
- Report.searchInServer(searchValue);
- }
-
+ Report.searchInServer(searchValue);
  this.setState({searchValue}, this.debouncedUpdateOptions);
  }
 

diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -259,9 +259,7 @@ function MoneyRequestParticipantsSelector({
 
  // When search term updates we will fetch any reports
  const setSearchTermAndSearchInServer = useCallback((text = '') => {
- if (text.length) {
- Report.searchInServer(text);
- }
+ Report.searchInServer(text);
  setSearchTerm(text);
  }, []);
 

diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.js b/src/pages/tasks/TaskShareDestinationSelectorModal.js
@@ -119,9 +119,7 @@ function TaskShareDestinationSelectorModal(props) {
 
  // When search term updates we will fetch any reports
  const setSearchTermAndSearchInServer = useCallback((text = '') => {
- if (text.length) {
- Report.searchInServer(text);
- }
+ Report.searchInServer(text);
  setSearchValue(text);
  }, []);