From 34b1cb46bb2f666af3f7bd172be060f185796459 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 3 Aug 2026 22:15:51 -0500
Subject: [PATCH 01/21] MOB-1346: state updates

---
 src/api/types.d.ts                                     |  1 +
 .../Explore/ExploreV2/helpers/buildQueryParams.ts      | 10 ++++------
 .../Explore/ExploreV2/helpers/filtersToApiParams.ts    |  6 ++++++
 src/i18n/l10n/en.ftl                                   |  2 ++
 src/i18n/l10n/en.ftl.json                              |  1 +
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/api/types.d.ts b/src/api/types.d.ts
index 77404e9e5c..84e3145001 100644
--- a/src/api/types.d.ts
+++ b/src/api/types.d.ts
@@ -297,5 +297,6 @@ export interface ApiObservationsSearchParams extends ApiParams {
     typeof ORDER_BY_UPDATED_AT |
     typeof ORDER_BY_VOTES;
   return_bounds?: boolean;
+  not_user_id?: number;
   unobserved_by_user_id?: number;
 }
diff --git a/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts b/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts
index 146044532f..0c9ee88e02 100644
--- a/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts
+++ b/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts
@@ -15,10 +15,8 @@ export interface ExploreV2QueryParams extends FilterApiParams {
   order_by: ObservationOrderBy;
   order: SortDirection;
   taxon_id?: number;
-  user_id?: number;
-  project_id?: number;
-  unobserved_by_user_id?: number;
   iconic_taxa?: string[];
+  unobserved_by_user_id?: number;
   lat?: number;
   lng?: number;
   radius?: number;
@@ -95,9 +93,9 @@ const buildExploreV2QueryParams = (
     ...filterParams,
   };
 
-  // `verifiable: true` excludes casual-grade observations, so drop it when the
-  // user explicitly asked for casual (mirrors legacy mapParamsToAPI).
-  if ( paramsWithFilters.quality_grade?.includes( "casual" ) ) {
+  // `verifiable: true` excludes casual-grade observations
+  // so drop it when the user explicitly asked for captive/casual
+  if ( paramsWithFilters.quality_grade?.includes( "casual" ) || paramsWithFilters.captive ) {
     delete paramsWithFilters.verifiable;
   }
 
diff --git a/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts b/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts
index 4b1c072a4a..90d01ec1af 100644
--- a/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts
+++ b/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts
@@ -30,6 +30,7 @@ export interface FilterApiParams {
   photo_license?: string;
   iconic_taxa?: string[];
   user_id?: number;
+  not_user_id?: number;
   project_id?: number;
 }
 
@@ -108,6 +109,11 @@ const filtersToApiParams = (
   }
 
   if ( filters.user?.id ) { params.user_id = filters.user.id; }
+
+  if ( filters.excludeUser?.id ) {
+    params.not_user_id = filters.excludeUser.id;
+  }
+
   if ( filters.project?.id ) { params.project_id = filters.project.id; }
 
   return params;
diff --git a/src/i18n/l10n/en.ftl b/src/i18n/l10n/en.ftl
index 81c22dc55f..b4c3fb977a 100644
--- a/src/i18n/l10n/en.ftl
+++ b/src/i18n/l10n/en.ftl
@@ -79,6 +79,8 @@ Adds-your-vote-of-agreement = Adds your vote of agreement
 Adds-your-vote-of-disagreement = Adds your vote of disagreement
 # Label for toggling app mode between default and advanced settings
 Advanced-Mode = Advanced Mode
+# Header of the advanced search screen
+ADVANCED-SEARCH = ADVANCED SEARCH
 # Link to the advanced search screen with more search filters
 Advanced-Search = Advanced Search
 ADVANCED-SETTINGS = ADVANCED SETTINGS
diff --git a/src/i18n/l10n/en.ftl.json b/src/i18n/l10n/en.ftl.json
index 9e2409b795..5d602d63bc 100644
--- a/src/i18n/l10n/en.ftl.json
+++ b/src/i18n/l10n/en.ftl.json
@@ -33,6 +33,7 @@
   "Adds-your-vote-of-agreement": "Adds your vote of agreement",
   "Adds-your-vote-of-disagreement": "Adds your vote of disagreement",
   "Advanced-Mode": "Advanced Mode",
+  "ADVANCED-SEARCH": "ADVANCED SEARCH",
   "Advanced-Search": "Advanced Search",
   "ADVANCED-SETTINGS": "ADVANCED SETTINGS",
   "Affiliation": "Affiliation: { $site }",

From 31081e2671f95ff1e049e646cb0ef4ce509d6a8d Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 3 Aug 2026 22:20:56 -0500
Subject: [PATCH 02/21] MOB-1346: no permissions request in ExploreV2 location
 search

---
 .../Explore/Modals/ExploreLocationSearchModal.tsx        | 4 ++--
 .../Explore/SearchScreens/ExploreLocationSearch.tsx      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Explore/Modals/ExploreLocationSearchModal.tsx b/src/components/Explore/Modals/ExploreLocationSearchModal.tsx
index 0bcfa20852..0802919faf 100644
--- a/src/components/Explore/Modals/ExploreLocationSearchModal.tsx
+++ b/src/components/Explore/Modals/ExploreLocationSearchModal.tsx
@@ -8,8 +8,8 @@ interface Props {
   closeModal: () => void;
   hasPermissions?: boolean;
   onSelectNearby: ( ) => Promise<void> | void;
-  renderPermissionsGate: ( options: LocationPermissionCallbacks ) => React.FC;
-  requestPermissions: ( ) => void;
+  renderPermissionsGate?: ( options: LocationPermissionCallbacks ) => React.FC;
+  requestPermissions?: ( ) => void;
   showModal: boolean;
   updateLocation: ( location: "worldwide" | ApiPlace ) => void;
 }
diff --git a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
index ee4ccadc74..96568c3f9c 100644
--- a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
+++ b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx
@@ -32,8 +32,9 @@ interface Props {
   closeModal: () => void;
   hasPermissions?: boolean;
   onSelectNearby: ( ) => Promise<void> | void;
-  renderPermissionsGate: RenderLocationPermissionsGateFunction;
-  requestPermissions: ( ) => void;
+  // Optional: exploreV2 relies on ExploreResults for all perms handling
+  renderPermissionsGate?: RenderLocationPermissionsGateFunction;
+  requestPermissions?: ( ) => void;
   updateLocation: ( location: "worldwide" | ApiPlace ) => void;
 }
 
@@ -114,7 +115,7 @@ const ExploreLocationSearch = ( {
   }, [onSelectNearby, closeModal] );
 
   const onNearbyPressed = () => {
-    if ( hasPermissions ) {
+    if ( hasPermissions || !requestPermissions ) {
       setNearbyLocation( );
     } else {
       requestPermissions( );
@@ -173,7 +174,7 @@ const ExploreLocationSearch = ( {
         ListEmptyComponent={emptyListComponent}
         ListFooterComponent={Footer}
       />
-      {renderPermissionsGate( { onPermissionGranted: setNearbyLocation } )}
+      {renderPermissionsGate?.( { onPermissionGranted: setNearbyLocation } )}
     </ViewWrapper>
   );
 };

From 0be516dbeb5f11cafd06eb1cd456383260ec20ee Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 3 Aug 2026 22:23:15 -0500
Subject: [PATCH 03/21] MOB-1346: not by me in context

---
 src/providers/ExploreV2Context.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/providers/ExploreV2Context.tsx b/src/providers/ExploreV2Context.tsx
index e9a0df6a2e..ffcd4eea20 100644
--- a/src/providers/ExploreV2Context.tsx
+++ b/src/providers/ExploreV2Context.tsx
@@ -98,6 +98,7 @@ export interface ExploreV2Filters {
   iconic_taxa?: string[] | null;
   // User / project, in ExploreV2 parlance we always consider taxon to be the "subject"
   user?: ApiUser | null;
+  excludeUser?: ApiUser | null;
   project?: ApiProjectSummary | null;
 }
 

From f763af3fcc7d5ea98cd4adf4592591430a3ee0c7 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 3 Aug 2026 22:30:52 -0500
Subject: [PATCH 04/21] MOB-1346: advanced search subsection UI

---
 .../components/DateFilterSection.tsx          | 161 ++++++++++++++++++
 .../components/RadioGroupSection.tsx          |  43 +++++
 .../components/SelectedFilterRow.tsx          |  46 +++++
 3 files changed, 250 insertions(+)
 create mode 100644 src/components/Explore/ExploreV2/components/DateFilterSection.tsx
 create mode 100644 src/components/Explore/ExploreV2/components/RadioGroupSection.tsx
 create mode 100644 src/components/Explore/ExploreV2/components/SelectedFilterRow.tsx

diff --git a/src/components/Explore/ExploreV2/components/DateFilterSection.tsx b/src/components/Explore/ExploreV2/components/DateFilterSection.tsx
new file mode 100644
index 0000000000..409cc282f4
--- /dev/null
+++ b/src/components/Explore/ExploreV2/components/DateFilterSection.tsx
@@ -0,0 +1,161 @@
+import classNames from "classnames";
+import {
+  Body1,
+  Button,
+  DateTimePicker,
+  Heading4,
+  INatIcon,
+  List2,
+  RadioButtonSheet,
+} from "components/SharedComponents";
+import { View } from "components/styledComponents";
+import React, { useState } from "react";
+import { formatObsFieldDate } from "sharedHelpers/dateAndTime";
+import { useTranslation } from "sharedHooks";
+import colors from "styles/tailwindColors";
+
+const toISODate = ( date: Date ): string => formatObsFieldDate( date );
+
+type OpenSheet = "mode" | "exact" | "start" | "end" | null;
+
+interface ModeOption {
+  label: string;
+  labelCaps: string;
+  text?: string;
+  value: string;
+}
+
+interface Props {
+  accessibilityLabel: string;
+  children?: React.ReactNode;
+  exactDate?: string | null;
+  exactMode: string;
+  headerText: string;
+  mode: string;
+  modeValues: Record<string, ModeOption>;
+  onChangeExactDate: ( isoDate: string ) => void;
+  onChangeMode: ( mode: string ) => void;
+  onChangeRangeEnd: ( isoDate: string ) => void;
+  onChangeRangeStart: ( isoDate: string ) => void;
+  rangeEnd?: string | null;
+  rangeEndBeforeStart?: boolean;
+  rangeMode: string;
+  rangeStart?: string | null;
+}
+
+const DateFilterSection = ( {
+  accessibilityLabel,
+  children,
+  exactDate,
+  exactMode,
+  headerText,
+  mode,
+  modeValues,
+  onChangeExactDate,
+  onChangeMode,
+  onChangeRangeEnd,
+  onChangeRangeStart,
+  rangeEnd,
+  rangeEndBeforeStart,
+  rangeMode,
+  rangeStart,
+}: Props ) => {
+  const { t } = useTranslation( );
+  const [openSheet, setOpenSheet] = useState<OpenSheet>( null );
+  const closeSheet = ( ) => setOpenSheet( null );
+
+  return (
+    <View className="mb-7">
+      <Heading4 className="mb-5">{headerText}</Heading4>
+      <Button
+        text={modeValues[mode]?.labelCaps}
+        className="shrink mb-7"
+        dropdown
+        onPress={( ) => setOpenSheet( "mode" )}
+        accessibilityLabel={accessibilityLabel}
+      />
+      {mode === exactMode && (
+        <View className="items-center">
+          <Body1 className="mb-5">{exactDate}</Body1>
+          <Button
+            level="primary"
+            text={t( "CHANGE-DATE" )}
+            className="w-full mb-7"
+            onPress={( ) => setOpenSheet( "exact" )}
+            accessibilityLabel={t( "Change-date" )}
+          />
+          <DateTimePicker
+            isDateTimePickerVisible={openSheet === "exact"}
+            toggleDateTimePicker={closeSheet}
+            onDatePicked={date => onChangeExactDate( toISODate( date ) )}
+          />
+        </View>
+      )}
+      {mode === rangeMode && (
+        <View className="items-center">
+          <Body1
+            className={classNames(
+              "mb-5",
+              rangeEndBeforeStart && "color-warningRed",
+            )}
+          >
+            {rangeStart}
+          </Body1>
+          <Button
+            level="primary"
+            text={t( "CHANGE-START-DATE" )}
+            className="w-full mb-7"
+            onPress={( ) => setOpenSheet( "start" )}
+            accessibilityLabel={t( "Change-start-date" )}
+          />
+          <Body1 className="mb-5">{rangeEnd}</Body1>
+          <Button
+            level="primary"
+            text={t( "CHANGE-END-DATE" )}
+            className="w-full mb-7"
+            onPress={( ) => setOpenSheet( "end" )}
+            accessibilityLabel={t( "Change-end-date" )}
+          />
+          {rangeEndBeforeStart && (
+            <View className="flex-row mb-5">
+              <INatIcon
+                name="triangle-exclamation"
+                size={19}
+                color={colors.warningRed}
+              />
+              <List2 className="ml-3">
+                {t( "Start-must-be-before-end" )}
+              </List2>
+            </View>
+          )}
+          <DateTimePicker
+            isDateTimePickerVisible={openSheet === "start"}
+            toggleDateTimePicker={closeSheet}
+            onDatePicked={date => onChangeRangeStart( toISODate( date ) )}
+          />
+          <DateTimePicker
+            isDateTimePickerVisible={openSheet === "end"}
+            toggleDateTimePicker={closeSheet}
+            onDatePicked={date => onChangeRangeEnd( toISODate( date ) )}
+          />
+        </View>
+      )}
+      {children}
+      {openSheet === "mode" && (
+        <RadioButtonSheet
+          headerText={headerText}
+          confirm={newMode => {
+            onChangeMode( String( newMode ) );
+            closeSheet( );
+          }}
+          onPressClose={closeSheet}
+          radioValues={modeValues}
+          selectedValue={mode}
+          insideModal
+        />
+      )}
+    </View>
+  );
+};
+
+export default DateFilterSection;
diff --git a/src/components/Explore/ExploreV2/components/RadioGroupSection.tsx b/src/components/Explore/ExploreV2/components/RadioGroupSection.tsx
new file mode 100644
index 0000000000..b546cac765
--- /dev/null
+++ b/src/components/Explore/ExploreV2/components/RadioGroupSection.tsx
@@ -0,0 +1,43 @@
+import {
+  Heading4,
+  RadioButtonRow,
+} from "components/SharedComponents";
+import { View } from "components/styledComponents";
+import React from "react";
+
+type RadioValue = boolean | number | string;
+
+interface Props<ValueT extends RadioValue> {
+  headerText: string;
+  onChange: ( value: ValueT ) => void;
+  selectedValue: ValueT;
+  values: Record<string, { label: string; value: ValueT }>;
+}
+
+const RadioGroupSection = <ValueT extends RadioValue>( {
+  headerText,
+  onChange,
+  selectedValue,
+  values,
+}: Props<ValueT> ) => {
+  const rows = Object.keys( values ).map( key => (
+    <View key={key} className="mb-4">
+      <RadioButtonRow
+        smallLabel
+        value={values[key].value.toString( )}
+        checked={values[key].value === selectedValue}
+        onPress={( ) => onChange( values[key].value )}
+        label={values[key].label}
+      />
+    </View>
+  ) );
+
+  return (
+    <View className="mb-3">
+      <Heading4 className="mb-5">{headerText}</Heading4>
+      {rows}
+    </View>
+  );
+};
+
+export default RadioGroupSection;
diff --git a/src/components/Explore/ExploreV2/components/SelectedFilterRow.tsx b/src/components/Explore/ExploreV2/components/SelectedFilterRow.tsx
new file mode 100644
index 0000000000..ea28a120ff
--- /dev/null
+++ b/src/components/Explore/ExploreV2/components/SelectedFilterRow.tsx
@@ -0,0 +1,46 @@
+import classNames from "classnames";
+import {
+  INatIcon,
+  INatIconButton,
+} from "components/SharedComponents";
+import { Pressable, View } from "components/styledComponents";
+import React from "react";
+
+interface Props {
+  accessibilityLabel: string;
+  children: React.ReactNode;
+  justify?: "justify-between" | "justify-around";
+  onEdit: ( ) => void;
+  onRemove: ( ) => void;
+  removeAccessibilityLabel: string;
+}
+
+const SelectedFilterRow = ( {
+  accessibilityLabel,
+  children,
+  justify = "justify-between",
+  onEdit,
+  onRemove,
+  removeAccessibilityLabel,
+}: Props ) => (
+  <Pressable
+    className={classNames( "flex-row items-center", justify )}
+    accessibilityRole="button"
+    accessibilityLabel={accessibilityLabel}
+    onPress={onEdit}
+  >
+    {children}
+    <View className="flex-row items-center">
+      <INatIcon name="edit" size={22} />
+      <INatIconButton
+        className="ml-3"
+        icon="close"
+        size={20}
+        onPress={onRemove}
+        accessibilityLabel={removeAccessibilityLabel}
+      />
+    </View>
+  </Pressable>
+);
+
+export default SelectedFilterRow;

From 97018dbc149299656f731b266ede10dfcc8d0b14 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 3 Aug 2026 22:38:05 -0500
Subject: [PATCH 05/21] MOB-1346: header in AdvancedSearch

---
 .../ExploreV2/screens/AdvancedSearch.tsx      | 20 +++++++++++--------
 src/i18n/strings.ftl                          |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 637c92ae4b..31cb9e3b95 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -1,14 +1,18 @@
 import { Body2, ViewWrapper } from "components/SharedComponents";
 import { View } from "components/styledComponents";
 import React from "react";
+import { useTranslation } from "sharedHooks";
 
-const AdvancedSearch = ( ) => (
-  <ViewWrapper testID="AdvancedSearch">
-    <View className="flex-1 items-center justify-center p-4">
-      {/* eslint-disable-next-line i18next/no-literal-string */}
-      <Body2>TODO: Advanced Search — MOB-1346</Body2>
-    </View>
-  </ViewWrapper>
-);
+const AdvancedSearch = ( ) => {
+  const { t } = useTranslation( );
+
+  return (
+    <ViewWrapper testID="AdvancedSearch">
+      <View className="flex-1 items-center justify-center p-4">
+        <Body2>{t( "ADVANCED-SEARCH" )}</Body2>
+      </View>
+    </ViewWrapper>
+  );
+};
 
 export default AdvancedSearch;
diff --git a/src/i18n/strings.ftl b/src/i18n/strings.ftl
index 81c22dc55f..b4c3fb977a 100644
--- a/src/i18n/strings.ftl
+++ b/src/i18n/strings.ftl
@@ -79,6 +79,8 @@ Adds-your-vote-of-agreement = Adds your vote of agreement
 Adds-your-vote-of-disagreement = Adds your vote of disagreement
 # Label for toggling app mode between default and advanced settings
 Advanced-Mode = Advanced Mode
+# Header of the advanced search screen
+ADVANCED-SEARCH = ADVANCED SEARCH
 # Link to the advanced search screen with more search filters
 Advanced-Search = Advanced Search
 ADVANCED-SETTINGS = ADVANCED SETTINGS

From 2f7e41ebe65efd60b8360b46b87e0efdf87478da Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 3 Aug 2026 23:30:28 -0500
Subject: [PATCH 06/21] MOB-1346: subcomponent tests

---
 .../components/DateFilterSection.test.js      | 191 ++++++++++++++++++
 .../components/RadioGroupSection.test.js      |  85 ++++++++
 .../components/SelectedFilterRow.test.js      |  55 +++++
 3 files changed, 331 insertions(+)
 create mode 100644 tests/unit/components/Explore/ExploreV2/components/DateFilterSection.test.js
 create mode 100644 tests/unit/components/Explore/ExploreV2/components/RadioGroupSection.test.js
 create mode 100644 tests/unit/components/Explore/ExploreV2/components/SelectedFilterRow.test.js

diff --git a/tests/unit/components/Explore/ExploreV2/components/DateFilterSection.test.js b/tests/unit/components/Explore/ExploreV2/components/DateFilterSection.test.js
new file mode 100644
index 0000000000..c92eb27825
--- /dev/null
+++ b/tests/unit/components/Explore/ExploreV2/components/DateFilterSection.test.js
@@ -0,0 +1,191 @@
+import { screen, userEvent } from "@testing-library/react-native";
+import DateFilterSection
+  from "components/Explore/ExploreV2/components/DateFilterSection";
+import initI18next from "i18n/initI18next";
+import React from "react";
+import { Pressable as MockPressable, Text } from "react-native";
+import { renderComponent } from "tests/helpers/render";
+
+jest.mock( "components/SharedComponents/DateTimePicker", () => function (
+  { isDateTimePickerVisible, onDatePicked },
+) {
+  return isDateTimePickerVisible
+    ? (
+      <MockPressable
+        accessibilityRole="button"
+        testID="mock-date-picker-confirm"
+        onPress={() => onDatePicked( new Date( "2024-03-05T12:00:00" ) )}
+      />
+    )
+    : null;
+} );
+
+const actor = userEvent.setup( );
+
+const CHILD_LABEL = "January";
+
+const MODE_VALUES = {
+  all: { label: "All", labelCaps: "ALL", value: "all" },
+  exact: {
+    label: "Exact Date",
+    labelCaps: "EXACT DATE",
+    text: "Filter by observed on date",
+    value: "exact",
+  },
+  range: { label: "Date Range", labelCaps: "DATE RANGE", value: "range" },
+  months: { label: "Months", labelCaps: "MONTHS", value: "months" },
+};
+
+const renderSection = ( props = {}, children = null ) => renderComponent(
+  <DateFilterSection
+    accessibilityLabel="Date observed"
+    exactMode="exact"
+    headerText="DATE OBSERVED"
+    mode="all"
+    modeValues={MODE_VALUES}
+    onChangeExactDate={jest.fn( )}
+    onChangeMode={jest.fn( )}
+    onChangeRangeEnd={jest.fn( )}
+    onChangeRangeStart={jest.fn( )}
+    rangeMode="range"
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    {...props}
+  >
+    {children}
+  </DateFilterSection>,
+);
+
+beforeAll( async ( ) => {
+  await initI18next( );
+} );
+
+describe( "DateFilterSection", ( ) => {
+  it( "renders the header and the capitalized label of the current mode", ( ) => {
+    renderSection( );
+
+    expect( screen.getByText( "DATE OBSERVED" ) ).toBeTruthy( );
+    expect( screen.getByLabelText( "Date observed" ) ).toBeTruthy( );
+    expect( screen.getByText( "ALL" ) ).toBeTruthy( );
+  } );
+
+  it( "shows no date controls when the mode is neither exact nor range", ( ) => {
+    renderSection( );
+
+    expect( screen.queryByText( "CHANGE DATE" ) ).toBeNull( );
+    expect( screen.queryByText( "CHANGE START DATE" ) ).toBeNull( );
+    expect( screen.queryByText( "CHANGE END DATE" ) ).toBeNull( );
+  } );
+
+  it( "renders children, e.g. the month checkboxes", ( ) => {
+    renderSection( { mode: "months" }, <Text>{CHILD_LABEL}</Text> );
+
+    expect( screen.getByText( CHILD_LABEL ) ).toBeTruthy( );
+  } );
+
+  describe( "mode sheet", ( ) => {
+    it( "opens a radio button sheet listing every mode", async ( ) => {
+      renderSection( );
+
+      await actor.press( screen.getByLabelText( "Date observed" ) );
+
+      expect( screen.getByText( "Exact Date" ) ).toBeTruthy( );
+      expect( screen.getByText( "Date Range" ) ).toBeTruthy( );
+      expect( screen.getByText( "Months" ) ).toBeTruthy( );
+    } );
+
+    it( "calls onChangeMode with the confirmed mode and closes the sheet", async ( ) => {
+      const onChangeMode = jest.fn( );
+      renderSection( { onChangeMode } );
+
+      await actor.press( screen.getByLabelText( "Date observed" ) );
+      await actor.press( screen.getByText( "Date Range" ) );
+      await actor.press( screen.getByText( "CONFIRM" ) );
+
+      expect( onChangeMode ).toHaveBeenCalledWith( "range" );
+      expect( screen.queryByText( "Date Range" ) ).toBeNull( );
+    } );
+  } );
+
+  describe( "exact date mode", ( ) => {
+    it( "shows the selected date", ( ) => {
+      renderSection( { mode: "exact", exactDate: "2024-01-15" } );
+
+      expect( screen.getByText( "2024-01-15" ) ).toBeTruthy( );
+      expect( screen.getByText( "CHANGE DATE" ) ).toBeTruthy( );
+      expect( screen.queryByText( "CHANGE START DATE" ) ).toBeNull( );
+    } );
+
+    it( "calls onChangeExactDate with an ISO date when a date is picked", async ( ) => {
+      const onChangeExactDate = jest.fn( );
+      renderSection( { mode: "exact", exactDate: "2024-01-15", onChangeExactDate } );
+
+      await actor.press( screen.getByText( "CHANGE DATE" ) );
+      await actor.press( screen.getByTestId( "mock-date-picker-confirm" ) );
+
+      expect( onChangeExactDate ).toHaveBeenCalledWith( "2024-03-05" );
+    } );
+  } );
+
+  describe( "date range mode", ( ) => {
+    const RANGE_PROPS = {
+      mode: "range",
+      rangeStart: "2024-01-15",
+      rangeEnd: "2024-02-20",
+    };
+
+    it( "shows both ends of the range", ( ) => {
+      renderSection( RANGE_PROPS );
+
+      expect( screen.getByText( "2024-01-15" ) ).toBeTruthy( );
+      expect( screen.getByText( "2024-02-20" ) ).toBeTruthy( );
+      expect( screen.getByText( "CHANGE START DATE" ) ).toBeTruthy( );
+      expect( screen.getByText( "CHANGE END DATE" ) ).toBeTruthy( );
+      expect( screen.queryByText( "CHANGE DATE" ) ).toBeNull( );
+    } );
+
+    it( "calls onChangeRangeStart when a start date is picked", async ( ) => {
+      const onChangeRangeStart = jest.fn( );
+      const onChangeRangeEnd = jest.fn( );
+      renderSection( { ...RANGE_PROPS, onChangeRangeStart, onChangeRangeEnd } );
+
+      await actor.press( screen.getByText( "CHANGE START DATE" ) );
+      await actor.press( screen.getByTestId( "mock-date-picker-confirm" ) );
+
+      expect( onChangeRangeStart ).toHaveBeenCalledWith( "2024-03-05" );
+      expect( onChangeRangeEnd ).not.toHaveBeenCalled( );
+    } );
+
+    it( "calls onChangeRangeEnd when an end date is picked", async ( ) => {
+      const onChangeRangeStart = jest.fn( );
+      const onChangeRangeEnd = jest.fn( );
+      renderSection( { ...RANGE_PROPS, onChangeRangeStart, onChangeRangeEnd } );
+
+      await actor.press( screen.getByText( "CHANGE END DATE" ) );
+      await actor.press( screen.getByTestId( "mock-date-picker-confirm" ) );
+
+      expect( onChangeRangeEnd ).toHaveBeenCalledWith( "2024-03-05" );
+      expect( onChangeRangeStart ).not.toHaveBeenCalled( );
+    } );
+
+    it( "warns when the end date is before the start date", ( ) => {
+      renderSection( {
+        ...RANGE_PROPS,
+        rangeStart: "2024-02-20",
+        rangeEnd: "2024-01-15",
+        rangeEndBeforeStart: true,
+      } );
+
+      expect(
+        screen.getByText( "The start date must be before the end date." ),
+      ).toBeTruthy( );
+    } );
+
+    it( "does not warn when the range is valid", ( ) => {
+      renderSection( RANGE_PROPS );
+
+      expect(
+        screen.queryByText( "The start date must be before the end date." ),
+      ).toBeNull( );
+    } );
+  } );
+} );
diff --git a/tests/unit/components/Explore/ExploreV2/components/RadioGroupSection.test.js b/tests/unit/components/Explore/ExploreV2/components/RadioGroupSection.test.js
new file mode 100644
index 0000000000..491dfb0524
--- /dev/null
+++ b/tests/unit/components/Explore/ExploreV2/components/RadioGroupSection.test.js
@@ -0,0 +1,85 @@
+import { screen, userEvent } from "@testing-library/react-native";
+import RadioGroupSection
+  from "components/Explore/ExploreV2/components/RadioGroupSection";
+import React from "react";
+import { renderComponent } from "tests/helpers/render";
+
+const actor = userEvent.setup( );
+
+const WILD_VALUES = {
+  all: { label: "All", value: "all" },
+  wild: { label: "Wild", value: "wild" },
+  captive: { label: "Captive", value: "captive" },
+};
+
+const BOOLEAN_VALUES = {
+  reviewed: { label: "Reviewed", value: true },
+  unreviewed: { label: "Unreviewed", value: false },
+};
+
+describe( "RadioGroupSection", ( ) => {
+  it( "renders the header and a row for every value", ( ) => {
+    renderComponent(
+      <RadioGroupSection
+        headerText="WILD STATUS"
+        onChange={jest.fn( )}
+        selectedValue="all"
+        values={WILD_VALUES}
+      />,
+    );
+
+    expect( screen.getByText( "WILD STATUS" ) ).toBeTruthy( );
+    expect( screen.getByText( "All" ) ).toBeTruthy( );
+    expect( screen.getByText( "Wild" ) ).toBeTruthy( );
+    expect( screen.getByText( "Captive" ) ).toBeTruthy( );
+  } );
+
+  it( "checks only the row matching the selected value", ( ) => {
+    renderComponent(
+      <RadioGroupSection
+        headerText="WILD STATUS"
+        onChange={jest.fn( )}
+        selectedValue="wild"
+        values={WILD_VALUES}
+      />,
+    );
+
+    expect( screen.getByLabelText( "Wild" ) ).toBeChecked( );
+    expect( screen.getByLabelText( "All" ) ).not.toBeChecked( );
+    expect( screen.getByLabelText( "Captive" ) ).not.toBeChecked( );
+  } );
+
+  it( "calls onChange with the value of the row that was tapped", async ( ) => {
+    const onChange = jest.fn( );
+    renderComponent(
+      <RadioGroupSection
+        headerText="WILD STATUS"
+        onChange={onChange}
+        selectedValue="all"
+        values={WILD_VALUES}
+      />,
+    );
+
+    await actor.press( screen.getByText( "Captive" ) );
+
+    expect( onChange ).toHaveBeenCalledWith( "captive" );
+  } );
+
+  it( "supports non-string values without stringifying them in onChange", async ( ) => {
+    const onChange = jest.fn( );
+    renderComponent(
+      <RadioGroupSection
+        headerText="REVIEWED"
+        onChange={onChange}
+        selectedValue
+        values={BOOLEAN_VALUES}
+      />,
+    );
+
+    expect( screen.getByLabelText( "Reviewed" ) ).toBeChecked( );
+
+    await actor.press( screen.getByText( "Unreviewed" ) );
+
+    expect( onChange ).toHaveBeenCalledWith( false );
+  } );
+} );
diff --git a/tests/unit/components/Explore/ExploreV2/components/SelectedFilterRow.test.js b/tests/unit/components/Explore/ExploreV2/components/SelectedFilterRow.test.js
new file mode 100644
index 0000000000..1a195a9486
--- /dev/null
+++ b/tests/unit/components/Explore/ExploreV2/components/SelectedFilterRow.test.js
@@ -0,0 +1,55 @@
+import { screen, userEvent } from "@testing-library/react-native";
+import SelectedFilterRow
+  from "components/Explore/ExploreV2/components/SelectedFilterRow";
+import React from "react";
+import { Text } from "react-native";
+import { renderComponent } from "tests/helpers/render";
+
+const actor = userEvent.setup( );
+
+const CHILD_LABEL = "Amphibia";
+
+const renderRow = ( props = {} ) => renderComponent(
+  <SelectedFilterRow
+    accessibilityLabel="Change taxon"
+    onEdit={jest.fn( )}
+    onRemove={jest.fn( )}
+    removeAccessibilityLabel="Remove taxon filter"
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    {...props}
+  >
+    <Text>{CHILD_LABEL}</Text>
+  </SelectedFilterRow>,
+);
+
+describe( "SelectedFilterRow", ( ) => {
+  it( "renders its children next to edit and remove controls", ( ) => {
+    renderRow( );
+
+    expect( screen.getByText( CHILD_LABEL ) ).toBeTruthy( );
+    expect( screen.getByLabelText( "Change taxon" ) ).toBeTruthy( );
+    expect( screen.getByLabelText( "Remove taxon filter" ) ).toBeTruthy( );
+  } );
+
+  it( "calls onEdit when the row is tapped", async ( ) => {
+    const onEdit = jest.fn( );
+    const onRemove = jest.fn( );
+    renderRow( { onEdit, onRemove } );
+
+    await actor.press( screen.getByLabelText( "Change taxon" ) );
+
+    expect( onEdit ).toHaveBeenCalledTimes( 1 );
+    expect( onRemove ).not.toHaveBeenCalled( );
+  } );
+
+  it( "calls onRemove when the remove button is tapped", async ( ) => {
+    const onEdit = jest.fn( );
+    const onRemove = jest.fn( );
+    renderRow( { onEdit, onRemove } );
+
+    await actor.press( screen.getByLabelText( "Remove taxon filter" ) );
+
+    expect( onRemove ).toHaveBeenCalledTimes( 1 );
+    expect( onEdit ).not.toHaveBeenCalled( );
+  } );
+} );

From 9d77efdc3384e9ed66d974b62afc93ae96ff2f29 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Fri, 7 Aug 2026 16:29:30 -0500
Subject: [PATCH 07/21] MOB-1346: advanced search ui

---
 .../helpers/advancedSearchOptions.ts          | 186 +++++
 .../helpers/advancedSearchReducer.ts          | 221 +++++
 .../ExploreV2/screens/AdvancedSearch.tsx      | 755 +++++++++++++++++-
 3 files changed, 1152 insertions(+), 10 deletions(-)
 create mode 100644 src/components/Explore/ExploreV2/helpers/advancedSearchOptions.ts
 create mode 100644 src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchOptions.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchOptions.ts
new file mode 100644
index 0000000000..69fc4c11ff
--- /dev/null
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchOptions.ts
@@ -0,0 +1,186 @@
+import type { TFunction } from "i18next";
+import {
+  DATE_OBSERVED,
+  DATE_UPLOADED,
+  ESTABLISHMENT_MEAN,
+  MEDIA,
+  PHOTO_LICENSE,
+  REVIEWED,
+  TAXONOMIC_RANK,
+  WILD_STATUS,
+} from "providers/ExploreContext";
+import { OBSERVATIONS_SORT } from "sharedHelpers/observationsSort";
+
+export interface FilterOption<ValueT> {
+  label: string;
+  value: ValueT;
+}
+const option = <ValueT extends string | number>(
+  value: ValueT,
+  label: string,
+): [ValueT, FilterOption<ValueT>] => [value, { label, value }];
+
+// `label` / `text` are the two lines of each row in the sort sheet; `labelCaps`
+// is the single-line, all-caps version in the dropdown button
+export const getSortByValues = ( t: TFunction ) => ( {
+  [OBSERVATIONS_SORT.DATE_UPLOADED_NEWEST]: {
+    label: t( "Date-uploaded" ),
+    labelCaps: t( "DATE-UPLOADED-NEWEST" ),
+    text: t( "Newest-to-oldest" ),
+    value: OBSERVATIONS_SORT.DATE_UPLOADED_NEWEST,
+  },
+  [OBSERVATIONS_SORT.DATE_UPLOADED_OLDEST]: {
+    label: t( "Date-uploaded" ),
+    labelCaps: t( "DATE-UPLOADED-OLDEST" ),
+    text: t( "Oldest-to-newest" ),
+    value: OBSERVATIONS_SORT.DATE_UPLOADED_OLDEST,
+  },
+  [OBSERVATIONS_SORT.DATE_OBSERVED_NEWEST]: {
+    label: t( "Date-observed" ),
+    labelCaps: t( "DATE-OBSERVED-NEWEST" ),
+    text: t( "Newest-to-oldest" ),
+    value: OBSERVATIONS_SORT.DATE_OBSERVED_NEWEST,
+  },
+  [OBSERVATIONS_SORT.DATE_OBSERVED_OLDEST]: {
+    label: t( "Date-observed" ),
+    labelCaps: t( "DATE-OBSERVED-OLDEST" ),
+    text: t( "Oldest-to-newest" ),
+    value: OBSERVATIONS_SORT.DATE_OBSERVED_OLDEST,
+  },
+} );
+
+export const getTaxonomicRankValues = ( t: TFunction ) => Object.fromEntries( [
+  option( TAXONOMIC_RANK.none, t( "NONE--ranks" ) ),
+  option( TAXONOMIC_RANK.kingdom, t( "Ranks-KINGDOM" ) ),
+  option( TAXONOMIC_RANK.phylum, t( "Ranks-PHYLUM" ) ),
+  option( TAXONOMIC_RANK.subphylum, t( "Ranks-SUBPHYLUM" ) ),
+  option( TAXONOMIC_RANK.superclass, t( "Ranks-SUPERCLASS" ) ),
+  option( TAXONOMIC_RANK.class, t( "Ranks-CLASS" ) ),
+  option( TAXONOMIC_RANK.subclass, t( "Ranks-SUBCLASS" ) ),
+  option( TAXONOMIC_RANK.infraclass, t( "Ranks-INFRACLASS" ) ),
+  option( TAXONOMIC_RANK.subterclass, t( "Ranks-SUBTERCLASS" ) ),
+  option( TAXONOMIC_RANK.superorder, t( "Ranks-SUPERORDER" ) ),
+  option( TAXONOMIC_RANK.order, t( "Ranks-ORDER" ) ),
+  option( TAXONOMIC_RANK.suborder, t( "Ranks-SUBORDER" ) ),
+  option( TAXONOMIC_RANK.infraorder, t( "Ranks-INFRAORDER" ) ),
+  option( TAXONOMIC_RANK.parvorder, t( "Ranks-PARVORDER" ) ),
+  option( TAXONOMIC_RANK.zoosection, t( "Ranks-ZOOSECTION" ) ),
+  option( TAXONOMIC_RANK.zoosubsection, t( "Ranks-ZOOSUBSECTION" ) ),
+  option( TAXONOMIC_RANK.superfamily, t( "Ranks-SUPERFAMILY" ) ),
+  option( TAXONOMIC_RANK.epifamily, t( "Ranks-EPIFAMILY" ) ),
+  option( TAXONOMIC_RANK.family, t( "Ranks-FAMILY" ) ),
+  option( TAXONOMIC_RANK.subfamily, t( "Ranks-SUBFAMILY" ) ),
+  option( TAXONOMIC_RANK.supertribe, t( "Ranks-SUPERTRIBE" ) ),
+  option( TAXONOMIC_RANK.tribe, t( "Ranks-TRIBE" ) ),
+  option( TAXONOMIC_RANK.subtribe, t( "Ranks-SUBTRIBE" ) ),
+  option( TAXONOMIC_RANK.genus, t( "Ranks-GENUS" ) ),
+  option( TAXONOMIC_RANK.genushybrid, t( "Ranks-GENUSHYBRID" ) ),
+  option( TAXONOMIC_RANK.subgenus, t( "Ranks-SUBGENUS" ) ),
+  option( TAXONOMIC_RANK.section, t( "Ranks-SECTION" ) ),
+  option( TAXONOMIC_RANK.subsection, t( "Ranks-SUBSECTION" ) ),
+  option( TAXONOMIC_RANK.complex, t( "Ranks-COMPLEX" ) ),
+  option( TAXONOMIC_RANK.species, t( "Ranks-SPECIES" ) ),
+  option( TAXONOMIC_RANK.hybrid, t( "Ranks-HYBRID" ) ),
+  option( TAXONOMIC_RANK.subspecies, t( "Ranks-SUBSPECIES" ) ),
+  option( TAXONOMIC_RANK.variety, t( "Ranks-VARIETY" ) ),
+  option( TAXONOMIC_RANK.form, t( "Ranks-FORM" ) ),
+  option( TAXONOMIC_RANK.infrahybrid, t( "Ranks-INFRAHYBRID" ) ),
+] );
+
+export const getDateObservedValues = ( t: TFunction ) => ( {
+  [DATE_OBSERVED.ALL]: {
+    label: t( "All" ),
+    labelCaps: t( "ALL" ),
+    value: DATE_OBSERVED.ALL,
+  },
+  [DATE_OBSERVED.EXACT_DATE]: {
+    label: t( "Exact-Date" ),
+    labelCaps: t( "EXACT-DATE" ),
+    text: t( "Filter-by-observed-on-date" ),
+    value: DATE_OBSERVED.EXACT_DATE,
+  },
+  [DATE_OBSERVED.DATE_RANGE]: {
+    label: t( "Date-Range" ),
+    labelCaps: t( "DATE-RANGE" ),
+    text: t( "Filter-by-observed-between-dates" ),
+    value: DATE_OBSERVED.DATE_RANGE,
+  },
+  [DATE_OBSERVED.MONTHS]: {
+    label: t( "Months" ),
+    labelCaps: t( "MONTHS" ),
+    text: t( "Filter-by-observed-during-months" ),
+    value: DATE_OBSERVED.MONTHS,
+  },
+} );
+
+export const getDateUploadedValues = ( t: TFunction ) => ( {
+  [DATE_UPLOADED.ALL]: {
+    label: t( "All" ),
+    labelCaps: t( "ALL" ),
+    value: DATE_UPLOADED.ALL,
+  },
+  [DATE_UPLOADED.EXACT_DATE]: {
+    label: t( "Exact-Date" ),
+    labelCaps: t( "EXACT-DATE" ),
+    text: t( "Filter-by-uploaded-on-date" ),
+    value: DATE_UPLOADED.EXACT_DATE,
+  },
+  [DATE_UPLOADED.DATE_RANGE]: {
+    label: t( "Date-Range" ),
+    labelCaps: t( "DATE-RANGE" ),
+    text: t( "Filter-by-uploaded-between-dates" ),
+    value: DATE_UPLOADED.DATE_RANGE,
+  },
+} );
+
+export const getMonthValues = ( t: TFunction ) => Object.fromEntries( [
+  option( 1, t( "January" ) ),
+  option( 2, t( "February" ) ),
+  option( 3, t( "March" ) ),
+  option( 4, t( "April" ) ),
+  option( 5, t( "May" ) ),
+  option( 6, t( "June" ) ),
+  option( 7, t( "July" ) ),
+  option( 8, t( "August" ) ),
+  option( 9, t( "September" ) ),
+  option( 10, t( "October" ) ),
+  option( 11, t( "November" ) ),
+  option( 12, t( "December" ) ),
+] );
+
+export const getMediaValues = ( t: TFunction ) => Object.fromEntries( [
+  option( MEDIA.ALL, t( "All" ) ),
+  option( MEDIA.PHOTOS, t( "Photos" ) ),
+  option( MEDIA.SOUNDS, t( "Sounds" ) ),
+  option( MEDIA.NONE, t( "No-Media" ) ),
+] );
+
+export const getEstablishmentValues = ( t: TFunction ) => Object.fromEntries( [
+  option( ESTABLISHMENT_MEAN.ANY, t( "Any--establishment-means" ) ),
+  option( ESTABLISHMENT_MEAN.INTRODUCED, t( "Introduced" ) ),
+  option( ESTABLISHMENT_MEAN.NATIVE, t( "Native" ) ),
+  option( ESTABLISHMENT_MEAN.ENDEMIC, t( "Endemic" ) ),
+] );
+
+export const getWildValues = ( t: TFunction ) => Object.fromEntries( [
+  option( WILD_STATUS.ALL, t( "All" ) ),
+  option( WILD_STATUS.WILD, t( "Wild" ) ),
+  option( WILD_STATUS.CAPTIVE, t( "Captive-Cultivated" ) ),
+] );
+
+export const getReviewedValues = ( t: TFunction ) => Object.fromEntries( [
+  option( REVIEWED.ALL, t( "All-observations" ) ),
+  option( REVIEWED.REVIEWED, t( "Reviewed-observations-only" ) ),
+  option( REVIEWED.UNREVIEWED, t( "Unreviewed-observations-only" ) ),
+] );
+
+export const getPhotoLicenseValues = ( t: TFunction ) => Object.fromEntries( [
+  option( PHOTO_LICENSE.ALL, t( "ALL" ) ),
+  option( PHOTO_LICENSE.CC0, t( "CC0" ) ),
+  option( PHOTO_LICENSE.CCBY, t( "CC-BY" ) ),
+  option( PHOTO_LICENSE.CCBYNC, t( "CC-BY-NC" ) ),
+  option( PHOTO_LICENSE.CCBYSA, t( "CC-BY-SA" ) ),
+  option( PHOTO_LICENSE.CCBYND, t( "CC-BY-ND" ) ),
+  option( PHOTO_LICENSE.CCBYNCSA, t( "CC-BY-NC-SA" ) ),
+  option( PHOTO_LICENSE.CCBYNCND, t( "CC-BY-NC-ND" ) ),
+] );
diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
new file mode 100644
index 0000000000..9dcc5f1d1f
--- /dev/null
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -0,0 +1,221 @@
+import type { ApiProjectSummary, ApiUser } from "api/types";
+import type {
+  ESTABLISHMENT_MEAN,
+  MEDIA,
+  PHOTO_LICENSE,
+  REVIEWED,
+} from "providers/ExploreContext";
+import {
+  DATE_OBSERVED,
+  DATE_UPLOADED,
+  TAXONOMIC_RANK,
+  WILD_STATUS,
+} from "providers/ExploreContext";
+import type {
+  ExploreV2Filters,
+  ExploreV2LocationState,
+  ExploreV2State,
+  ExploreV2Subject,
+} from "providers/ExploreV2Context";
+import {
+  defaultExploreV2Filters,
+  EXPLORE_V2_PLACE_MODE,
+} from "providers/ExploreV2Context";
+import { OBSERVATIONS_SORT } from "sharedHelpers/observationsSort";
+
+// The draft is a subset of ExploreV2State
+export interface AdvancedSearchDraft {
+  subject: ExploreV2Subject | null;
+  location: ExploreV2LocationState;
+  sortBy: OBSERVATIONS_SORT;
+  filters: ExploreV2Filters;
+}
+
+export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => ( {
+  // Only a taxon subject is editable here (the taxon section); user/project are
+  // edited as filters
+  subject: v2.subject?.type === "taxon"
+    ? v2.subject
+    : null,
+  location: v2.location,
+  sortBy: v2.sortBy,
+  filters: v2.filters,
+} );
+
+export type SubjectTaxon = Extract<ExploreV2Subject, { type: "taxon" }>["taxon"];
+
+export type AdvancedSearchAction =
+  | { type: "SET_TAXON"; taxon: SubjectTaxon | null }
+  | { type: "FILTER_BY_ICONIC_UNKNOWN" }
+  | { type: "SET_LOCATION_PLACE"; place: { id: number; display_name?: string } }
+  | { type: "SET_LOCATION_NEARBY" }
+  | { type: "SET_LOCATION_WORLDWIDE" }
+  | { type: "SET_SORT"; sortBy: OBSERVATIONS_SORT }
+  | { type: "SET_USER"; user: ApiUser | null }
+  | { type: "SET_EXCLUDE_USER"; user: ApiUser | null }
+  | { type: "SET_PROJECT"; project: ApiProjectSummary | null }
+  | { type: "TOGGLE_RESEARCH_GRADE" }
+  | { type: "TOGGLE_NEEDS_ID" }
+  | { type: "TOGGLE_CASUAL" }
+  | { type: "SET_HRANK"; hrank: TAXONOMIC_RANK }
+  | { type: "SET_LRANK"; lrank: TAXONOMIC_RANK }
+  | { type: "SET_DATE_OBSERVED_ALL" }
+  | { type: "SET_DATE_OBSERVED_EXACT"; observedOn: string }
+  | { type: "SET_DATE_OBSERVED_RANGE"; d1: string; d2: string }
+  | { type: "SET_DATE_OBSERVED_MONTHS"; months: number[] }
+  | { type: "SET_DATE_UPLOADED_ALL" }
+  | { type: "SET_DATE_UPLOADED_EXACT"; createdOn: string }
+  | { type: "SET_DATE_UPLOADED_RANGE"; createdD1: string; createdD2: string }
+  | { type: "SET_MEDIA"; media: MEDIA }
+  | { type: "SET_ESTABLISHMENT_MEAN"; establishmentMean: ESTABLISHMENT_MEAN }
+  | { type: "SET_WILD_STATUS"; wildStatus: WILD_STATUS }
+  | { type: "SET_REVIEWED"; reviewedFilter: REVIEWED }
+  | { type: "SET_PHOTO_LICENSE"; photoLicense: PHOTO_LICENSE }
+  | { type: "RESET" };
+
+const withFilters = (
+  draft: AdvancedSearchDraft,
+  patch: Partial<ExploreV2Filters>,
+): AdvancedSearchDraft => ( {
+  ...draft,
+  filters: { ...draft.filters, ...patch },
+} );
+
+export const advancedSearchReducer = (
+  draft: AdvancedSearchDraft,
+  action: AdvancedSearchAction,
+): AdvancedSearchDraft => {
+  switch ( action.type ) {
+    case "SET_TAXON":
+      // Selecting a taxon supersedes the "unknown" iconic-taxon filter.
+      return {
+        ...draft,
+        subject: action.taxon
+          ? { type: "taxon", taxon: action.taxon }
+          : null,
+        filters: { ...draft.filters, iconic_taxa: null },
+      };
+    case "FILTER_BY_ICONIC_UNKNOWN":
+      // "unknown" is not a taxon; it clears the taxon subject and filters for
+      // observations not associated with any iconic taxon.
+      return {
+        ...draft,
+        subject: null,
+        filters: { ...draft.filters, iconic_taxa: ["unknown"] },
+      };
+    case "SET_LOCATION_PLACE":
+      return {
+        ...draft,
+        location: { placeMode: EXPLORE_V2_PLACE_MODE.PLACE, place: action.place },
+      };
+    case "SET_LOCATION_NEARBY":
+      return {
+        ...draft,
+        location: { placeMode: EXPLORE_V2_PLACE_MODE.NEARBY },
+      };
+    case "SET_LOCATION_WORLDWIDE":
+      return {
+        ...draft,
+        location: { placeMode: EXPLORE_V2_PLACE_MODE.WORLDWIDE },
+      };
+    case "SET_SORT":
+      return { ...draft, sortBy: action.sortBy };
+    case "SET_USER":
+      return withFilters( draft, { user: action.user, excludeUser: null } );
+    case "SET_EXCLUDE_USER":
+      return withFilters( draft, { excludeUser: action.user, user: null } );
+    case "SET_PROJECT":
+      return withFilters( draft, { project: action.project } );
+    case "TOGGLE_RESEARCH_GRADE":
+      return withFilters( draft, { researchGrade: !draft.filters.researchGrade } );
+    case "TOGGLE_NEEDS_ID":
+      return withFilters( draft, { needsID: !draft.filters.needsID } );
+    case "TOGGLE_CASUAL":
+      return withFilters( draft, { casual: !draft.filters.casual } );
+    case "SET_HRANK":
+      return withFilters( draft, {
+        hrank: action.hrank === TAXONOMIC_RANK.none
+          ? null
+          : action.hrank,
+      } );
+    case "SET_LRANK":
+      return withFilters( draft, {
+        lrank: action.lrank === TAXONOMIC_RANK.none
+          ? null
+          : action.lrank,
+      } );
+    case "SET_DATE_OBSERVED_ALL":
+      return withFilters( draft, {
+        dateObserved: DATE_OBSERVED.ALL, observed_on: null, d1: null, d2: null, months: null,
+      } );
+    case "SET_DATE_OBSERVED_EXACT":
+      return withFilters( draft, {
+        dateObserved: DATE_OBSERVED.EXACT_DATE,
+        observed_on: action.observedOn,
+        d1: null,
+        d2: null,
+        months: null,
+      } );
+    case "SET_DATE_OBSERVED_RANGE":
+      return withFilters( draft, {
+        dateObserved: DATE_OBSERVED.DATE_RANGE,
+        observed_on: null,
+        d1: action.d1,
+        d2: action.d2,
+        months: null,
+      } );
+    case "SET_DATE_OBSERVED_MONTHS":
+      return withFilters( draft, {
+        dateObserved: DATE_OBSERVED.MONTHS,
+        observed_on: null,
+        d1: null,
+        d2: null,
+        months: action.months,
+      } );
+    case "SET_DATE_UPLOADED_ALL":
+      return withFilters( draft, {
+        dateUploaded: DATE_UPLOADED.ALL, created_on: null, created_d1: null, created_d2: null,
+      } );
+    case "SET_DATE_UPLOADED_EXACT":
+      return withFilters( draft, {
+        dateUploaded: DATE_UPLOADED.EXACT_DATE,
+        created_on: action.createdOn,
+        created_d1: null,
+        created_d2: null,
+      } );
+    case "SET_DATE_UPLOADED_RANGE":
+      return withFilters( draft, {
+        dateUploaded: DATE_UPLOADED.DATE_RANGE,
+        created_on: null,
+        created_d1: action.createdD1,
+        created_d2: action.createdD2,
+      } );
+    case "SET_MEDIA":
+      return withFilters( draft, { media: action.media } );
+    case "SET_ESTABLISHMENT_MEAN":
+      return withFilters( draft, { establishmentMean: action.establishmentMean } );
+    case "SET_WILD_STATUS":
+      return withFilters( draft, {
+        wildStatus: action.wildStatus,
+        casual: action.wildStatus === WILD_STATUS.CAPTIVE
+          ? true
+          : draft.filters.casual,
+      } );
+    case "SET_REVIEWED":
+      return withFilters( draft, { reviewedFilter: action.reviewedFilter } );
+    case "SET_PHOTO_LICENSE":
+      return withFilters( draft, { photoLicense: action.photoLicense } );
+    case "RESET":
+      return {
+        subject: null,
+        location: { placeMode: EXPLORE_V2_PLACE_MODE.WORLDWIDE },
+        sortBy: OBSERVATIONS_SORT.DATE_UPLOADED_NEWEST,
+        filters: defaultExploreV2Filters,
+      };
+    default: {
+      // https://www.typescriptlang.org/docs/handbook/2/narrowing.html#exhaustiveness-checking
+      const _exhaustive: never = action;
+      return _exhaustive;
+    }
+  }
+};
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 31cb9e3b95..469cd32c83 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -1,17 +1,752 @@
-import { Body2, ViewWrapper } from "components/SharedComponents";
-import { View } from "components/styledComponents";
-import React from "react";
-import { useTranslation } from "sharedHooks";
+import { useNavigation } from "@react-navigation/native";
+import type { ApiPlace, ApiProjectSummary } from "api/types";
+import { OBSERVATIONS_TAB } from "appConstants/tabs";
+import DateFilterSection
+  from "components/Explore/ExploreV2/components/DateFilterSection";
+import RadioGroupSection
+  from "components/Explore/ExploreV2/components/RadioGroupSection";
+import SelectedFilterRow
+  from "components/Explore/ExploreV2/components/SelectedFilterRow";
+import {
+  getDateObservedValues,
+  getDateUploadedValues,
+  getEstablishmentValues,
+  getMediaValues,
+  getMonthValues,
+  getPhotoLicenseValues,
+  getReviewedValues,
+  getSortByValues,
+  getTaxonomicRankValues,
+  getWildValues,
+} from "components/Explore/ExploreV2/helpers/advancedSearchOptions";
+import type { SubjectTaxon }
+  from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
+import { advancedSearchReducer, draftFromV2State }
+  from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
+import ExploreLocationSearchModal from "components/Explore/Modals/ExploreLocationSearchModal";
+import ExploreProjectSearchModal from "components/Explore/Modals/ExploreProjectSearchModal";
+import ExploreTaxonSearchModal from "components/Explore/Modals/ExploreTaxonSearchModal";
+import ExploreUserSearchModal from "components/Explore/Modals/ExploreUserSearchModal";
+import type { ExploreSearchUser }
+  from "components/Explore/SearchScreens/ExploreUserSearch";
+import ProjectListItem from "components/ProjectList/ProjectListItem";
+import {
+  Body2,
+  Body3,
+  Button,
+  ButtonBar,
+  Checkbox,
+  DisplayTaxon,
+  Heading4,
+  IconicTaxonChooser,
+  INatIcon,
+  PickerSheet,
+  RadioButtonSheet,
+} from "components/SharedComponents";
+import SearchHeader from "components/SharedComponents/SearchHeader";
+import { TopAndBottomInsetViewWrapper } from "components/SharedComponents/ViewWrapper";
+import { ScrollView, View } from "components/styledComponents";
+import UserListItem from "components/UserList/UserListItem";
+import type { ExploreStackScreenProps } from "navigation/types";
+import { RealmContext } from "providers/contexts";
+import {
+  DATE_OBSERVED,
+  DATE_UPLOADED,
+} from "providers/ExploreContext";
+import type { ExploreV2Subject } from "providers/ExploreV2Context";
+import {
+  EXPLORE_V2_ACTION,
+  EXPLORE_V2_PLACE_MODE,
+  useExploreV2,
+} from "providers/ExploreV2Context";
+import React, { useReducer, useState } from "react";
+import Taxon from "realmModels/Taxon";
+import { formatObsFieldDate } from "sharedHelpers/dateAndTime";
+import { useCurrentUser, useTranslation } from "sharedHooks";
+
+const { useRealm } = RealmContext;
+
+type SheetName = "sortBy" | "hrank" | "lrank" | "photoLicense";
+
+type PickerKind = "taxon" | "user" | "project" | "location";
 
 const AdvancedSearch = ( ) => {
-  const { t } = useTranslation( );
+  const navigation
+    = useNavigation<ExploreStackScreenProps<"AdvancedSearch">["navigation"]>();
+  const { t } = useTranslation();
+  const realm = useRealm();
+  const currentUser = useCurrentUser();
+
+  const { state: v2State, dispatch: dispatchV2 } = useExploreV2();
+  const [draft, dispatch] = useReducer(
+    advancedSearchReducer,
+    v2State,
+    draftFromV2State,
+  );
+  const {
+    subject, location, sortBy, filters,
+  } = draft;
+
+  // Which in-screen search picker (taxon/user/project/location) is open.
+  const [openPicker, setOpenPicker] = useState<PickerKind | null>( null );
+  const [openSheet, setOpenSheet] = useState<SheetName | null>( null );
+  const closeSheet = ( ) => setOpenSheet( null );
+
+  const updateTaxon = ( taxon: SubjectTaxon | null ) => dispatch( {
+    type: "SET_TAXON",
+    taxon,
+  } );
+
+  const filterByIconicTaxonUnknown = () => dispatch( {
+    type: "FILTER_BY_ICONIC_UNKNOWN",
+  } );
+
+  const updateUser = ( selectedUser: ExploreSearchUser | null, exclude?: boolean ) => dispatch(
+    exclude
+      ? { type: "SET_EXCLUDE_USER", user: selectedUser }
+      : { type: "SET_USER", user: selectedUser },
+  );
+
+  const updateProject = ( selectedProject: ApiProjectSummary | null ) => dispatch( {
+    type: "SET_PROJECT",
+    project: selectedProject,
+  } );
+
+  const updateLocation = ( newLocation: "worldwide" | ApiPlace ) => {
+    if ( newLocation === "worldwide" ) {
+      dispatch( { type: "SET_LOCATION_WORLDWIDE" } );
+      return;
+    }
+    if ( !newLocation.id ) { return; }
+    dispatch( {
+      type: "SET_LOCATION_PLACE",
+      place: { id: newLocation.id, display_name: newLocation.display_name },
+    } );
+  };
+
+  const closePicker = ( ) => setOpenPicker( null );
+
+  const handleSearch = () => {
+    // "Unknown" is the one iconic-taxon choice ExploreV2 also models as a
+    // subject, and only the subject path adds `identified: false` to the query.
+    // Commit it as a subject so the results match the same choice made in
+    // universal search, and so the results header names it.
+    const subjectToCommit: ExploreV2Subject | null = subject
+      ?? ( ( filters.iconic_taxa || [] ).includes( "unknown" )
+        ? { type: "unknown" }
+        : null );
+    dispatchV2(
+      subjectToCommit
+        ? { type: EXPLORE_V2_ACTION.SET_SUBJECT, subject: subjectToCommit }
+        : { type: EXPLORE_V2_ACTION.CLEAR_SUBJECT },
+    );
+    switch ( location.placeMode ) {
+      case EXPLORE_V2_PLACE_MODE.PLACE:
+        dispatchV2( { type: EXPLORE_V2_ACTION.SET_LOCATION_PLACE, place: location.place } );
+        break;
+      case EXPLORE_V2_PLACE_MODE.WORLDWIDE:
+        dispatchV2( { type: EXPLORE_V2_ACTION.SET_LOCATION_WORLDWIDE } );
+        break;
+      case EXPLORE_V2_PLACE_MODE.NEARBY:
+      default:
+        dispatchV2( { type: EXPLORE_V2_ACTION.SET_LOCATION_NEARBY } );
+        break;
+    }
+    dispatchV2( { type: EXPLORE_V2_ACTION.SET_SORT, sortBy } );
+    dispatchV2( { type: EXPLORE_V2_ACTION.SET_FILTERS, filters } );
+    dispatchV2( { type: EXPLORE_V2_ACTION.SET_ACTIVE_TAB, tab: OBSERVATIONS_TAB } );
+    navigation.popTo( "ExploreResults" );
+  };
+
+  const {
+    casual,
+    created_d1: createdD1,
+    created_d2: createdD2,
+    created_on: createdOn,
+    d1,
+    d2,
+    dateObserved,
+    dateUploaded,
+    establishmentMean,
+    excludeUser,
+    hrank,
+    iconic_taxa: iconicTaxonNames,
+    lrank,
+    media,
+    months,
+    needsID,
+    observed_on: observedOn,
+    photoLicense,
+    project,
+    researchGrade,
+    reviewedFilter,
+    user,
+    wildStatus,
+  } = filters;
+
+  const taxon = subject?.type === "taxon"
+    ? subject.taxon
+    : null;
+
+  const displayUser = user || excludeUser;
+
+  const locationText = () => {
+    switch ( location.placeMode ) {
+      case EXPLORE_V2_PLACE_MODE.WORLDWIDE:
+        return t( "Worldwide" );
+      case EXPLORE_V2_PLACE_MODE.PLACE:
+        return location.place.display_name ?? "";
+      case EXPLORE_V2_PLACE_MODE.NEARBY:
+      default:
+        return t( "Nearby" );
+    }
+  };
+
+  const sortByValues = getSortByValues( t );
+  const taxonomicRankValues = getTaxonomicRankValues( t );
+  const dateObservedValues = getDateObservedValues( t );
+  const dateUploadedValues = getDateUploadedValues( t );
+  const monthValues = getMonthValues( t );
+  const photoLicenseValues = getPhotoLicenseValues( t );
+
+  const updateDateObserved = ( {
+    newDateObserved, newObservedOn, newD1, newD2, newMonths,
+  } ) => {
+    const today = formatObsFieldDate( new Date( ) );
+    const allMonths = new Array( 12 ).fill( 0 ).map( ( _, i ) => i + 1 );
+
+    if ( newDateObserved === DATE_OBSERVED.ALL ) {
+      dispatch( {
+        type: "SET_DATE_OBSERVED_ALL",
+      } );
+    } else if ( newDateObserved === DATE_OBSERVED.EXACT_DATE ) {
+      dispatch( {
+        type: "SET_DATE_OBSERVED_EXACT",
+        observedOn: newObservedOn || today,
+      } );
+    } else if ( newDateObserved === DATE_OBSERVED.DATE_RANGE ) {
+      dispatch( {
+        type: "SET_DATE_OBSERVED_RANGE",
+        d1: newD1 || today,
+        d2: newD2 || today,
+      } );
+    } else if ( newDateObserved === DATE_OBSERVED.MONTHS ) {
+      dispatch( {
+        type: "SET_DATE_OBSERVED_MONTHS",
+        months: newMonths || allMonths,
+      } );
+    }
+  };
+
+  const updateObservedMonths = monthInteger => {
+    const currentMonths = months || [];
+    const newMonths = currentMonths.includes( monthInteger )
+      ? currentMonths.filter( m => m !== monthInteger )
+      : [...currentMonths, monthInteger];
+    updateDateObserved( {
+      newDateObserved: DATE_OBSERVED.MONTHS,
+      newMonths,
+    } );
+  };
+
+  const updateDateUploaded = ( { newDateUploaded, newD1, newD2 } ) => {
+    const today = formatObsFieldDate( new Date( ) );
+    if ( newDateUploaded === DATE_UPLOADED.ALL ) {
+      dispatch( {
+        type: "SET_DATE_UPLOADED_ALL",
+      } );
+    } else if ( newDateUploaded === DATE_UPLOADED.EXACT_DATE ) {
+      dispatch( {
+        type: "SET_DATE_UPLOADED_EXACT",
+        createdOn: newD1 || today,
+      } );
+    } else if ( newDateUploaded === DATE_UPLOADED.DATE_RANGE ) {
+      dispatch( {
+        type: "SET_DATE_UPLOADED_RANGE",
+        createdD1: newD1 || today,
+        createdD2: newD2 || today,
+      } );
+    }
+  };
+
+  const observedEndBeforeStart = d1 > d2;
+  const uploadedEndBeforeStart = createdD1 > createdD2;
+  // MONTHS mode with nothing checked emits no `month` param, which would
+  // silently run an unfiltered search; block Search until a month is selected.
+  const noMonthsSelected = dateObserved === DATE_OBSERVED.MONTHS
+    && ( months || [] ).length === 0;
+  const hasError = observedEndBeforeStart || uploadedEndBeforeStart || noMonthsSelected;
 
   return (
-    <ViewWrapper testID="AdvancedSearch">
-      <View className="flex-1 items-center justify-center p-4">
-        <Body2>{t( "ADVANCED-SEARCH" )}</Body2>
-      </View>
-    </ViewWrapper>
+    <TopAndBottomInsetViewWrapper testID="AdvancedSearch">
+      <SearchHeader
+        headerText={t( "ADVANCED-SEARCH" )}
+        onClose={() => navigation.goBack()}
+        onReset={() => dispatch( { type: "RESET" } )}
+        testID="AdvancedSearch.back"
+      />
+
+      <ScrollView className="py-4">
+        {/* Taxon Section */}
+        <View className="mb-7">
+          <Heading4 className="px-4 mb-5">{t( "TAXON" )}</Heading4>
+          <View className="px-4 mb-5">
+            {( taxon || ( iconicTaxonNames || [] ).indexOf( "unknown" ) >= 0 )
+              ? (
+                <SelectedFilterRow
+                  accessibilityLabel={t( "Change-taxon" )}
+                  onEdit={() => setOpenPicker( "taxon" )}
+                  onRemove={() => updateTaxon( null )}
+                  removeAccessibilityLabel={t( "Remove-taxon-filter" )}
+                >
+                  <DisplayTaxon
+                    handlePress={() => setOpenPicker( "taxon" )}
+                    taxon={taxon || "unknown"}
+                  />
+                </SelectedFilterRow>
+              )
+              : (
+                <Button
+                  text={t( "SEARCH-FOR-A-TAXON" )}
+                  onPress={() => {
+                    setOpenPicker( "taxon" );
+                  }}
+                  accessibilityLabel={t( "Search" )}
+                />
+              )}
+          </View>
+          <IconicTaxonChooser
+            before
+            chosen={iconicTaxonNames || ( taxon?.name
+              ? [taxon.name.toLowerCase()]
+              : [] )}
+            onTaxonChosen={( taxonName: string ) => {
+              if ( taxonName === "unknown" ) {
+                if ( ( iconicTaxonNames || [] ).indexOf( taxonName ) >= 0 ) {
+                  updateTaxon( null );
+                } else {
+                  filterByIconicTaxonUnknown();
+                }
+              } else if ( taxon?.name?.toLowerCase() === taxonName ) {
+                updateTaxon( null );
+              } else {
+                const selectedTaxon = realm
+                  ?.objects( "Taxon" )
+                  .filtered( "name ==[c] $0", taxonName );
+                const iconicTaxon = selectedTaxon && selectedTaxon.length > 0
+                  ? Taxon.mapRealmToPojo( selectedTaxon[0] )
+                  : null;
+                updateTaxon( iconicTaxon );
+              }
+            }}
+          />
+        </View>
+        <View className="px-4 pb-4">
+          {/* Location Section */}
+          <View className="mb-7">
+            <Heading4 className="mb-5">{t( "LOCATION" )}</Heading4>
+            <View className="mb-5">
+              <View>
+                <View className="flex-row items-center mb-5">
+                  <INatIcon name="location" size={15} />
+                  <Body3 className="ml-4">{locationText()}</Body3>
+                </View>
+                <Button
+                  text={t( "EDIT-LOCATION" )}
+                  onPress={() => {
+                    setOpenPicker( "location" );
+                  }}
+                  accessibilityLabel={t( "Edit" )}
+                />
+              </View>
+            </View>
+          </View>
+
+          {/* Sort-By Section */}
+          <View className="mb-7">
+            <Heading4 className="mb-5">{t( "SORT-BY" )}</Heading4>
+            <View className="mb-5">
+              <Button
+                text={sortByValues[sortBy]?.labelCaps}
+                className="shrink"
+                dropdown
+                onPress={() => {
+                  setOpenSheet( "sortBy" );
+                }}
+                accessibilityLabel={t( "Sort-by" )}
+              />
+            </View>
+          </View>
+
+          {/* Quality Grade Section */}
+          <View className="mb-7">
+            <Heading4 className="mb-5">{t( "QUALITY-GRADE" )}</Heading4>
+            <View className="mb-5">
+              <Checkbox
+                text={t( "Research-Grade--quality-grade" )}
+                isChecked={researchGrade}
+                onPress={() => dispatch( { type: "TOGGLE_RESEARCH_GRADE" } )}
+              />
+              <View className="mb-4" />
+              <Checkbox
+                text={t( "Needs-ID--quality-grade" )}
+                isChecked={needsID}
+                onPress={() => dispatch( { type: "TOGGLE_NEEDS_ID" } )}
+              />
+              <View className="mb-4" />
+              <Checkbox
+                text={t( "Casual--quality-grade" )}
+                isChecked={casual}
+                onPress={() => dispatch( { type: "TOGGLE_CASUAL" } )}
+              />
+            </View>
+          </View>
+
+          {/* User Section */}
+          <View className="mb-7">
+            <Heading4 className="mb-5">
+              {excludeUser
+                ? t( "ALL-USERS-EXCEPT" )
+                : t( "USER" )}
+            </Heading4>
+            <View className="mb-5">
+              {displayUser
+                ? (
+                  <SelectedFilterRow
+                    accessibilityLabel={t( "Change-user" )}
+                    justify="justify-around"
+                    onEdit={() => setOpenPicker( "user" )}
+                    onRemove={() => updateUser( null )}
+                    removeAccessibilityLabel={t( "Remove-user-filter" )}
+                  >
+                    <UserListItem
+                      item={{ user: displayUser }}
+                      countText={t( "X-Observations", { count: displayUser.observations_count } )}
+                      pressable={false}
+                    />
+                  </SelectedFilterRow>
+                )
+                : (
+                  <Button
+                    text={t( "FILTER-BY-A-USER" )}
+                    onPress={() => {
+                      setOpenPicker( "user" );
+                    }}
+                    accessibilityLabel={t( "Filter" )}
+                  />
+                )}
+            </View>
+          </View>
+
+          {/* Project Section */}
+          <View className="mb-7">
+            <Heading4 className="mb-5">{t( "PROJECT" )}</Heading4>
+            <View className="mb-5">
+              {project
+                ? (
+                  <SelectedFilterRow
+                    accessibilityLabel={t( "Change-project" )}
+                    onEdit={() => setOpenPicker( "project" )}
+                    onRemove={() => updateProject( null )}
+                    removeAccessibilityLabel={t( "Remove-project-filter" )}
+                  >
+                    <ProjectListItem item={project} />
+                  </SelectedFilterRow>
+                )
+                : (
+                  <Button
+                    text={t( "FILTER-BY-A-PROJECT" )}
+                    onPress={() => {
+                      setOpenPicker( "project" );
+                    }}
+                    accessibilityLabel={t( "Filter" )}
+                  />
+                )}
+            </View>
+          </View>
+
+          {/* Taxonomic Ranks section */}
+          <View className="mb-7">
+            <Heading4 className="mb-5">{t( "TAXONOMIC-RANKS" )}</Heading4>
+            <Body2 className="ml-1 mb-3">{t( "Highest" )}</Body2>
+            <Button
+              text={hrank
+                ? taxonomicRankValues[hrank]?.label
+                : t( "ALL" )}
+              className="shrink mb-7"
+              dropdown
+              onPress={() => {
+                setOpenSheet( "hrank" );
+              }}
+              accessibilityLabel={t( "Highest" )}
+            />
+            <Body2 className="ml-1 mb-3">{t( "Lowest" )}</Body2>
+            <Button
+              text={lrank
+                ? taxonomicRankValues[lrank]?.label
+                : t( "ALL" )}
+              className="shrink mb-7"
+              dropdown
+              onPress={() => {
+                setOpenSheet( "lrank" );
+              }}
+              accessibilityLabel={t( "Lowest" )}
+            />
+          </View>
+
+          {/* Date observed section */}
+          <DateFilterSection
+            headerText={t( "DATE-OBSERVED" )}
+            accessibilityLabel={t( "Date-observed" )}
+            modeValues={dateObservedValues}
+            mode={dateObserved}
+            onChangeMode={newDateObserved => updateDateObserved( {
+              // Carry existing dates through the mode switch so flipping modes
+              // (e.g. Exact -> Range -> Exact) doesn't reset them to today.
+              newDateObserved,
+              newObservedOn: observedOn,
+              newD1: d1,
+              newD2: d2,
+              newMonths: months,
+            } )}
+            exactMode={DATE_OBSERVED.EXACT_DATE}
+            exactDate={observedOn}
+            onChangeExactDate={newObservedOn => updateDateObserved( {
+              newDateObserved: DATE_OBSERVED.EXACT_DATE,
+              newObservedOn,
+            } )}
+            rangeMode={DATE_OBSERVED.DATE_RANGE}
+            rangeStart={d1}
+            rangeEnd={d2}
+            rangeEndBeforeStart={observedEndBeforeStart}
+            onChangeRangeStart={newD1 => updateDateObserved( {
+              newDateObserved: DATE_OBSERVED.DATE_RANGE,
+              newD1,
+              newD2: d2,
+            } )}
+            onChangeRangeEnd={newD2 => updateDateObserved( {
+              newDateObserved: DATE_OBSERVED.DATE_RANGE,
+              newD1: d1,
+              newD2,
+            } )}
+          >
+            {dateObserved === DATE_OBSERVED.MONTHS
+            && Object.keys( monthValues ).map( monthKey => (
+              <View key={monthKey} className="flex-row items-center mb-5">
+                <Checkbox
+                  text={monthValues[monthKey].label}
+                  isChecked={( months || [] ).includes( monthValues[monthKey].value )}
+                  onPress={() => updateObservedMonths( monthValues[monthKey].value )}
+                />
+              </View>
+            ) )}
+          </DateFilterSection>
+
+          {/* Date uploaded section */}
+          <DateFilterSection
+            headerText={t( "DATE-UPLOADED" )}
+            accessibilityLabel={t( "Date-uploaded" )}
+            modeValues={dateUploadedValues}
+            mode={dateUploaded}
+            onChangeMode={newDateUploaded => updateDateUploaded( {
+              // Carry existing dates through the mode switch so flipping modes
+              // doesn't reset them to today
+              newDateUploaded,
+              newD1: newDateUploaded === DATE_UPLOADED.EXACT_DATE
+                ? createdOn
+                : createdD1,
+              newD2: createdD2,
+            } )}
+            exactMode={DATE_UPLOADED.EXACT_DATE}
+            exactDate={createdOn}
+            onChangeExactDate={newD1 => updateDateUploaded( {
+              newDateUploaded: DATE_UPLOADED.EXACT_DATE,
+              newD1,
+            } )}
+            rangeMode={DATE_UPLOADED.DATE_RANGE}
+            rangeStart={createdD1}
+            rangeEnd={createdD2}
+            rangeEndBeforeStart={uploadedEndBeforeStart}
+            onChangeRangeStart={newD1 => updateDateUploaded( {
+              newDateUploaded: DATE_UPLOADED.DATE_RANGE,
+              newD1,
+              newD2: createdD2,
+            } )}
+            onChangeRangeEnd={newD2 => updateDateUploaded( {
+              newDateUploaded: DATE_UPLOADED.DATE_RANGE,
+              newD1: createdD1,
+              newD2,
+            } )}
+          />
+
+          {/* Media section */}
+          <RadioGroupSection
+            headerText={t( "MEDIA" )}
+            values={getMediaValues( t )}
+            selectedValue={media}
+            onChange={newMedia => dispatch( { type: "SET_MEDIA", media: newMedia } )}
+          />
+
+          {/* Establishment Means section */}
+          <RadioGroupSection
+            headerText={t( "ESTABLISHMENT-MEANS" )}
+            values={getEstablishmentValues( t )}
+            selectedValue={establishmentMean}
+            onChange={newEstablishmentMean => dispatch( {
+              type: "SET_ESTABLISHMENT_MEAN",
+              establishmentMean: newEstablishmentMean,
+            } )}
+          />
+
+          {/* Wild Status section */}
+          <RadioGroupSection
+            headerText={t( "WILD-STATUS" )}
+            values={getWildValues( t )}
+            selectedValue={wildStatus}
+            onChange={newWildStatus => dispatch( {
+              type: "SET_WILD_STATUS",
+              wildStatus: newWildStatus,
+            } )}
+          />
+
+          {/* Reviewed section */}
+          {currentUser && (
+            <RadioGroupSection
+              headerText={t( "REVIEWED" )}
+              values={getReviewedValues( t )}
+              selectedValue={reviewedFilter}
+              onChange={newReviewedFilter => dispatch( {
+                type: "SET_REVIEWED",
+                reviewedFilter: newReviewedFilter,
+              } )}
+            />
+          )}
+
+          {/* Photo licensing section */}
+          <View>
+            <Heading4 className="mb-5">{t( "PHOTO-LICENSING" )}</Heading4>
+            <Button
+              text={photoLicenseValues[photoLicense]?.label}
+              className="shrink mb-7"
+              dropdown
+              onPress={() => {
+                setOpenSheet( "photoLicense" );
+              }}
+              accessibilityLabel={t( "View-photo-licensing-info" )}
+            />
+          </View>
+        </View>
+      </ScrollView>
+      <ButtonBar>
+        <Button
+          disabled={hasError}
+          level="focus"
+          text={t( "SEARCH" )}
+          onPress={handleSearch}
+          accessibilityLabel={t( "Search" )}
+          accessibilityState={{ disabled: hasError }}
+        />
+      </ButtonBar>
+
+      {/* BottomSheets */}
+      {openSheet === "sortBy" && (
+        <RadioButtonSheet
+          headerText={t( "SORT-BY" )}
+          confirm={newSortBy => {
+            dispatch( {
+              type: "SET_SORT",
+              sortBy: newSortBy,
+            } );
+            closeSheet();
+          }}
+          onPressClose={closeSheet}
+          radioValues={sortByValues}
+          selectedValue={sortBy}
+          insideModal
+        />
+      )}
+      {openSheet === "hrank" && (
+        <PickerSheet
+          headerText={t( "HIGHEST-RANK" )}
+          confirm={newRank => {
+            dispatch( {
+              type: "SET_HRANK",
+              hrank: newRank,
+            } );
+            closeSheet();
+          }}
+          onPressClose={closeSheet}
+          pickerValues={taxonomicRankValues}
+          selectedValue={hrank}
+          insideModal
+        />
+      )}
+      {openSheet === "lrank" && (
+        <PickerSheet
+          headerText={t( "LOWEST-RANK" )}
+          confirm={newRank => {
+            dispatch( {
+              type: "SET_LRANK",
+              lrank: newRank,
+            } );
+            closeSheet();
+          }}
+          onPressClose={closeSheet}
+          pickerValues={taxonomicRankValues}
+          selectedValue={lrank}
+          insideModal
+        />
+      )}
+      {openSheet === "photoLicense" && (
+        <RadioButtonSheet
+          headerText={t( "PHOTO-LICENSING" )}
+          confirm={newLicense => {
+            dispatch( {
+              type: "SET_PHOTO_LICENSE",
+              photoLicense: newLicense,
+            } );
+            closeSheet();
+          }}
+          onPressClose={closeSheet}
+          radioValues={photoLicenseValues}
+          selectedValue={photoLicense}
+          insideModal
+        />
+      )}
+      {openPicker === "taxon" && (
+        <ExploreTaxonSearchModal
+          showModal
+          closeModal={closePicker}
+          updateTaxon={realmTaxon => updateTaxon(
+            realmTaxon
+              ? Taxon.mapRealmToPojo( realmTaxon )
+              : null,
+          )}
+        />
+      )}
+      {openPicker === "user" && (
+        <ExploreUserSearchModal
+          showModal
+          closeModal={closePicker}
+          updateUser={updateUser}
+        />
+      )}
+      {openPicker === "project" && (
+        <ExploreProjectSearchModal
+          showModal
+          closeModal={closePicker}
+          updateProject={updateProject}
+        />
+      )}
+      {openPicker === "location" && (
+        <ExploreLocationSearchModal
+          showModal
+          closeModal={closePicker}
+          onSelectNearby={() => dispatch( { type: "SET_LOCATION_NEARBY" } )}
+          updateLocation={updateLocation}
+        />
+      )}
+    </TopAndBottomInsetViewWrapper>
   );
 };
 

From 09109e9271af6e458e81719a1524cb48d91f9e9a Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Wed, 12 Aug 2026 15:32:46 -0500
Subject: [PATCH 08/21] MOB-1346: search button is gray until changes are
 applied

---
 .../ExploreV2/screens/AdvancedSearch.tsx      | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 469cd32c83..616575d03a 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -47,6 +47,7 @@ import SearchHeader from "components/SharedComponents/SearchHeader";
 import { TopAndBottomInsetViewWrapper } from "components/SharedComponents/ViewWrapper";
 import { ScrollView, View } from "components/styledComponents";
 import UserListItem from "components/UserList/UserListItem";
+import isEqual from "lodash/isEqual";
 import type { ExploreStackScreenProps } from "navigation/types";
 import { RealmContext } from "providers/contexts";
 import {
@@ -59,7 +60,7 @@ import {
   EXPLORE_V2_PLACE_MODE,
   useExploreV2,
 } from "providers/ExploreV2Context";
-import React, { useReducer, useState } from "react";
+import React, { useMemo, useReducer, useState } from "react";
 import Taxon from "realmModels/Taxon";
 import { formatObsFieldDate } from "sharedHelpers/dateAndTime";
 import { useCurrentUser, useTranslation } from "sharedHooks";
@@ -78,15 +79,17 @@ const AdvancedSearch = ( ) => {
   const currentUser = useCurrentUser();
 
   const { state: v2State, dispatch: dispatchV2 } = useExploreV2();
-  const [draft, dispatch] = useReducer(
-    advancedSearchReducer,
-    v2State,
-    draftFromV2State,
-  );
+  const [initialDraft] = useState( ( ) => draftFromV2State( v2State ) );
+  const [draft, dispatch] = useReducer( advancedSearchReducer, initialDraft );
   const {
     subject, location, sortBy, filters,
   } = draft;
 
+  const differsFromInitial = useMemo(
+    ( ) => !isEqual( draft, initialDraft ),
+    [draft, initialDraft],
+  );
+
   // Which in-screen search picker (taxon/user/project/location) is open.
   const [openPicker, setOpenPicker] = useState<PickerKind | null>( null );
   const [openSheet, setOpenSheet] = useState<SheetName | null>( null );
@@ -640,11 +643,14 @@ const AdvancedSearch = ( ) => {
       <ButtonBar>
         <Button
           disabled={hasError}
-          level="focus"
+          level={differsFromInitial
+            ? "focus"
+            : "primary"}
           text={t( "SEARCH" )}
           onPress={handleSearch}
           accessibilityLabel={t( "Search" )}
           accessibilityState={{ disabled: hasError }}
+          testID="AdvancedSearch.searchButton"
         />
       </ButtonBar>
 

From 2b2adb7e572b6b72e5f60c49bd26cca123d79cb6 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Wed, 12 Aug 2026 15:48:46 -0500
Subject: [PATCH 09/21] MOB-1346: seed advanced search from plain context

---
 .../helpers/advancedSearchReducer.ts          | 49 ++++++++++++++-----
 .../ExploreV2/screens/AdvancedSearch.tsx      | 12 +++--
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
index 9dcc5f1d1f..1be9948ef7 100644
--- a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -31,16 +31,19 @@ export interface AdvancedSearchDraft {
   filters: ExploreV2Filters;
 }
 
-export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => ( {
-  // Only a taxon subject is editable here (the taxon section); user/project are
-  // edited as filters
-  subject: v2.subject?.type === "taxon"
-    ? v2.subject
-    : null,
-  location: v2.location,
-  sortBy: v2.sortBy,
-  filters: v2.filters,
-} );
+export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => {
+  const subjectIsUnknown = v2.subject?.type === "unknown";
+  return {
+    subject: subjectIsUnknown
+      ? null
+      : v2.subject,
+    location: v2.location,
+    sortBy: v2.sortBy,
+    filters: subjectIsUnknown
+      ? { ...v2.filters, iconic_taxa: ["unknown"] }
+      : v2.filters,
+  };
+};
 
 export type SubjectTaxon = Extract<ExploreV2Subject, { type: "taxon" }>["taxon"];
 
@@ -81,6 +84,17 @@ const withFilters = (
   filters: { ...draft.filters, ...patch },
 } );
 
+// Editing the user or project section supersedes a carried subject of that
+// kind, so the committed subject doesn't contradict the filter.
+const withoutSubjectOfType = (
+  draft: AdvancedSearchDraft,
+  type: ExploreV2Subject["type"],
+): ExploreV2Subject | null => (
+  draft.subject?.type === type
+    ? null
+    : draft.subject
+);
+
 export const advancedSearchReducer = (
   draft: AdvancedSearchDraft,
   action: AdvancedSearchAction,
@@ -121,11 +135,20 @@ export const advancedSearchReducer = (
     case "SET_SORT":
       return { ...draft, sortBy: action.sortBy };
     case "SET_USER":
-      return withFilters( draft, { user: action.user, excludeUser: null } );
+      return {
+        ...withFilters( draft, { user: action.user, excludeUser: null } ),
+        subject: withoutSubjectOfType( draft, "user" ),
+      };
     case "SET_EXCLUDE_USER":
-      return withFilters( draft, { excludeUser: action.user, user: null } );
+      return {
+        ...withFilters( draft, { excludeUser: action.user, user: null } ),
+        subject: withoutSubjectOfType( draft, "user" ),
+      };
     case "SET_PROJECT":
-      return withFilters( draft, { project: action.project } );
+      return {
+        ...withFilters( draft, { project: action.project } ),
+        subject: withoutSubjectOfType( draft, "project" ),
+      };
     case "TOGGLE_RESEARCH_GRADE":
       return withFilters( draft, { researchGrade: !draft.filters.researchGrade } );
     case "TOGGLE_NEEDS_ID":
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 616575d03a..dccd77e35f 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -1,5 +1,5 @@
 import { useNavigation } from "@react-navigation/native";
-import type { ApiPlace, ApiProjectSummary } from "api/types";
+import type { ApiPlace, ApiProjectSummary, ApiUser } from "api/types";
 import { OBSERVATIONS_TAB } from "appConstants/tabs";
 import DateFilterSection
   from "components/Explore/ExploreV2/components/DateFilterSection";
@@ -191,7 +191,13 @@ const AdvancedSearch = ( ) => {
     ? subject.taxon
     : null;
 
-  const displayUser = user || excludeUser;
+  const subjectUser: ApiUser | null = subject?.type === "user"
+    ? subject.user
+    : null;
+  const displayUser = user || excludeUser || subjectUser;
+  const displayUserCountText = displayUser?.observations_count === undefined
+    ? ""
+    : t( "X-Observations", { count: displayUser.observations_count } );
 
   const locationText = () => {
     switch ( location.placeMode ) {
@@ -424,7 +430,7 @@ const AdvancedSearch = ( ) => {
                   >
                     <UserListItem
                       item={{ user: displayUser }}
-                      countText={t( "X-Observations", { count: displayUser.observations_count } )}
+                      countText={displayUserCountText}
                       pressable={false}
                     />
                   </SelectedFilterRow>

From ddce5d79933e4336cc2c37e99153f2c1d16bfc67 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Wed, 12 Aug 2026 15:55:47 -0500
Subject: [PATCH 10/21] MOB-1346: support map area advanced search

---
 .../ExploreV2/screens/AdvancedSearch.tsx      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index dccd77e35f..965d2f08f7 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -150,10 +150,20 @@ const AdvancedSearch = ( ) => {
       case EXPLORE_V2_PLACE_MODE.WORLDWIDE:
         dispatchV2( { type: EXPLORE_V2_ACTION.SET_LOCATION_WORLDWIDE } );
         break;
+      case EXPLORE_V2_PLACE_MODE.MAP_AREA:
+        dispatchV2( {
+          type: EXPLORE_V2_ACTION.SET_LOCATION_MAP_AREA,
+          bounds: location.bounds,
+        } );
+        break;
       case EXPLORE_V2_PLACE_MODE.NEARBY:
-      default:
         dispatchV2( { type: EXPLORE_V2_ACTION.SET_LOCATION_NEARBY } );
         break;
+      default: {
+        // Exhaustiveness check: ts fails if a new placeMode is added without a case.
+        const _exhaustive: never = location;
+        break;
+      }
     }
     dispatchV2( { type: EXPLORE_V2_ACTION.SET_SORT, sortBy } );
     dispatchV2( { type: EXPLORE_V2_ACTION.SET_FILTERS, filters } );
@@ -205,9 +215,15 @@ const AdvancedSearch = ( ) => {
         return t( "Worldwide" );
       case EXPLORE_V2_PLACE_MODE.PLACE:
         return location.place.display_name ?? "";
+      case EXPLORE_V2_PLACE_MODE.MAP_AREA:
+        return t( "Map-Area" );
       case EXPLORE_V2_PLACE_MODE.NEARBY:
-      default:
         return t( "Nearby" );
+      default: {
+        // Exhaustiveness check: ts fails if a new placeMode is added without a case.
+        const _exhaustive: never = location;
+        return _exhaustive;
+      }
     }
   };
 

From efc3cca417b93f320a93d58967e28a93b21ceaec Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Thu, 13 Aug 2026 09:15:26 -0500
Subject: [PATCH 11/21] MOB-1346: support initial project and unobserved

---
 .../ExploreV2/helpers/advancedSearchReducer.ts        | 11 +++++++----
 .../ExploreV2/helpers/universalSearchSubject.ts       |  6 +-----
 .../Explore/ExploreV2/screens/AdvancedSearch.tsx      |  8 ++++++--
 src/providers/ExploreV2Context.tsx                    |  8 +-------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
index 1be9948ef7..7d129429ce 100644
--- a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -88,9 +88,9 @@ const withFilters = (
 // kind, so the committed subject doesn't contradict the filter.
 const withoutSubjectOfType = (
   draft: AdvancedSearchDraft,
-  type: ExploreV2Subject["type"],
+  ...types: ExploreV2Subject["type"][]
 ): ExploreV2Subject | null => (
-  draft.subject?.type === type
+  draft.subject && types.includes( draft.subject.type )
     ? null
     : draft.subject
 );
@@ -134,15 +134,18 @@ export const advancedSearchReducer = (
       };
     case "SET_SORT":
       return { ...draft, sortBy: action.sortBy };
+    // Within the scope of advanced search, we only set a taxon as the subject
+    // and all other subjects go in the filter blob
+    // and if a non-taxon subject came in initially, it has to be excluded via withoutSubjectOfType
     case "SET_USER":
       return {
         ...withFilters( draft, { user: action.user, excludeUser: null } ),
-        subject: withoutSubjectOfType( draft, "user" ),
+        subject: withoutSubjectOfType( draft, "user", "unobserved" ),
       };
     case "SET_EXCLUDE_USER":
       return {
         ...withFilters( draft, { excludeUser: action.user, user: null } ),
-        subject: withoutSubjectOfType( draft, "user" ),
+        subject: withoutSubjectOfType( draft, "user", "unobserved" ),
       };
     case "SET_PROJECT":
       return {
diff --git a/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts b/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts
index 72b8108168..4257c0ded7 100644
--- a/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts
+++ b/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts
@@ -26,11 +26,7 @@ export const resultToSubject = ( result: UniversalSearchResultItem ): ExploreV2S
     case "project":
       return {
         type: "project",
-        project: {
-          id: result.project.id,
-          title: result.project.title,
-          icon: result.project.icon,
-        },
+        project: result.project,
       };
     case "taxon":
       return {
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 965d2f08f7..274697cd8d 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -205,6 +205,10 @@ const AdvancedSearch = ( ) => {
     ? subject.user
     : null;
   const displayUser = user || excludeUser || subjectUser;
+  const subjectProject: ApiProjectSummary | null = subject?.type === "project"
+    ? subject.project
+    : null;
+  const displayProject = project || subjectProject;
   const displayUserCountText = displayUser?.observations_count === undefined
     ? ""
     : t( "X-Observations", { count: displayUser.observations_count } );
@@ -467,7 +471,7 @@ const AdvancedSearch = ( ) => {
           <View className="mb-7">
             <Heading4 className="mb-5">{t( "PROJECT" )}</Heading4>
             <View className="mb-5">
-              {project
+              {displayProject
                 ? (
                   <SelectedFilterRow
                     accessibilityLabel={t( "Change-project" )}
@@ -475,7 +479,7 @@ const AdvancedSearch = ( ) => {
                     onRemove={() => updateProject( null )}
                     removeAccessibilityLabel={t( "Remove-project-filter" )}
                   >
-                    <ProjectListItem item={project} />
+                    <ProjectListItem item={displayProject} />
                   </SelectedFilterRow>
                 )
                 : (
diff --git a/src/providers/ExploreV2Context.tsx b/src/providers/ExploreV2Context.tsx
index ad1914b7f9..9562b5cfe0 100644
--- a/src/providers/ExploreV2Context.tsx
+++ b/src/providers/ExploreV2Context.tsx
@@ -57,18 +57,12 @@ interface User {
   icon_url?: string;
 }
 
-interface Project {
-  id: number;
-  title: string;
-  icon?: string;
-}
-
 export type ExploreV2Tab = typeof OBSERVATIONS_TAB | typeof SPECIES_TAB;
 
 export type ExploreV2Subject =
   | { type: "taxon"; taxon: Taxon }
   | { type: "user"; user: User }
-  | { type: "project"; project: Project }
+  | { type: "project"; project: ApiProjectSummary }
   | { type: "unobserved"; user: User }
   | { type: "unknown" };
 

From 733908ffad860e9912153b7da90f5c87d5cf7353 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Thu, 13 Aug 2026 14:27:30 -0500
Subject: [PATCH 12/21] MOB-1346: switch iconic taxa to rely on general taxon
 subject handling, except unknown

---
 .../helpers/advancedSearchReducer.ts          | 30 +++++--------------
 .../ExploreV2/helpers/filtersToApiParams.ts   |  5 ----
 .../ExploreV2/screens/AdvancedSearch.tsx      | 28 +++++++----------
 src/providers/ExploreV2Context.tsx            |  2 --
 4 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
index 7d129429ce..bb10348949 100644
--- a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -31,19 +31,12 @@ export interface AdvancedSearchDraft {
   filters: ExploreV2Filters;
 }
 
-export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => {
-  const subjectIsUnknown = v2.subject?.type === "unknown";
-  return {
-    subject: subjectIsUnknown
-      ? null
-      : v2.subject,
-    location: v2.location,
-    sortBy: v2.sortBy,
-    filters: subjectIsUnknown
-      ? { ...v2.filters, iconic_taxa: ["unknown"] }
-      : v2.filters,
-  };
-};
+export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => ( {
+  subject: v2.subject,
+  location: v2.location,
+  sortBy: v2.sortBy,
+  filters: v2.filters,
+} );
 
 export type SubjectTaxon = Extract<ExploreV2Subject, { type: "taxon" }>["taxon"];
 
@@ -101,22 +94,15 @@ export const advancedSearchReducer = (
 ): AdvancedSearchDraft => {
   switch ( action.type ) {
     case "SET_TAXON":
-      // Selecting a taxon supersedes the "unknown" iconic-taxon filter.
       return {
         ...draft,
         subject: action.taxon
           ? { type: "taxon", taxon: action.taxon }
           : null,
-        filters: { ...draft.filters, iconic_taxa: null },
       };
     case "FILTER_BY_ICONIC_UNKNOWN":
-      // "unknown" is not a taxon; it clears the taxon subject and filters for
-      // observations not associated with any iconic taxon.
-      return {
-        ...draft,
-        subject: null,
-        filters: { ...draft.filters, iconic_taxa: ["unknown"] },
-      };
+      // special case -- not a taxon
+      return { ...draft, subject: { type: "unknown" } };
     case "SET_LOCATION_PLACE":
       return {
         ...draft,
diff --git a/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts b/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts
index 90d01ec1af..090d9f3cf1 100644
--- a/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts
+++ b/src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts
@@ -28,7 +28,6 @@ export interface FilterApiParams {
   reviewed?: boolean;
   viewer_id?: number;
   photo_license?: string;
-  iconic_taxa?: string[];
   user_id?: number;
   not_user_id?: number;
   project_id?: number;
@@ -104,10 +103,6 @@ const filtersToApiParams = (
     if ( license ) { params.photo_license = license; }
   }
 
-  if ( filters.iconic_taxa && filters.iconic_taxa.length > 0 ) {
-    params.iconic_taxa = filters.iconic_taxa;
-  }
-
   if ( filters.user?.id ) { params.user_id = filters.user.id; }
 
   if ( filters.excludeUser?.id ) {
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 274697cd8d..be5a8639c2 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -54,7 +54,6 @@ import {
   DATE_OBSERVED,
   DATE_UPLOADED,
 } from "providers/ExploreContext";
-import type { ExploreV2Subject } from "providers/ExploreV2Context";
 import {
   EXPLORE_V2_ACTION,
   EXPLORE_V2_PLACE_MODE,
@@ -130,17 +129,9 @@ const AdvancedSearch = ( ) => {
   const closePicker = ( ) => setOpenPicker( null );
 
   const handleSearch = () => {
-    // "Unknown" is the one iconic-taxon choice ExploreV2 also models as a
-    // subject, and only the subject path adds `identified: false` to the query.
-    // Commit it as a subject so the results match the same choice made in
-    // universal search, and so the results header names it.
-    const subjectToCommit: ExploreV2Subject | null = subject
-      ?? ( ( filters.iconic_taxa || [] ).includes( "unknown" )
-        ? { type: "unknown" }
-        : null );
     dispatchV2(
-      subjectToCommit
-        ? { type: EXPLORE_V2_ACTION.SET_SUBJECT, subject: subjectToCommit }
+      subject
+        ? { type: EXPLORE_V2_ACTION.SET_SUBJECT, subject }
         : { type: EXPLORE_V2_ACTION.CLEAR_SUBJECT },
     );
     switch ( location.placeMode ) {
@@ -183,7 +174,6 @@ const AdvancedSearch = ( ) => {
     establishmentMean,
     excludeUser,
     hrank,
-    iconic_taxa: iconicTaxonNames,
     lrank,
     media,
     months,
@@ -200,6 +190,12 @@ const AdvancedSearch = ( ) => {
   const taxon = subject?.type === "taxon"
     ? subject.taxon
     : null;
+  const taxonUnknown = subject?.type === "unknown";
+  const chosenIconicTaxa = ( ) => {
+    if ( taxonUnknown ) { return ["unknown"]; }
+    if ( taxon?.name ) { return [taxon.name.toLowerCase()]; }
+    return [];
+  };
 
   const subjectUser: ApiUser | null = subject?.type === "user"
     ? subject.user
@@ -320,7 +316,7 @@ const AdvancedSearch = ( ) => {
         <View className="mb-7">
           <Heading4 className="px-4 mb-5">{t( "TAXON" )}</Heading4>
           <View className="px-4 mb-5">
-            {( taxon || ( iconicTaxonNames || [] ).indexOf( "unknown" ) >= 0 )
+            {( taxon || taxonUnknown )
               ? (
                 <SelectedFilterRow
                   accessibilityLabel={t( "Change-taxon" )}
@@ -346,12 +342,10 @@ const AdvancedSearch = ( ) => {
           </View>
           <IconicTaxonChooser
             before
-            chosen={iconicTaxonNames || ( taxon?.name
-              ? [taxon.name.toLowerCase()]
-              : [] )}
+            chosen={chosenIconicTaxa()}
             onTaxonChosen={( taxonName: string ) => {
               if ( taxonName === "unknown" ) {
-                if ( ( iconicTaxonNames || [] ).indexOf( taxonName ) >= 0 ) {
+                if ( taxonUnknown ) {
                   updateTaxon( null );
                 } else {
                   filterByIconicTaxonUnknown();
diff --git a/src/providers/ExploreV2Context.tsx b/src/providers/ExploreV2Context.tsx
index 9562b5cfe0..c360378280 100644
--- a/src/providers/ExploreV2Context.tsx
+++ b/src/providers/ExploreV2Context.tsx
@@ -91,8 +91,6 @@ export interface ExploreV2Filters {
   wildStatus: WILD_STATUS;
   reviewedFilter: REVIEWED;
   photoLicense: PHOTO_LICENSE;
-  // Iconic-taxon filter (e.g. "unknown")
-  iconic_taxa?: string[] | null;
   // User / project, in ExploreV2 parlance we always consider taxon to be the "subject"
   user?: ApiUser | null;
   excludeUser?: ApiUser | null;

From b0a59742a7ec1b750d63b2c9977cd2dcdd5ce51c Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Thu, 13 Aug 2026 15:11:50 -0500
Subject: [PATCH 13/21] MOB-1346: share some sharable logic

---
 .../ExploreV2/components/ExploreV2Header.tsx  | 23 ++--------
 .../ExploreV2/helpers/locationLabel.ts        | 23 ++++++++++
 .../ExploreV2/screens/AdvancedSearch.tsx      | 43 ++++++-------------
 3 files changed, 39 insertions(+), 50 deletions(-)
 create mode 100644 src/components/Explore/ExploreV2/helpers/locationLabel.ts

diff --git a/src/components/Explore/ExploreV2/components/ExploreV2Header.tsx b/src/components/Explore/ExploreV2/components/ExploreV2Header.tsx
index 7c4ad036ef..9d77c19be7 100644
--- a/src/components/Explore/ExploreV2/components/ExploreV2Header.tsx
+++ b/src/components/Explore/ExploreV2/components/ExploreV2Header.tsx
@@ -1,5 +1,6 @@
 import { useNavigation } from "@react-navigation/native";
 import { THUMBNAIL_CLASS } from "appConstants/classNames";
+import locationLabel from "components/Explore/ExploreV2/helpers/locationLabel";
 import {
   Body1,
   Body3,
@@ -14,11 +15,8 @@ import DisplayTaxonName from "components/SharedComponents/DisplayTaxonName";
 import { Image, Pressable, View } from "components/styledComponents";
 import type { TFunction } from "i18next";
 import type { ExploreStackScreenProps } from "navigation/types";
-import type { ExploreV2LocationState, ExploreV2Subject } from "providers/ExploreV2Context";
-import {
-  EXPLORE_V2_PLACE_MODE,
-  useExploreV2,
-} from "providers/ExploreV2Context";
+import type { ExploreV2Subject } from "providers/ExploreV2Context";
+import { useExploreV2 } from "providers/ExploreV2Context";
 import React from "react";
 import { useCurrentUser, useTranslation } from "sharedHooks";
 import colors from "styles/tailwindColors";
@@ -41,21 +39,6 @@ function subjectLabel( subject: ExploreV2Subject | null, t: TFunction ): string
   }
 }
 
-function locationLabel( location: ExploreV2LocationState, t: TFunction ): string {
-  switch ( location.placeMode ) {
-    case EXPLORE_V2_PLACE_MODE.WORLDWIDE:
-      return t( "Worldwide" );
-    case EXPLORE_V2_PLACE_MODE.NEARBY:
-      return t( "Nearby" );
-    case EXPLORE_V2_PLACE_MODE.PLACE:
-      return location.place.display_name || "";
-    case EXPLORE_V2_PLACE_MODE.MAP_AREA:
-      return t( "Map-Area" );
-    default:
-      return "";
-  }
-}
-
 const SubjectThumbnail = ( { subject }: { subject: ExploreV2Subject } ) => {
   switch ( subject.type ) {
     case "taxon": {
diff --git a/src/components/Explore/ExploreV2/helpers/locationLabel.ts b/src/components/Explore/ExploreV2/helpers/locationLabel.ts
new file mode 100644
index 0000000000..5579bf210e
--- /dev/null
+++ b/src/components/Explore/ExploreV2/helpers/locationLabel.ts
@@ -0,0 +1,23 @@
+import type { TFunction } from "i18next";
+import type { ExploreV2LocationState } from "providers/ExploreV2Context";
+import { EXPLORE_V2_PLACE_MODE } from "providers/ExploreV2Context";
+
+function locationLabel( location: ExploreV2LocationState, t: TFunction ): string {
+  switch ( location.placeMode ) {
+    case EXPLORE_V2_PLACE_MODE.WORLDWIDE:
+      return t( "Worldwide" );
+    case EXPLORE_V2_PLACE_MODE.NEARBY:
+      return t( "Nearby" );
+    case EXPLORE_V2_PLACE_MODE.PLACE:
+      return location.place.display_name || "";
+    case EXPLORE_V2_PLACE_MODE.MAP_AREA:
+      return t( "Map-Area" );
+    default: {
+      // Exhaustiveness check: ts fails if a new placeMode is added without a case.
+      const _exhaustive: never = location;
+      return _exhaustive;
+    }
+  }
+}
+
+export default locationLabel;
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index be5a8639c2..2a17e28093 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -23,6 +23,7 @@ import type { SubjectTaxon }
   from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
 import { advancedSearchReducer, draftFromV2State }
   from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
+import locationLabel from "components/Explore/ExploreV2/helpers/locationLabel";
 import ExploreLocationSearchModal from "components/Explore/Modals/ExploreLocationSearchModal";
 import ExploreProjectSearchModal from "components/Explore/Modals/ExploreProjectSearchModal";
 import ExploreTaxonSearchModal from "components/Explore/Modals/ExploreTaxonSearchModal";
@@ -49,7 +50,6 @@ import { ScrollView, View } from "components/styledComponents";
 import UserListItem from "components/UserList/UserListItem";
 import isEqual from "lodash/isEqual";
 import type { ExploreStackScreenProps } from "navigation/types";
-import { RealmContext } from "providers/contexts";
 import {
   DATE_OBSERVED,
   DATE_UPLOADED,
@@ -63,18 +63,21 @@ import React, { useMemo, useReducer, useState } from "react";
 import Taxon from "realmModels/Taxon";
 import { formatObsFieldDate } from "sharedHelpers/dateAndTime";
 import { useCurrentUser, useTranslation } from "sharedHooks";
-
-const { useRealm } = RealmContext;
+import useIconicTaxa from "sharedHooks/useIconicTaxa";
 
 type SheetName = "sortBy" | "hrank" | "lrank" | "photoLicense";
 
 type PickerKind = "taxon" | "user" | "project" | "location";
 
+const ALL_MONTHS = new Array( 12 ).fill( 0 ).map( ( _, i ) => i + 1 );
+
+const isoToday = ( ) => formatObsFieldDate( new Date( ) );
+
 const AdvancedSearch = ( ) => {
   const navigation
     = useNavigation<ExploreStackScreenProps<"AdvancedSearch">["navigation"]>();
   const { t } = useTranslation();
-  const realm = useRealm();
+  const iconicTaxa = useIconicTaxa();
   const currentUser = useCurrentUser();
 
   const { state: v2State, dispatch: dispatchV2 } = useExploreV2();
@@ -209,24 +212,6 @@ const AdvancedSearch = ( ) => {
     ? ""
     : t( "X-Observations", { count: displayUser.observations_count } );
 
-  const locationText = () => {
-    switch ( location.placeMode ) {
-      case EXPLORE_V2_PLACE_MODE.WORLDWIDE:
-        return t( "Worldwide" );
-      case EXPLORE_V2_PLACE_MODE.PLACE:
-        return location.place.display_name ?? "";
-      case EXPLORE_V2_PLACE_MODE.MAP_AREA:
-        return t( "Map-Area" );
-      case EXPLORE_V2_PLACE_MODE.NEARBY:
-        return t( "Nearby" );
-      default: {
-        // Exhaustiveness check: ts fails if a new placeMode is added without a case.
-        const _exhaustive: never = location;
-        return _exhaustive;
-      }
-    }
-  };
-
   const sortByValues = getSortByValues( t );
   const taxonomicRankValues = getTaxonomicRankValues( t );
   const dateObservedValues = getDateObservedValues( t );
@@ -237,8 +222,7 @@ const AdvancedSearch = ( ) => {
   const updateDateObserved = ( {
     newDateObserved, newObservedOn, newD1, newD2, newMonths,
   } ) => {
-    const today = formatObsFieldDate( new Date( ) );
-    const allMonths = new Array( 12 ).fill( 0 ).map( ( _, i ) => i + 1 );
+    const today = isoToday( );
 
     if ( newDateObserved === DATE_OBSERVED.ALL ) {
       dispatch( {
@@ -258,7 +242,7 @@ const AdvancedSearch = ( ) => {
     } else if ( newDateObserved === DATE_OBSERVED.MONTHS ) {
       dispatch( {
         type: "SET_DATE_OBSERVED_MONTHS",
-        months: newMonths || allMonths,
+        months: newMonths || ALL_MONTHS,
       } );
     }
   };
@@ -275,7 +259,7 @@ const AdvancedSearch = ( ) => {
   };
 
   const updateDateUploaded = ( { newDateUploaded, newD1, newD2 } ) => {
-    const today = formatObsFieldDate( new Date( ) );
+    const today = isoToday( );
     if ( newDateUploaded === DATE_UPLOADED.ALL ) {
       dispatch( {
         type: "SET_DATE_UPLOADED_ALL",
@@ -353,9 +337,8 @@ const AdvancedSearch = ( ) => {
               } else if ( taxon?.name?.toLowerCase() === taxonName ) {
                 updateTaxon( null );
               } else {
-                const selectedTaxon = realm
-                  ?.objects( "Taxon" )
-                  .filtered( "name ==[c] $0", taxonName );
+                const selectedTaxon = iconicTaxa
+                  ?.filtered( "name ==[c] $0", taxonName );
                 const iconicTaxon = selectedTaxon && selectedTaxon.length > 0
                   ? Taxon.mapRealmToPojo( selectedTaxon[0] )
                   : null;
@@ -372,7 +355,7 @@ const AdvancedSearch = ( ) => {
               <View>
                 <View className="flex-row items-center mb-5">
                   <INatIcon name="location" size={15} />
-                  <Body3 className="ml-4">{locationText()}</Body3>
+                  <Body3 className="ml-4">{locationLabel( location, t )}</Body3>
                 </View>
                 <Button
                   text={t( "EDIT-LOCATION" )}

From 9bd213dfe353bde0d49e527390665f8f209114a6 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Thu, 13 Aug 2026 17:14:26 -0500
Subject: [PATCH 14/21] MOB-1346: tests fixed

---
 .../Explore/ExploreV2/helpers/filtersToApiParams.test.js   | 7 -------
 .../ExploreV2/helpers/universalSearchSubject.test.js       | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/unit/components/Explore/ExploreV2/helpers/filtersToApiParams.test.js b/tests/unit/components/Explore/ExploreV2/helpers/filtersToApiParams.test.js
index e76ad83e35..dd1d043102 100644
--- a/tests/unit/components/Explore/ExploreV2/helpers/filtersToApiParams.test.js
+++ b/tests/unit/components/Explore/ExploreV2/helpers/filtersToApiParams.test.js
@@ -187,13 +187,6 @@ describe( "filtersToApiParams", ( ) => {
     } );
   } );
 
-  describe( "iconic taxa", ( ) => {
-    it( "maps a non-empty iconic_taxa array", ( ) => {
-      const params = filtersToApiParams( makeFilters( { iconic_taxa: ["Aves", "Insecta"] } ) );
-      expect( params.iconic_taxa ).toEqual( ["Aves", "Insecta"] );
-    } );
-  } );
-
   describe( "user and project", ( ) => {
     it( "maps user id and project id", ( ) => {
       const params = filtersToApiParams( makeFilters( {
diff --git a/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js b/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js
index e25ae6dcf2..b68d4be1bc 100644
--- a/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js
+++ b/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js
@@ -41,6 +41,7 @@ describe( "resultToSubject", ( ) => {
       project: {
         id: 9,
         title: "InverteFest",
+        project_type: "collection",
         icon: "https://example.com/p.jpg",
       },
     } );

From 7a083999036ec6a488e404c23a419f859790b001 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 09:58:32 -0500
Subject: [PATCH 15/21] MOB-1346: missing newlines

---
 .../ExploreV2/helpers/advancedSearchReducer.ts        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
index bb10348949..c38b4f2ced 100644
--- a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -158,7 +158,11 @@ export const advancedSearchReducer = (
       } );
     case "SET_DATE_OBSERVED_ALL":
       return withFilters( draft, {
-        dateObserved: DATE_OBSERVED.ALL, observed_on: null, d1: null, d2: null, months: null,
+        dateObserved: DATE_OBSERVED.ALL,
+        observed_on: null,
+        d1: null,
+        d2: null,
+        months: null,
       } );
     case "SET_DATE_OBSERVED_EXACT":
       return withFilters( draft, {
@@ -186,7 +190,10 @@ export const advancedSearchReducer = (
       } );
     case "SET_DATE_UPLOADED_ALL":
       return withFilters( draft, {
-        dateUploaded: DATE_UPLOADED.ALL, created_on: null, created_d1: null, created_d2: null,
+        dateUploaded: DATE_UPLOADED.ALL,
+        created_on: null,
+        created_d1: null,
+        created_d2: null,
       } );
     case "SET_DATE_UPLOADED_EXACT":
       return withFilters( draft, {

From 0dc74f9b4d9116522610cabf0d1ff9567d9cdbd0 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 10:12:01 -0500
Subject: [PATCH 16/21] MOB-1346: drop non-taxon subjects in draftFromV2State

---
 .../helpers/advancedSearchReducer.ts          | 58 ++++++++-----------
 .../ExploreV2/screens/AdvancedSearch.tsx      | 12 +---
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
index c38b4f2ced..4fd6b3edda 100644
--- a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -23,20 +23,35 @@ import {
 } from "providers/ExploreV2Context";
 import { OBSERVATIONS_SORT } from "sharedHelpers/observationsSort";
 
+// Advanced search only keeps a taxon or "unknown" as a subject
+export type AdvancedSearchSubject = Extract<
+  ExploreV2Subject,
+  { type: "taxon" | "unknown" }
+>;
+
 // The draft is a subset of ExploreV2State
 export interface AdvancedSearchDraft {
-  subject: ExploreV2Subject | null;
+  subject: AdvancedSearchSubject | null;
   location: ExploreV2LocationState;
   sortBy: OBSERVATIONS_SORT;
   filters: ExploreV2Filters;
 }
 
-export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => ( {
-  subject: v2.subject,
-  location: v2.location,
-  sortBy: v2.sortBy,
-  filters: v2.filters,
-} );
+// Only taxon goes in the subject. user/project live in the filter blob
+export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => {
+  const { subject } = v2;
+  const base = { location: v2.location, sortBy: v2.sortBy };
+  switch ( subject?.type ) {
+    case "user":
+      return { ...base, subject: null, filters: { ...v2.filters, user: subject.user } };
+    case "project":
+      return { ...base, subject: null, filters: { ...v2.filters, project: subject.project } };
+    case "unobserved":
+      return { ...base, subject: null, filters: v2.filters };
+    default:
+      return { ...base, subject: subject ?? null, filters: v2.filters };
+  }
+};
 
 export type SubjectTaxon = Extract<ExploreV2Subject, { type: "taxon" }>["taxon"];
 
@@ -77,17 +92,6 @@ const withFilters = (
   filters: { ...draft.filters, ...patch },
 } );
 
-// Editing the user or project section supersedes a carried subject of that
-// kind, so the committed subject doesn't contradict the filter.
-const withoutSubjectOfType = (
-  draft: AdvancedSearchDraft,
-  ...types: ExploreV2Subject["type"][]
-): ExploreV2Subject | null => (
-  draft.subject && types.includes( draft.subject.type )
-    ? null
-    : draft.subject
-);
-
 export const advancedSearchReducer = (
   draft: AdvancedSearchDraft,
   action: AdvancedSearchAction,
@@ -120,24 +124,12 @@ export const advancedSearchReducer = (
       };
     case "SET_SORT":
       return { ...draft, sortBy: action.sortBy };
-    // Within the scope of advanced search, we only set a taxon as the subject
-    // and all other subjects go in the filter blob
-    // and if a non-taxon subject came in initially, it has to be excluded via withoutSubjectOfType
     case "SET_USER":
-      return {
-        ...withFilters( draft, { user: action.user, excludeUser: null } ),
-        subject: withoutSubjectOfType( draft, "user", "unobserved" ),
-      };
+      return withFilters( draft, { user: action.user, excludeUser: null } );
     case "SET_EXCLUDE_USER":
-      return {
-        ...withFilters( draft, { excludeUser: action.user, user: null } ),
-        subject: withoutSubjectOfType( draft, "user", "unobserved" ),
-      };
+      return withFilters( draft, { excludeUser: action.user, user: null } );
     case "SET_PROJECT":
-      return {
-        ...withFilters( draft, { project: action.project } ),
-        subject: withoutSubjectOfType( draft, "project" ),
-      };
+      return withFilters( draft, { project: action.project } );
     case "TOGGLE_RESEARCH_GRADE":
       return withFilters( draft, { researchGrade: !draft.filters.researchGrade } );
     case "TOGGLE_NEEDS_ID":
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 2a17e28093..8ae52e60a5 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -1,5 +1,5 @@
 import { useNavigation } from "@react-navigation/native";
-import type { ApiPlace, ApiProjectSummary, ApiUser } from "api/types";
+import type { ApiPlace, ApiProjectSummary } from "api/types";
 import { OBSERVATIONS_TAB } from "appConstants/tabs";
 import DateFilterSection
   from "components/Explore/ExploreV2/components/DateFilterSection";
@@ -200,14 +200,8 @@ const AdvancedSearch = ( ) => {
     return [];
   };
 
-  const subjectUser: ApiUser | null = subject?.type === "user"
-    ? subject.user
-    : null;
-  const displayUser = user || excludeUser || subjectUser;
-  const subjectProject: ApiProjectSummary | null = subject?.type === "project"
-    ? subject.project
-    : null;
-  const displayProject = project || subjectProject;
+  const displayUser = user || excludeUser;
+  const displayProject = project;
   const displayUserCountText = displayUser?.observations_count === undefined
     ? ""
     : t( "X-Observations", { count: displayUser.observations_count } );

From 0d547460253b26b514a371afbf0456c3255a7dca Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 12:27:34 -0500
Subject: [PATCH 17/21] MOB-1346: observations_count cleanup

---
 .../Explore/ExploreV2/helpers/universalSearchSubject.ts      | 1 +
 src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx  | 5 +----
 src/providers/ExploreV2Context.tsx                           | 1 +
 .../Explore/ExploreV2/helpers/universalSearchSubject.test.js | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts b/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts
index 4257c0ded7..259731bfda 100644
--- a/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts
+++ b/src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts
@@ -21,6 +21,7 @@ export const resultToSubject = ( result: UniversalSearchResultItem ): ExploreV2S
           id: result.user.id,
           login: result.user.login,
           icon_url: result.user.icon_url,
+          observations_count: result.user.observations_count,
         },
       };
     case "project":
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 8ae52e60a5..0ff7f6aab8 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -202,9 +202,6 @@ const AdvancedSearch = ( ) => {
 
   const displayUser = user || excludeUser;
   const displayProject = project;
-  const displayUserCountText = displayUser?.observations_count === undefined
-    ? ""
-    : t( "X-Observations", { count: displayUser.observations_count } );
 
   const sortByValues = getSortByValues( t );
   const taxonomicRankValues = getTaxonomicRankValues( t );
@@ -421,7 +418,7 @@ const AdvancedSearch = ( ) => {
                   >
                     <UserListItem
                       item={{ user: displayUser }}
-                      countText={displayUserCountText}
+                      countText={t( "X-Observations", { count: displayUser.observations_count } )}
                       pressable={false}
                     />
                   </SelectedFilterRow>
diff --git a/src/providers/ExploreV2Context.tsx b/src/providers/ExploreV2Context.tsx
index c360378280..7a4ddeba6b 100644
--- a/src/providers/ExploreV2Context.tsx
+++ b/src/providers/ExploreV2Context.tsx
@@ -55,6 +55,7 @@ interface User {
   id: number;
   login: string;
   icon_url?: string;
+  observations_count?: number;
 }
 
 export type ExploreV2Tab = typeof OBSERVATIONS_TAB | typeof SPECIES_TAB;
diff --git a/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js b/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js
index b68d4be1bc..7b6afe3660 100644
--- a/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js
+++ b/tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js
@@ -21,6 +21,7 @@ describe( "resultToSubject", ( ) => {
         id: 7,
         login: "seth_msp",
         icon_url: "https://example.com/u.jpg",
+        observations_count: 5,
       },
     } );
   } );

From ac1d83746ecc57fdd127c20f30304035f8935471 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 13:23:27 -0500
Subject: [PATCH 18/21] MOB-1346: reset disabled wiring

---
 .../ExploreV2/helpers/advancedSearchReducer.ts     | 14 ++++++++------
 .../Explore/ExploreV2/screens/AdvancedSearch.tsx   | 13 +++++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
index 4fd6b3edda..a5f382bf7b 100644
--- a/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
+++ b/src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts
@@ -53,6 +53,13 @@ export const draftFromV2State = ( v2: ExploreV2State ): AdvancedSearchDraft => {
   }
 };
 
+export const defaultAdvancedSearchDraft: AdvancedSearchDraft = {
+  subject: null,
+  location: { placeMode: EXPLORE_V2_PLACE_MODE.WORLDWIDE },
+  sortBy: OBSERVATIONS_SORT.DATE_UPLOADED_NEWEST,
+  filters: defaultExploreV2Filters,
+};
+
 export type SubjectTaxon = Extract<ExploreV2Subject, { type: "taxon" }>["taxon"];
 
 export type AdvancedSearchAction =
@@ -217,12 +224,7 @@ export const advancedSearchReducer = (
     case "SET_PHOTO_LICENSE":
       return withFilters( draft, { photoLicense: action.photoLicense } );
     case "RESET":
-      return {
-        subject: null,
-        location: { placeMode: EXPLORE_V2_PLACE_MODE.WORLDWIDE },
-        sortBy: OBSERVATIONS_SORT.DATE_UPLOADED_NEWEST,
-        filters: defaultExploreV2Filters,
-      };
+      return defaultAdvancedSearchDraft;
     default: {
       // https://www.typescriptlang.org/docs/handbook/2/narrowing.html#exhaustiveness-checking
       const _exhaustive: never = action;
diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 0ff7f6aab8..360a91e11f 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -21,8 +21,11 @@ import {
 } from "components/Explore/ExploreV2/helpers/advancedSearchOptions";
 import type { SubjectTaxon }
   from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
-import { advancedSearchReducer, draftFromV2State }
-  from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
+import {
+  advancedSearchReducer,
+  defaultAdvancedSearchDraft,
+  draftFromV2State,
+} from "components/Explore/ExploreV2/helpers/advancedSearchReducer";
 import locationLabel from "components/Explore/ExploreV2/helpers/locationLabel";
 import ExploreLocationSearchModal from "components/Explore/Modals/ExploreLocationSearchModal";
 import ExploreProjectSearchModal from "components/Explore/Modals/ExploreProjectSearchModal";
@@ -92,6 +95,11 @@ const AdvancedSearch = ( ) => {
     [draft, initialDraft],
   );
 
+  const resetDisabled = useMemo(
+    ( ) => isEqual( draft, defaultAdvancedSearchDraft ),
+    [draft],
+  );
+
   // Which in-screen search picker (taxon/user/project/location) is open.
   const [openPicker, setOpenPicker] = useState<PickerKind | null>( null );
   const [openSheet, setOpenSheet] = useState<SheetName | null>( null );
@@ -283,6 +291,7 @@ const AdvancedSearch = ( ) => {
         headerText={t( "ADVANCED-SEARCH" )}
         onClose={() => navigation.goBack()}
         onReset={() => dispatch( { type: "RESET" } )}
+        resetDisabled={resetDisabled}
         testID="AdvancedSearch.back"
       />
 

From b0c567a274fab8372ac7c572addabccccee7a656 Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 13:31:56 -0500
Subject: [PATCH 19/21] MOB-1346: discard sheet

---
 .../ExploreV2/screens/AdvancedSearch.tsx      | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 360a91e11f..03c0135eed 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -48,6 +48,7 @@ import {
   RadioButtonSheet,
 } from "components/SharedComponents";
 import SearchHeader from "components/SharedComponents/SearchHeader";
+import WarningSheet from "components/SharedComponents/Sheets/WarningSheet";
 import { TopAndBottomInsetViewWrapper } from "components/SharedComponents/ViewWrapper";
 import { ScrollView, View } from "components/styledComponents";
 import UserListItem from "components/UserList/UserListItem";
@@ -100,6 +101,15 @@ const AdvancedSearch = ( ) => {
     [draft],
   );
 
+  const [showDiscardSheet, setShowDiscardSheet] = useState( false );
+  const handleBack = ( ) => {
+    if ( differsFromInitial ) {
+      setShowDiscardSheet( true );
+      return;
+    }
+    navigation.goBack( );
+  };
+
   // Which in-screen search picker (taxon/user/project/location) is open.
   const [openPicker, setOpenPicker] = useState<PickerKind | null>( null );
   const [openSheet, setOpenSheet] = useState<SheetName | null>( null );
@@ -289,7 +299,7 @@ const AdvancedSearch = ( ) => {
     <TopAndBottomInsetViewWrapper testID="AdvancedSearch">
       <SearchHeader
         headerText={t( "ADVANCED-SEARCH" )}
-        onClose={() => navigation.goBack()}
+        onClose={handleBack}
         onReset={() => dispatch( { type: "RESET" } )}
         resetDisabled={resetDisabled}
         testID="AdvancedSearch.back"
@@ -755,6 +765,21 @@ const AdvancedSearch = ( ) => {
           updateLocation={updateLocation}
         />
       )}
+      {showDiscardSheet && (
+        <WarningSheet
+          onPressClose={( ) => setShowDiscardSheet( false )}
+          confirm={( ) => {
+            setShowDiscardSheet( false );
+            navigation.goBack( );
+          }}
+          headerText={t( "DISCARD-FILTER-CHANGES" )}
+          text={t( "You-changed-filters-will-be-discarded" )}
+          buttonText={t( "DISCARD-CHANGES" )}
+          handleSecondButtonPress={( ) => setShowDiscardSheet( false )}
+          secondButtonText={t( "CANCEL" )}
+          loading={false}
+        />
+      )}
     </TopAndBottomInsetViewWrapper>
   );
 };

From 41d772282ab4b1939fa537cdda4673407fb2f29a Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 14:18:24 -0500
Subject: [PATCH 20/21] MOB-1346: visual adjustments

---
 .../Explore/ExploreV2/screens/AdvancedSearch.tsx          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
index 03c0135eed..0a64db388f 100644
--- a/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
+++ b/src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx
@@ -49,7 +49,7 @@ import {
 } from "components/SharedComponents";
 import SearchHeader from "components/SharedComponents/SearchHeader";
 import WarningSheet from "components/SharedComponents/Sheets/WarningSheet";
-import { TopAndBottomInsetViewWrapper } from "components/SharedComponents/ViewWrapper";
+import { SharedStackViewWrapper } from "components/SharedComponents/ViewWrapper";
 import { ScrollView, View } from "components/styledComponents";
 import UserListItem from "components/UserList/UserListItem";
 import isEqual from "lodash/isEqual";
@@ -296,7 +296,7 @@ const AdvancedSearch = ( ) => {
   const hasError = observedEndBeforeStart || uploadedEndBeforeStart || noMonthsSelected;
 
   return (
-    <TopAndBottomInsetViewWrapper testID="AdvancedSearch">
+    <SharedStackViewWrapper testID="AdvancedSearch">
       <SearchHeader
         headerText={t( "ADVANCED-SEARCH" )}
         onClose={handleBack}
@@ -653,7 +653,7 @@ const AdvancedSearch = ( ) => {
           </View>
         </View>
       </ScrollView>
-      <ButtonBar>
+      <ButtonBar containerClass="bg-white border-t border-lightGray">
         <Button
           disabled={hasError}
           level={differsFromInitial
@@ -780,7 +780,7 @@ const AdvancedSearch = ( ) => {
           loading={false}
         />
       )}
-    </TopAndBottomInsetViewWrapper>
+    </SharedStackViewWrapper>
   );
 };
 

From 421eae0e104e9568c05a2d3b7136881207ad48fd Mon Sep 17 00:00:00 2001
From: Seth Peterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 17 Aug 2026 15:14:12 -0500
Subject: [PATCH 21/21] MOB-1346: viewerId -> currentUserId

---
 src/components/Explore/ExploreV2/helpers/buildQueryParams.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts b/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts
index 53254624d8..56718fb6c9 100644
--- a/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts
+++ b/src/components/Explore/ExploreV2/helpers/buildQueryParams.ts
@@ -39,7 +39,7 @@ const buildExploreV2QueryParams = (
   state: ExploreV2State,
   nearbyCoords?: NearbyCoords,
   // The signed-in user's id, needed by the reviewed filter (viewer_id param).
-  viewerId?: number | null,
+  currentUserId?: number | null,
 ): ExploreV2QueryParams => {
   const params: ExploreV2QueryParams = {
     per_page: PER_PAGE,
@@ -97,7 +97,7 @@ const buildExploreV2QueryParams = (
   }
 
   // Advanced Search filters
-  const filterParams = filtersToApiParams( state.filters, viewerId );
+  const filterParams = filtersToApiParams( state.filters, currentUserId );
   const paramsWithFilters: ExploreV2QueryParams = {
     ...params,
     ...filterParams,