From 7a487c1aa94edf2c85161617ef704849fa291d5c Mon Sep 17 00:00:00 2001
From: Abbey Campbell <campbellabbeya@gmail.com>
Date: Fri, 10 Jul 2026 11:41:54 -0700
Subject: [PATCH 1/2] move and rename ExploreSearchHeader -> SearchHeader

---
 .../Explore/ExploreV2/screens/UniversalSearch.tsx          | 4 ++--
 .../Explore/SearchScreens/ExploreLocationSearch.tsx        | 4 ++--
 .../Explore/SearchScreens/ExploreProjectSearch.tsx         | 4 ++--
 src/components/Explore/SearchScreens/ExploreTaxonSearch.js | 5 ++---
 src/components/Explore/SearchScreens/ExploreUserSearch.js  | 4 ++--
 .../MyObservations/Search/SearchMyObservationsTaxon.tsx    | 7 ++-----
 .../SearchHeader.tsx}                                      | 4 ++--
 src/components/SharedComponents/index.ts                   | 1 +
 8 files changed, 15 insertions(+), 18 deletions(-)
 rename src/components/{Explore/SearchScreens/ExploreSearchHeader.tsx => SharedComponents/SearchHeader.tsx} (95%)

diff --git a/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx b/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx
index 4ba27c032..631de0550 100644
--- a/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx
@@ -17,9 +17,9 @@ import type { UniversalSearchResultItem }
   from "components/Explore/ExploreV2/hooks/useUniversalSearch";
 import useUniversalSearch from "components/Explore/ExploreV2/hooks/useUniversalSearch";
 import EmptySearchResults from "components/Explore/SearchScreens/EmptySearchResults";
-import ExploreSearchHeader from "components/Explore/SearchScreens/ExploreSearchHeader";
 import ContainedSquareButton from "components/SharedComponents/Buttons/ContainedSquareButton";
 import INatIcon from "components/SharedComponents/INatIcon";
+import SearchHeader from "components/SharedComponents/SearchHeader";
 import Body3 from "components/SharedComponents/Typography/Body3";
 import ViewWrapper from "components/SharedComponents/ViewWrapper";
 import {
@@ -210,7 +210,7 @@ const UniversalSearch = ( ) => {
   return (
     <ViewWrapper testID="UniversalSearch">
       <View className="bg-white" style={DROP_SHADOW}>
-        <ExploreSearchHeader
+        <SearchHeader
           headerText={t( "SEARCH" )}
           closeModal={navigation.goBack}
           resetFilters={handleReset}
diff --git a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
index dc556af0f..caa599ad9 100644
--- a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
+++ b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
@@ -5,6 +5,7 @@ import {
   ButtonBar,
   List2,
   SearchBar,
+  SearchHeader,
   ViewWrapper,
 } from "components/SharedComponents";
 import { Pressable, View } from "components/styledComponents";
@@ -24,7 +25,6 @@ import type { RenderLocationPermissionsGateFunction } from "sharedHooks/useLocat
 import { getShadow } from "styles/global";
 
 import EmptySearchResults from "./EmptySearchResults";
-import ExploreSearchHeader from "./ExploreSearchHeader";
 
 const DROP_SHADOW = getShadow( {
   offsetHeight: 4,
@@ -152,7 +152,7 @@ const ExploreLocationSearch = ( {
 
   return (
     <ViewWrapper testID="explore-location-search">
-      <ExploreSearchHeader
+      <SearchHeader
         closeModal={closeModal}
         headerText={t( "SEARCH-LOCATION" )}
         resetFilters={resetPlace}
diff --git a/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx b/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx
index 39d6a3c60..78aa1655d 100644
--- a/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx
+++ b/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx
@@ -4,6 +4,7 @@ import type { ApiProjectSummary } from "api/types";
 import ProjectList from "components/ProjectList/ProjectList";
 import {
   SearchBar,
+  SearchHeader,
   ViewWrapper,
 } from "components/SharedComponents";
 import { View } from "components/styledComponents";
@@ -15,7 +16,6 @@ import { useInfiniteScroll, useTranslation } from "sharedHooks";
 import { getShadow } from "styles/global";
 
 import EmptySearchResults from "./EmptySearchResults";
-import ExploreSearchHeader from "./ExploreSearchHeader";
 
 const DROP_SHADOW = getShadow( {
   offsetHeight: 4,
@@ -71,7 +71,7 @@ const ExploreProjectSearch = ( { closeModal, updateProject }: Props ) => {
 
   return (
     <ViewWrapper>
-      <ExploreSearchHeader
+      <SearchHeader
         closeModal={closeModal}
         headerText={t( "SEARCH-PROJECTS" )}
         resetFilters={resetProject}
diff --git a/src/components/Explore/SearchScreens/ExploreTaxonSearch.js b/src/components/Explore/SearchScreens/ExploreTaxonSearch.js
index dacfa0985..ad7cc01ce 100644
--- a/src/components/Explore/SearchScreens/ExploreTaxonSearch.js
+++ b/src/components/Explore/SearchScreens/ExploreTaxonSearch.js
@@ -1,6 +1,7 @@
 // @flow
 
 import {
+  SearchHeader,
   TaxonResult,
   TaxonSearch,
   ViewWrapper,
@@ -13,8 +14,6 @@ import React, {
 import { useTranslation } from "sharedHooks";
 import useTaxonSearch from "sharedHooks/useTaxonSearch";
 
-import ExploreSearchHeader from "./ExploreSearchHeader";
-
 type Props = {
   closeModal: Function,
   onPressInfo?: Function,
@@ -65,7 +64,7 @@ const ExploreTaxonSearch = ( {
 
   return (
     <ViewWrapper>
-      <ExploreSearchHeader
+      <SearchHeader
         closeModal={closeModal}
         headerText={t( "SEARCH-TAXA" )}
         resetFilters={resetTaxon}
diff --git a/src/components/Explore/SearchScreens/ExploreUserSearch.js b/src/components/Explore/SearchScreens/ExploreUserSearch.js
index 0e86f555b..8fd58b702 100644
--- a/src/components/Explore/SearchScreens/ExploreUserSearch.js
+++ b/src/components/Explore/SearchScreens/ExploreUserSearch.js
@@ -3,6 +3,7 @@
 import {
   ButtonBar,
   SearchBar,
+  SearchHeader,
   ViewWrapper,
 } from "components/SharedComponents";
 import { View } from "components/styledComponents";
@@ -20,7 +21,6 @@ import {
 import { getShadow } from "styles/global";
 
 import EmptySearchResults from "./EmptySearchResults";
-import ExploreSearchHeader from "./ExploreSearchHeader";
 
 const DROP_SHADOW = getShadow( {
   offsetHeight: 4,
@@ -101,7 +101,7 @@ const ExploreUserSearch = ( { closeModal, updateUser }: Props ): Node => {
 
   return (
     <ViewWrapper>
-      <ExploreSearchHeader
+      <SearchHeader
         closeModal={closeModal}
         headerText={t( "SEARCH-USERS" )}
         resetFilters={resetUser}
diff --git a/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx b/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx
index 462e98ca4..b03898db0 100644
--- a/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx
+++ b/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx
@@ -1,10 +1,7 @@
 import { useNavigation } from "@react-navigation/native";
 import type { ApiTaxon } from "api/types";
-// TODO: ExploreSearchHeader is a generic back/title/reset button header that previously
-// was only used in explore. It should be promoted to components/SharedComponents now that it's
-// shared. The cross-feature import below works for now but will be fixed in a follow-up.
-import ExploreSearchHeader from "components/Explore/SearchScreens/ExploreSearchHeader";
 import {
+  SearchHeader,
   TaxonResult,
   TaxonSearch,
   ViewWrapper,
@@ -86,7 +83,7 @@ const SearchMyObservationsTaxon = ( ) => {
 
   return (
     <ViewWrapper>
-      <ExploreSearchHeader
+      <SearchHeader
         closeModal={closeScreen}
         headerText={t( "SEARCH" )}
         resetFilters={resetSearch}
diff --git a/src/components/Explore/SearchScreens/ExploreSearchHeader.tsx b/src/components/SharedComponents/SearchHeader.tsx
similarity index 95%
rename from src/components/Explore/SearchScreens/ExploreSearchHeader.tsx
rename to src/components/SharedComponents/SearchHeader.tsx
index 74f8df5bf..fb03524ea 100644
--- a/src/components/Explore/SearchScreens/ExploreSearchHeader.tsx
+++ b/src/components/SharedComponents/SearchHeader.tsx
@@ -16,7 +16,7 @@ interface Props {
   testID: string;
 }
 
-const ExploreSearchHeader = ( {
+const SearchHeader = ( {
   closeModal,
   headerText,
   resetFilters,
@@ -54,4 +54,4 @@ const ExploreSearchHeader = ( {
   );
 };
 
-export default ExploreSearchHeader;
+export default SearchHeader;
diff --git a/src/components/SharedComponents/index.ts b/src/components/SharedComponents/index.ts
index df43d2a8c..b558c0669 100644
--- a/src/components/SharedComponents/index.ts
+++ b/src/components/SharedComponents/index.ts
@@ -56,6 +56,7 @@ export { default as RadioButtonRow } from "./RadioButtonRow";
 export { default as ScrollableWithStickyHeader } from "./ScrollableWithStickyHeader";
 export { default as ScrollViewWrapper } from "./ScrollViewWrapper";
 export { default as SearchBar } from "./SearchBar";
+export { default as SearchHeader } from "./SearchHeader";
 export { default as BottomSheet } from "./Sheets/BottomSheet";
 export { default as BottomSheetStandardBackdrop } from "./Sheets/BottomSheetStandardBackdrop";
 export { default as BottomSheetV2 } from "./Sheets/BottomSheetV2";

From bd8117ca3248d8c0e18416540b853486de246c43 Mon Sep 17 00:00:00 2001
From: Abbey Campbell <campbellabbeya@gmail.com>
Date: Fri, 10 Jul 2026 11:56:25 -0700
Subject: [PATCH 2/2] make prop names more generic

---
 .../Explore/ExploreV2/screens/UniversalSearch.tsx    |  4 ++--
 .../Explore/SearchScreens/ExploreLocationSearch.tsx  |  4 ++--
 .../Explore/SearchScreens/ExploreProjectSearch.tsx   |  4 ++--
 .../Explore/SearchScreens/ExploreTaxonSearch.js      |  4 ++--
 .../Explore/SearchScreens/ExploreUserSearch.js       |  4 ++--
 .../Search/SearchMyObservationsTaxon.tsx             |  4 ++--
 src/components/SharedComponents/SearchHeader.tsx     | 12 ++++++------
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx b/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx
index 631de0550..8fcbd4ab0 100644
--- a/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx
@@ -212,8 +212,8 @@ const UniversalSearch = ( ) => {
       <View className="bg-white" style={DROP_SHADOW}>
         <SearchHeader
           headerText={t( "SEARCH" )}
-          closeModal={navigation.goBack}
-          resetFilters={handleReset}
+          onClose={navigation.goBack}
+          onReset={handleReset}
           testID="UniversalSearch.back"
         />
         <View className="px-4 pb-4">
diff --git a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
index caa599ad9..2027c74b7 100644
--- a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
+++ b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
@@ -153,9 +153,9 @@ const ExploreLocationSearch = ( {
   return (
     <ViewWrapper testID="explore-location-search">
       <SearchHeader
-        closeModal={closeModal}
+        onClose={closeModal}
         headerText={t( "SEARCH-LOCATION" )}
-        resetFilters={resetPlace}
+        onReset={resetPlace}
         testID="ExploreLocationSearch.close"
       />
       <View
diff --git a/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx b/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx
index 78aa1655d..79ab2651a 100644
--- a/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx
+++ b/src/components/Explore/SearchScreens/ExploreProjectSearch.tsx
@@ -72,9 +72,9 @@ const ExploreProjectSearch = ( { closeModal, updateProject }: Props ) => {
   return (
     <ViewWrapper>
       <SearchHeader
-        closeModal={closeModal}
+        onClose={closeModal}
         headerText={t( "SEARCH-PROJECTS" )}
-        resetFilters={resetProject}
+        onReset={resetProject}
         testID="ExploreProjectSearch.close"
       />
       <View
diff --git a/src/components/Explore/SearchScreens/ExploreTaxonSearch.js b/src/components/Explore/SearchScreens/ExploreTaxonSearch.js
index ad7cc01ce..8874c8878 100644
--- a/src/components/Explore/SearchScreens/ExploreTaxonSearch.js
+++ b/src/components/Explore/SearchScreens/ExploreTaxonSearch.js
@@ -65,9 +65,9 @@ const ExploreTaxonSearch = ( {
   return (
     <ViewWrapper>
       <SearchHeader
-        closeModal={closeModal}
+        onClose={closeModal}
         headerText={t( "SEARCH-TAXA" )}
-        resetFilters={resetTaxon}
+        onReset={resetTaxon}
         testID="ExploreTaxonSearch.close"
       />
       <TaxonSearch
diff --git a/src/components/Explore/SearchScreens/ExploreUserSearch.js b/src/components/Explore/SearchScreens/ExploreUserSearch.js
index 8fd58b702..46a7e4044 100644
--- a/src/components/Explore/SearchScreens/ExploreUserSearch.js
+++ b/src/components/Explore/SearchScreens/ExploreUserSearch.js
@@ -102,9 +102,9 @@ const ExploreUserSearch = ( { closeModal, updateUser }: Props ): Node => {
   return (
     <ViewWrapper>
       <SearchHeader
-        closeModal={closeModal}
+        onClose={closeModal}
         headerText={t( "SEARCH-USERS" )}
-        resetFilters={resetUser}
+        onReset={resetUser}
         testID="ExploreUserSearch.close"
       />
       <View
diff --git a/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx b/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx
index b03898db0..9d9b446a8 100644
--- a/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx
+++ b/src/components/MyObservations/Search/SearchMyObservationsTaxon.tsx
@@ -84,9 +84,9 @@ const SearchMyObservationsTaxon = ( ) => {
   return (
     <ViewWrapper>
       <SearchHeader
-        closeModal={closeScreen}
+        onClose={closeScreen}
         headerText={t( "SEARCH" )}
-        resetFilters={resetSearch}
+        onReset={resetSearch}
         resetDisabled={!searchedTaxon}
         testID="SearchMyObservationsTaxon.close"
       />
diff --git a/src/components/SharedComponents/SearchHeader.tsx b/src/components/SharedComponents/SearchHeader.tsx
index fb03524ea..009f7c2b9 100644
--- a/src/components/SharedComponents/SearchHeader.tsx
+++ b/src/components/SharedComponents/SearchHeader.tsx
@@ -9,17 +9,17 @@ import React from "react";
 import { useTranslation } from "sharedHooks";
 
 interface Props {
-  closeModal: ( ) => void;
+  onClose: ( ) => void;
   headerText: string;
-  resetFilters: ( ) => void;
+  onReset: ( ) => void;
   resetDisabled?: boolean;
   testID: string;
 }
 
 const SearchHeader = ( {
-  closeModal,
+  onClose,
   headerText,
-  resetFilters,
+  onReset,
   resetDisabled = false,
   testID,
 }: Props ) => {
@@ -30,7 +30,7 @@ const SearchHeader = ( {
       <View className="w-[50px]">
         <BackButton
           testID={testID}
-          onPress={closeModal}
+          onPress={onClose}
           accessibilityLabel={headerText}
         />
       </View>
@@ -40,7 +40,7 @@ const SearchHeader = ( {
           "w-[50px] items-end",
           { "opacity-50": resetDisabled },
         )}
-        onPress={resetFilters}
+        onPress={onReset}
         disabled={resetDisabled}
         accessibilityRole="button"
         accessibilityLabel={t( "Reset-verb" )}