From d867a03420b58abee3a8b831b8472592ca0c969e Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 29 Dec 2025 10:36:11 -0600
Subject: [PATCH 01/18] MOB-1077 refactor match screen to have a single return

---
 src/components/Match/Match.tsx | 236 ++++++++++++---------------------
 1 file changed, 85 insertions(+), 151 deletions(-)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index 23200e3a9..3833a5d2d 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -66,90 +66,80 @@ const Match = ( {
 
   const latitude = observation?.privateLatitude || observation?.latitude;
   const taxon = topSuggestion?.taxon;
+  const hasNoSuggestions = !topSuggestion && otherSuggestions.length === 0;
+  const hasOnlyOtherSuggestions = !topSuggestion && otherSuggestions.length > 0;
 
-  // In case there are no suggestions, at all
-  if ( !topSuggestion && otherSuggestions.length === 0 ) {
-    return (
+  const headerContent = suggestionsLoading
+    ? <ActivityIndicator size={33} />
+    : (
       <>
-        <ScrollViewWrapper scrollRef={scrollRef}>
-          <View className={matchCardClassTop}>
-            {
-              suggestionsLoading
-                ? (
-                  <ActivityIndicator size={33} />
-                )
-                : (
-                  <Body2>
-                    {t( "The-AI-is-not-confident-Upload-to-ask-the-community" )}
-                  </Body2>
-                )
-            }
-          </View>
-          <PhotosSection
-            taxon={taxon}
-            obsPhotos={obsPhotos}
-            navToTaxonDetails={navToTaxonDetails}
-          />
-          { !suggestionsLoading
-          && (
-            <View className="mt-5">
-              <Heading3 className="mx-5">
-                {t( "Do-you-know-what-group-this-is-in" )}
-              </Heading3>
-              <IconicSuggestionsScroll
-                iconicTaxonChosen={iconicTaxon}
-                onIconicTaxonChosen={setIconicTaxon}
-              />
-              <Body2 className="mx-5 my-[30px]">
-                {t( "If-you-save-this-observation-and-upload-it-to-iNaturalist" )}
-              </Body2>
-              <Body2 className="mx-3 my-[30px]">
-                {t( "Or-you-can-try-to-get-a-clearer-photo-by-zooming-in-getting-closer" )}
-              </Body2>
-              {!latitude && (
-                <Button
-                  className="mx-4 mb-[30px]"
-                  level="neutral"
-                  text={t( "ADD-LOCATION-FOR-BETTER-IDS" )}
-                  loading={isFetchingLocation}
-                  disabled={isFetchingLocation}
-                  onPress={handleAddLocationPressed}
-                  accessibilityLabel={t( "Edit-location" )}
-                  accessibilityHint={t( "Add-location-to-refresh-suggestions" )}
-                />
-              )}
-            </View>
-          )}
-        </ScrollViewWrapper>
-        <SaveDiscardButtons
-          handlePress={handleSaveOrDiscardPress}
-        />
+        {topSuggestion && <MatchHeader topSuggestion={topSuggestion} />}
+        {hasNoSuggestions && (
+          <Body2>
+            {t( "The-AI-is-not-confident-Upload-to-ask-the-community" )}
+          </Body2>
+        )}
+        {hasOnlyOtherSuggestions && (
+          <Body2>
+            {t( "The-AI-is-not-confident-It-may-be-one-of-the-IDs-below" )}
+          </Body2>
+        )}
       </>
     );
-  }
-  // In case there are suggestions but no top suggestion
-  if ( !topSuggestion ) {
-    return (
-      <>
-        <ScrollViewWrapper scrollRef={scrollRef}>
-          <View className={matchCardClassTop}>
+
+  return (
+    <>
+      <ScrollViewWrapper scrollRef={scrollRef}>
+        <View className={matchCardClassTop}>
+          {headerContent}
+        </View>
+        <PhotosSection
+          representativePhoto={topSuggestion?.taxon?.representative_photo}
+          taxon={taxon}
+          obsPhotos={obsPhotos}
+          navToTaxonDetails={navToTaxonDetails}
+        />
+        {topSuggestion && (
+          <>
+            <View className="border-[1.5px] border-white" />
+            {!latitude
+              ? (
+                <EmptyMapSection
+                  handleAddLocationPressed={handleAddLocationPressed}
+                  isFetchingLocation={isFetchingLocation}
+                />
+              )
+              : (
+                <MapSection observation={observation} taxon={taxon} />
+              )}
+            <LocationSection
+              belongsToCurrentUser
+              observation={observation}
+            />
+            <View className={matchCardClassBottom} />
             {
-              suggestionsLoading
-                ? (
-                  <ActivityIndicator size={33} />
-                )
-                : (
-                  <Body2>
-                    {t( "The-AI-is-not-confident-It-may-be-one-of-the-IDs-below" )}
-                  </Body2>
-                )
+              isConnected && (
+                <Button
+                  className="mx-4 mb-[30px]"
+                  level="primary"
+                  text={taxon?.rank_level === 10
+                    ? t( "LEARN-MORE-ABOUT-THIS-SPECIES" )
+                    : t( "LEARN-MORE-ABOUT-THIS-GROUP" )}
+                  onPress={navToTaxonDetails}
+                  accessibilityHint={t( "Navigates-to-taxon-details" )}
+                />
+              )
             }
-          </View>
-          <PhotosSection
-            taxon={taxon}
-            obsPhotos={obsPhotos}
-            navToTaxonDetails={navToTaxonDetails}
-          />
+            <View className="mb-[30px]">
+              <AdditionalSuggestionsScroll
+                onSuggestionChosen={onSuggestionChosen}
+                otherSuggestions={otherSuggestions}
+                suggestionsLoading={suggestionsLoading}
+              />
+            </View>
+          </>
+        )}
+        {hasOnlyOtherSuggestions && (
           <View className="mt-5 mb-[30px]">
             <AdditionalSuggestionsScroll
               noTopSuggestion
@@ -158,80 +148,24 @@ const Match = ( {
               suggestionsLoading={suggestionsLoading}
             />
           </View>
-          {!latitude && (
-            <Button
-              className="mx-4 mb-[30px]"
-              level="neutral"
-              text={t( "ADD-LOCATION-FOR-BETTER-IDS" )}
-              onPress={handleAddLocationPressed}
-              loading={isFetchingLocation}
-              disabled={isFetchingLocation}
-              accessibilityLabel={t( "Edit-location" )}
-              accessibilityHint={t( "Add-location-to-refresh-suggestions" )}
+        )}
+        {hasNoSuggestions && !suggestionsLoading && (
+          <View className="mt-5">
+            <Heading3 className="mx-5">
+              {t( "Do-you-know-what-group-this-is-in" )}
+            </Heading3>
+            <IconicSuggestionsScroll
+              iconicTaxonChosen={iconicTaxon}
+              onIconicTaxonChosen={setIconicTaxon}
             />
-          )}
-        </ScrollViewWrapper>
-        <SaveDiscardButtons
-          handlePress={handleSaveOrDiscardPress}
-        />
-      </>
-    );
-  }
-
-  return (
-    <>
-      <ScrollViewWrapper scrollRef={scrollRef}>
-        <View className={matchCardClassTop}>
-          {
-            suggestionsLoading
-              ? (
-                <ActivityIndicator size={33} />
-              )
-              : <MatchHeader topSuggestion={topSuggestion} />
-          }
-        </View>
-        <PhotosSection
-          representativePhoto={topSuggestion?.taxon?.representative_photo}
-          taxon={taxon}
-          obsPhotos={obsPhotos}
-          navToTaxonDetails={navToTaxonDetails}
-        />
-        <View className="border-[1.5px] border-white" />
-        {!latitude
-          ? (
-            <EmptyMapSection
-              handleAddLocationPressed={handleAddLocationPressed}
-              isFetchingLocation={isFetchingLocation}
-            />
-          )
-          : (
-            <MapSection observation={observation} taxon={taxon} />
-          )}
-        <LocationSection
-          belongsToCurrentUser
-          observation={observation}
-        />
-        <View className={matchCardClassBottom} />
-        {
-          isConnected && (
-            <Button
-              className="mx-4 mb-[30px]"
-              level="primary"
-              text={taxon?.rank_level === 10
-                ? t( "LEARN-MORE-ABOUT-THIS-SPECIES" )
-                : t( "LEARN-MORE-ABOUT-THIS-GROUP" )}
-              onPress={navToTaxonDetails}
-              accessibilityHint={t( "Navigates-to-taxon-details" )}
-            />
-          )
-        }
-        <View className="mb-[30px]">
-          <AdditionalSuggestionsScroll
-            onSuggestionChosen={onSuggestionChosen}
-            otherSuggestions={otherSuggestions}
-            suggestionsLoading={suggestionsLoading}
-          />
-        </View>
+            <Body2 className="mx-5 my-[30px]">
+              {t( "If-you-save-this-observation-and-upload-it-to-iNaturalist" )}
+            </Body2>
+            <Body2 className="mx-3 my-[30px]">
+              {t( "Or-you-can-try-to-get-a-clearer-photo-by-zooming-in-getting-closer" )}
+            </Body2>
+          </View>
+        )}
         {!latitude && (
           <Button
             className="mx-4 mb-[30px]"

From 1120de6e87f3f6dc3eea921aa5263a0ef3cdeba8 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 29 Dec 2025 11:24:32 -0600
Subject: [PATCH 02/18] MOB-1077: split out matchscreentopcontent

---
 src/components/Match/Match.tsx                | 29 ++-----
 .../Match/MatchScreenTopContent.tsx           | 44 +++++++++++
 .../Match/MatchScreenTopContent.test.js       | 78 +++++++++++++++++++
 3 files changed, 130 insertions(+), 21 deletions(-)
 create mode 100644 src/components/Match/MatchScreenTopContent.tsx
 create mode 100644 tests/unit/components/Match/MatchScreenTopContent.test.js

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index 3833a5d2d..acdb8d62e 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -5,7 +5,7 @@ import LocationSection
 import MapSection
   from "components/ObsDetailsDefaultMode/MapSection/MapSection";
 import {
-  ActivityIndicator, Body2, Button, Heading3, ScrollViewWrapper,
+  Body2, Button, Heading3, ScrollViewWrapper,
 } from "components/SharedComponents";
 import { View } from "components/styledComponents";
 import _ from "lodash";
@@ -21,7 +21,7 @@ import AdditionalSuggestionsScroll
 import EmptyMapSection from "./EmptyMapSection";
 import IconicSuggestionsScroll from "./IconicSuggestions/IconicSuggestionsScroll";
 import type { MatchButtonAction } from "./MatchContainer";
-import MatchHeader from "./MatchHeader";
+import MatchScreenTopContent from "./MatchScreenTopContent";
 import PhotosSection from "./PhotosSection";
 import SaveDiscardButtons from "./SaveDiscardButtons";
 
@@ -69,29 +69,16 @@ const Match = ( {
   const hasNoSuggestions = !topSuggestion && otherSuggestions.length === 0;
   const hasOnlyOtherSuggestions = !topSuggestion && otherSuggestions.length > 0;
 
-  const headerContent = suggestionsLoading
-    ? <ActivityIndicator size={33} />
-    : (
-      <>
-        {topSuggestion && <MatchHeader topSuggestion={topSuggestion} />}
-        {hasNoSuggestions && (
-          <Body2>
-            {t( "The-AI-is-not-confident-Upload-to-ask-the-community" )}
-          </Body2>
-        )}
-        {hasOnlyOtherSuggestions && (
-          <Body2>
-            {t( "The-AI-is-not-confident-It-may-be-one-of-the-IDs-below" )}
-          </Body2>
-        )}
-      </>
-    );
-
   return (
     <>
       <ScrollViewWrapper scrollRef={scrollRef}>
         <View className={matchCardClassTop}>
-          {headerContent}
+          <MatchScreenTopContent
+            suggestionsLoading={suggestionsLoading}
+            topSuggestion={topSuggestion}
+            hasNoSuggestions={hasNoSuggestions}
+            hasOnlyOtherSuggestions={hasOnlyOtherSuggestions}
+          />
         </View>
         <PhotosSection
           representativePhoto={topSuggestion?.taxon?.representative_photo}
diff --git a/src/components/Match/MatchScreenTopContent.tsx b/src/components/Match/MatchScreenTopContent.tsx
new file mode 100644
index 000000000..7b227f7ff
--- /dev/null
+++ b/src/components/Match/MatchScreenTopContent.tsx
@@ -0,0 +1,44 @@
+import type { ApiSuggestion } from "api/types";
+import { ActivityIndicator, Body2 } from "components/SharedComponents";
+import React from "react";
+import { useTranslation } from "sharedHooks";
+
+import MatchHeader from "./MatchHeader";
+
+type Props = {
+  suggestionsLoading: boolean;
+  topSuggestion?: ApiSuggestion;
+  hasNoSuggestions: boolean;
+  hasOnlyOtherSuggestions: boolean;
+}
+
+const MatchScreenTopContent = ( {
+  suggestionsLoading,
+  topSuggestion,
+  hasNoSuggestions,
+  hasOnlyOtherSuggestions,
+}: Props ) => {
+  const { t } = useTranslation( );
+
+  if ( suggestionsLoading ) {
+    return <ActivityIndicator size={33} />;
+  }
+
+  return (
+    <>
+      {topSuggestion && <MatchHeader topSuggestion={topSuggestion} />}
+      {hasNoSuggestions && (
+        <Body2>
+          {t( "The-AI-is-not-confident-Upload-to-ask-the-community" )}
+        </Body2>
+      )}
+      {hasOnlyOtherSuggestions && (
+        <Body2>
+          {t( "The-AI-is-not-confident-It-may-be-one-of-the-IDs-below" )}
+        </Body2>
+      )}
+    </>
+  );
+};
+
+export default MatchScreenTopContent;
diff --git a/tests/unit/components/Match/MatchScreenTopContent.test.js b/tests/unit/components/Match/MatchScreenTopContent.test.js
new file mode 100644
index 000000000..7486c8bfd
--- /dev/null
+++ b/tests/unit/components/Match/MatchScreenTopContent.test.js
@@ -0,0 +1,78 @@
+import { screen } from "@testing-library/react-native";
+import MatchScreenTopContent from "components/Match/MatchScreenTopContent";
+import React from "react";
+import factory from "tests/factory";
+import { renderComponent } from "tests/helpers/render";
+
+describe( "MatchScreenTopContent", () => {
+  const topSuggestion = {
+    combined_score: 95,
+    taxon: factory( "LocalTaxon", {
+      name: "Silphium perfoliatum",
+      preferred_common_name: "Cup Plant",
+      rank_level: 10,
+    } ),
+  };
+
+  it( "displays MatchHeader when topSuggestion is provided", () => {
+    renderComponent(
+      <MatchScreenTopContent
+        suggestionsLoading={false}
+        topSuggestion={topSuggestion}
+        hasNoSuggestions={false}
+        hasOnlyOtherSuggestions={false}
+      />,
+    );
+
+    expect( screen.getByText( "Cup Plant" ) ).toBeVisible();
+  } );
+
+  it( "shows message for hasNoSuggestions", () => {
+    renderComponent(
+      <MatchScreenTopContent
+        suggestionsLoading={false}
+        hasNoSuggestions
+        hasOnlyOtherSuggestions={false}
+      />,
+    );
+
+    expect( screen.getByText(
+      "The AI is not confident. Upload to ask the community.",
+    ) ).toBeVisible();
+  } );
+
+  it( "shows message for hasOnlyOtherSuggestions", () => {
+    renderComponent(
+      <MatchScreenTopContent
+        suggestionsLoading={false}
+        hasNoSuggestions={false}
+        hasOnlyOtherSuggestions
+      />,
+    );
+
+    expect( screen.getByText(
+      "The AI is not confident. It may be one of the IDs below.",
+    ) ).toBeVisible();
+  } );
+
+  it( "renders loading state over other content", () => {
+    const topSuggestion = {
+      combined_score: 90,
+      taxon: factory( "LocalTaxon", { rank_level: 10 } ),
+    };
+
+    renderComponent(
+      <MatchScreenTopContent
+        suggestionsLoading
+        topSuggestion={topSuggestion}
+        hasNoSuggestions
+        hasOnlyOtherSuggestions
+      />,
+    );
+
+    const activityIndicator = screen.getByRole( "progressbar" );
+    expect( activityIndicator ).toBeVisible();
+
+    expect( screen.queryByText( /Cup Plant/i ) ).toBeFalsy();
+  } );
+} );

From 0ba482ae5334c0e0dc9e286058b27c2a7e622296 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 29 Dec 2025 11:25:51 -0600
Subject: [PATCH 03/18] MOB-1077 ObsEditHeaderRight rename

---
 .../SavedMatch/SavedMatch.tsx                 |  5 +-
 .../ObsDetails/ObsEditHeaderRight.tsx         | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx

diff --git a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
index 79b1508f6..c6148a8e3 100644
--- a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
+++ b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
@@ -5,14 +5,13 @@ import PhotosSection from "components/Match/PhotosSection";
 import LocationSection from "components/ObsDetailsDefaultMode/LocationSection/LocationSection";
 import MapSection from "components/ObsDetailsDefaultMode/MapSection/MapSection";
 import { Button, ScrollViewWrapper } from "components/SharedComponents";
+import ObsEditHeaderRight from "components/SharedComponents/ObsDetails/ObsEditHeaderRight";
 import { View } from "components/styledComponents";
 import _ from "lodash";
 import React from "react";
 import type { RealmObservation } from "realmModels/types";
 import { useTranslation } from "sharedHooks";
 
-import SavedMatchHeaderRight from "./SavedMatchHeaderRight";
-
 interface Props {
   observation: RealmObservation;
   navToTaxonDetails: ( ) => void;
@@ -30,7 +29,7 @@ const SavedMatch = ( {
 
   return (
     <ScrollViewWrapper testID="SavedMatch.container">
-      <SavedMatchHeaderRight observation={observation} />
+      <ObsEditHeaderRight observation={observation} />
       <View className={`${matchCardClassTop} mt-[10px]`}>
         <MatchHeader hideObservationStatus topSuggestion={observation} />
       </View>
diff --git a/src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx b/src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx
new file mode 100644
index 000000000..68737470f
--- /dev/null
+++ b/src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx
@@ -0,0 +1,50 @@
+import { useNavigation } from "@react-navigation/native";
+import {
+  INatIconButton,
+} from "components/SharedComponents";
+import React, { useCallback, useEffect } from "react";
+import type { RealmObservation } from "realmModels/types";
+import {
+  useNavigateToObsEdit,
+  useTranslation,
+} from "sharedHooks";
+import colors from "styles/tailwindColors";
+
+interface Props {
+  observation: RealmObservation;
+}
+
+const ObsEditHeaderRight = ( {
+  observation,
+}: Props ) => {
+  const navigation = useNavigation( );
+  const { t } = useTranslation( );
+  const navigateToObsEdit = useNavigateToObsEdit( );
+
+  const headerRight = useCallback(
+    ( ) => (
+      <INatIconButton
+        testID="ObsEditIcon"
+        onPress={() => navigateToObsEdit( observation )}
+        icon="pencil"
+        color={String( colors?.darkGray )}
+        accessibilityLabel={t( "Edit" )}
+        size={22}
+      />
+    ),
+    [
+      observation,
+      navigateToObsEdit,
+      t,
+    ],
+  );
+
+  useEffect(
+    ( ) => navigation.setOptions( { headerRight } ),
+    [headerRight, navigation],
+  );
+
+  return null;
+};
+
+export default ObsEditHeaderRight;

From 02cbf91aa173d6c89571e84c372cf76de16fe4f9 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 29 Dec 2025 14:03:00 -0600
Subject: [PATCH 04/18] MOB-1077: rm SavedMatchHeaderRight and add unit tests

---
 .../SavedMatch/SavedMatchHeaderRight.tsx      | 50 ----------------
 .../ObsDetails/ObsEditHeaderRight.test.js     | 60 +++++++++++++++++++
 2 files changed, 60 insertions(+), 50 deletions(-)
 delete mode 100644 src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatchHeaderRight.tsx
 create mode 100644 tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js

diff --git a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatchHeaderRight.tsx b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatchHeaderRight.tsx
deleted file mode 100644
index 33614b07d..000000000
--- a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatchHeaderRight.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useNavigation } from "@react-navigation/native";
-import {
-  INatIconButton,
-} from "components/SharedComponents";
-import React, { useCallback, useEffect } from "react";
-import type { RealmObservation } from "realmModels/types";
-import {
-  useNavigateToObsEdit,
-  useTranslation,
-} from "sharedHooks";
-import colors from "styles/tailwindColors";
-
-interface Props {
-  observation: RealmObservation;
-}
-
-const SavedMatchHeaderRight = ( {
-  observation,
-}: Props ) => {
-  const navigation = useNavigation( );
-  const { t } = useTranslation( );
-  const navigateToObsEdit = useNavigateToObsEdit( );
-
-  const headerRight = useCallback(
-    ( ) => (
-      <INatIconButton
-        testID="SavedMatch.editButton"
-        onPress={() => navigateToObsEdit( observation )}
-        icon="pencil"
-        color={String( colors?.darkGray )}
-        accessibilityLabel={t( "Edit" )}
-        size={22}
-      />
-    ),
-    [
-      observation,
-      navigateToObsEdit,
-      t,
-    ],
-  );
-
-  useEffect(
-    ( ) => navigation.setOptions( { headerRight } ),
-    [headerRight, navigation],
-  );
-
-  return null;
-};
-
-export default SavedMatchHeaderRight;
diff --git a/tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js b/tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js
new file mode 100644
index 000000000..3d708119b
--- /dev/null
+++ b/tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js
@@ -0,0 +1,60 @@
+import { fireEvent, screen } from "@testing-library/react-native";
+import ObsEditHeaderRight from "components/SharedComponents/ObsDetails/ObsEditHeaderRight";
+import React from "react";
+import useStore from "stores/useStore";
+import factory from "tests/factory";
+import { renderComponent } from "tests/helpers/render";
+
+const mockNavigate = jest.fn();
+const mockSetOptions = jest.fn();
+jest.mock( "@react-navigation/native", () => ( {
+  ...jest.requireActual( "@react-navigation/native" ),
+  useNavigation: () => ( {
+    navigate: mockNavigate,
+    setOptions: mockSetOptions,
+  } ),
+} ) );
+
+describe( "ObsEditHeaderRight", () => {
+  const mockObservation = factory( "LocalObservation" );
+
+  beforeEach( () => {
+    jest.clearAllMocks();
+  } );
+
+  it( "sets navigation header options", () => {
+    renderComponent( <ObsEditHeaderRight observation={mockObservation} /> );
+
+    expect( mockSetOptions ).toHaveBeenCalledWith(
+      expect.objectContaining( {
+        headerRight: expect.any( Function ),
+      } ),
+    );
+  } );
+
+  it( "renders edit button and calls relevant functions on press", () => {
+    const prepareObsEdit = jest.fn();
+    const setMyObsOffsetToRestore = jest.fn();
+
+    useStore.setState( {
+      prepareObsEdit,
+      setMyObsOffsetToRestore,
+    } );
+
+    renderComponent( <ObsEditHeaderRight observation={mockObservation} /> );
+
+    const headerRightCall = mockSetOptions.mock.calls[0][0];
+    const HeaderRightComponent = headerRightCall.headerRight;
+
+    renderComponent( <HeaderRightComponent /> );
+
+    const editButton = screen.getByTestId( "ObsEditIcon" );
+    expect( editButton ).toBeVisible();
+
+    fireEvent.press( editButton );
+
+    expect( prepareObsEdit ).toHaveBeenCalledWith( mockObservation );
+    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit" );
+    expect( setMyObsOffsetToRestore ).toHaveBeenCalled();
+  } );
+} );

From 964451ae3356ea8d50be4ab2f01c09320deb7694 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Thu, 1 Jan 2026 18:40:14 -0600
Subject: [PATCH 05/18] MOB-1077 better component name

---
 src/components/Match/Match.tsx                            | 2 ++
 .../ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx       | 4 ++--
 .../{ObsEditHeaderRight.tsx => HeaderEditIcon.tsx}        | 4 ++--
 ...{ObsEditHeaderRight.test.js => HeaderEditIcon.test.js} | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename src/components/SharedComponents/ObsDetails/{ObsEditHeaderRight.tsx => HeaderEditIcon.tsx} (94%)
 rename tests/unit/components/SharedComponents/ObsDetails/{ObsEditHeaderRight.test.js => HeaderEditIcon.test.js} (84%)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index acdb8d62e..a393644b5 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -7,6 +7,7 @@ import MapSection
 import {
   Body2, Button, Heading3, ScrollViewWrapper,
 } from "components/SharedComponents";
+import HeaderEditIcon from "components/SharedComponents/ObsDetails/HeaderEditIcon";
 import { View } from "components/styledComponents";
 import _ from "lodash";
 import React from "react";
@@ -79,6 +80,7 @@ const Match = ( {
             hasNoSuggestions={hasNoSuggestions}
             hasOnlyOtherSuggestions={hasOnlyOtherSuggestions}
           />
+          <HeaderEditIcon observation={observation} />
         </View>
         <PhotosSection
           representativePhoto={topSuggestion?.taxon?.representative_photo}
diff --git a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
index c6148a8e3..52d12d413 100644
--- a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
+++ b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
@@ -5,7 +5,7 @@ import PhotosSection from "components/Match/PhotosSection";
 import LocationSection from "components/ObsDetailsDefaultMode/LocationSection/LocationSection";
 import MapSection from "components/ObsDetailsDefaultMode/MapSection/MapSection";
 import { Button, ScrollViewWrapper } from "components/SharedComponents";
-import ObsEditHeaderRight from "components/SharedComponents/ObsDetails/ObsEditHeaderRight";
+import HeaderEditIcon from "components/SharedComponents/ObsDetails/HeaderEditIcon";
 import { View } from "components/styledComponents";
 import _ from "lodash";
 import React from "react";
@@ -29,7 +29,7 @@ const SavedMatch = ( {
 
   return (
     <ScrollViewWrapper testID="SavedMatch.container">
-      <ObsEditHeaderRight observation={observation} />
+      <HeaderEditIcon observation={observation} />
       <View className={`${matchCardClassTop} mt-[10px]`}>
         <MatchHeader hideObservationStatus topSuggestion={observation} />
       </View>
diff --git a/src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
similarity index 94%
rename from src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx
rename to src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
index 68737470f..2b41039c0 100644
--- a/src/components/SharedComponents/ObsDetails/ObsEditHeaderRight.tsx
+++ b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
@@ -14,7 +14,7 @@ interface Props {
   observation: RealmObservation;
 }
 
-const ObsEditHeaderRight = ( {
+const HeaderEditIcon = ( {
   observation,
 }: Props ) => {
   const navigation = useNavigation( );
@@ -47,4 +47,4 @@ const ObsEditHeaderRight = ( {
   return null;
 };
 
-export default ObsEditHeaderRight;
+export default HeaderEditIcon;
diff --git a/tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
similarity index 84%
rename from tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js
rename to tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
index 3d708119b..1029f9ba9 100644
--- a/tests/unit/components/SharedComponents/ObsDetails/ObsEditHeaderRight.test.js
+++ b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
@@ -1,5 +1,5 @@
 import { fireEvent, screen } from "@testing-library/react-native";
-import ObsEditHeaderRight from "components/SharedComponents/ObsDetails/ObsEditHeaderRight";
+import HeaderEditIcon from "components/SharedComponents/ObsDetails/HeaderEditIcon";
 import React from "react";
 import useStore from "stores/useStore";
 import factory from "tests/factory";
@@ -15,7 +15,7 @@ jest.mock( "@react-navigation/native", () => ( {
   } ),
 } ) );
 
-describe( "ObsEditHeaderRight", () => {
+describe( "HeaderEditIcon", () => {
   const mockObservation = factory( "LocalObservation" );
 
   beforeEach( () => {
@@ -23,7 +23,7 @@ describe( "ObsEditHeaderRight", () => {
   } );
 
   it( "sets navigation header options", () => {
-    renderComponent( <ObsEditHeaderRight observation={mockObservation} /> );
+    renderComponent( <HeaderEditIcon observation={mockObservation} /> );
 
     expect( mockSetOptions ).toHaveBeenCalledWith(
       expect.objectContaining( {
@@ -41,7 +41,7 @@ describe( "ObsEditHeaderRight", () => {
       setMyObsOffsetToRestore,
     } );
 
-    renderComponent( <ObsEditHeaderRight observation={mockObservation} /> );
+    renderComponent( <HeaderEditIcon observation={mockObservation} /> );
 
     const headerRightCall = mockSetOptions.mock.calls[0][0];
     const HeaderRightComponent = headerRightCall.headerRight;

From 7bb98311983e163ec544b8de3444e58693686cfc Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 5 Jan 2026 10:20:29 -0600
Subject: [PATCH 06/18] MOB-1077: navigate back from obs edit discard changes
 for match flow

---
 src/components/ObsEdit/ObsEditHeader.js       | 20 +++++++++++++++----
 .../ObsDetails/HeaderEditIcon.tsx             |  2 +-
 src/sharedHooks/useNavigateToObsEdit.ts       |  9 +++++++--
 .../ObsDetails/HeaderEditIcon.test.js         |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/components/ObsEdit/ObsEditHeader.js b/src/components/ObsEdit/ObsEditHeader.js
index a642e8b7c..740d28d20 100644
--- a/src/components/ObsEdit/ObsEditHeader.js
+++ b/src/components/ObsEdit/ObsEditHeader.js
@@ -46,10 +46,16 @@ const ObsEditHeader = ( {
 
   const discardChanges = useCallback( ( ) => {
     setDiscardChangesSheetVisible( false );
-    exitObservationFlow( {
-      navigate: ( ) => navigateToObsDetails( navigation, currentObservation?.uuid ),
-    } );
-  }, [currentObservation?.uuid, exitObservationFlow, navigation] );
+    if ( params?.lastScreen === "Match" ) {
+      exitObservationFlow( {
+        navigate: ( ) => navigation.goBack( ),
+      } );
+    } else {
+      exitObservationFlow( {
+        navigate: ( ) => navigateToObsDetails( navigation, currentObservation?.uuid ),
+      } );
+    }
+  }, [currentObservation?.uuid, exitObservationFlow, navigation, params?.lastScreen] );
 
   const discardObservation = useCallback( ( ) => {
     setDiscardObservationSheetVisible( false );
@@ -86,6 +92,12 @@ const ObsEditHeader = ( {
   const handleBackButtonPress = useCallback( ( ) => {
     if ( params?.lastScreen === "Suggestions" ) {
       navigation.navigate( "Suggestions", { lastScreen: "ObsEdit" } );
+    } else if ( params?.lastScreen === "Match" ) {
+      if ( unsavedChanges ) {
+        setDiscardChangesSheetVisible( true );
+      } else {
+        navigation.goBack( );
+      }
     } else if ( shouldNavigateBack ) {
       navigation.goBack( );
     } else if ( !savedLocally || savedOrUploadedMultiObsFlow === true ) {
diff --git a/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
index 2b41039c0..071769958 100644
--- a/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
+++ b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
@@ -25,7 +25,7 @@ const HeaderEditIcon = ( {
     ( ) => (
       <INatIconButton
         testID="ObsEditIcon"
-        onPress={() => navigateToObsEdit( observation )}
+        onPress={() => navigateToObsEdit( observation, "Match" )}
         icon="pencil"
         color={String( colors?.darkGray )}
         accessibilityLabel={t( "Edit" )}
diff --git a/src/sharedHooks/useNavigateToObsEdit.ts b/src/sharedHooks/useNavigateToObsEdit.ts
index 98fcfe4d5..cef6e8a8a 100644
--- a/src/sharedHooks/useNavigateToObsEdit.ts
+++ b/src/sharedHooks/useNavigateToObsEdit.ts
@@ -9,9 +9,14 @@ function useNavigateToObsEdit() {
   const prepareObsEdit = useStore( state => state.prepareObsEdit );
   const setMyObsOffsetToRestore = useStore( state => state.setMyObsOffsetToRestore );
 
-  function navigateToObsEdit( localObservation: RealmObservation ) {
+  function navigateToObsEdit( localObservation: RealmObservation, lastScreen?: string ) {
     prepareObsEdit( localObservation );
-    navigation.navigate( "ObsEdit" );
+    navigation.navigate(
+      "ObsEdit",
+      lastScreen
+        ? { lastScreen }
+        : undefined,
+    );
     setMyObsOffsetToRestore();
   }
 
diff --git a/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
index 1029f9ba9..a36ade42d 100644
--- a/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
+++ b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
@@ -54,7 +54,7 @@ describe( "HeaderEditIcon", () => {
     fireEvent.press( editButton );
 
     expect( prepareObsEdit ).toHaveBeenCalledWith( mockObservation );
-    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit" );
+    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit", { lastScreen: "Match" } );
     expect( setMyObsOffsetToRestore ).toHaveBeenCalled();
   } );
 } );

From 6d62feaab53fb428312db06fd23079667f4421e8 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Tue, 6 Jan 2026 17:51:27 -0600
Subject: [PATCH 07/18] MOB-1077: wip detect changes made via match edit

---
 src/components/Match/Match.tsx          |  2 +-
 src/components/ObsEdit/ObsEditHeader.js | 28 ++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index a393644b5..66b8e07c0 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -80,7 +80,7 @@ const Match = ( {
             hasNoSuggestions={hasNoSuggestions}
             hasOnlyOtherSuggestions={hasOnlyOtherSuggestions}
           />
-          <HeaderEditIcon observation={observation} />
+          <HeaderEditIcon observation={observation} lastScreen="Match" />
         </View>
         <PhotosSection
           representativePhoto={topSuggestion?.taxon?.representative_photo}
diff --git a/src/components/ObsEdit/ObsEditHeader.js b/src/components/ObsEdit/ObsEditHeader.js
index 740d28d20..439244104 100644
--- a/src/components/ObsEdit/ObsEditHeader.js
+++ b/src/components/ObsEdit/ObsEditHeader.js
@@ -22,12 +22,14 @@ const { useRealm } = RealmContext;
 
 type Props = {
   observations: Object[],
-  currentObservation: Object
+  currentObservation: Object,
+  hasBeenUpdated: boolean,
 }
 
 const ObsEditHeader = ( {
   observations,
   currentObservation,
+  hasBeenUpdated,
 }: Props ): Node => {
   const unsavedChanges = useStore( state => state.unsavedChanges );
   const updateObservations = useStore( state => state.updateObservations );
@@ -46,16 +48,10 @@ const ObsEditHeader = ( {
 
   const discardChanges = useCallback( ( ) => {
     setDiscardChangesSheetVisible( false );
-    if ( params?.lastScreen === "Match" ) {
-      exitObservationFlow( {
-        navigate: ( ) => navigation.goBack( ),
-      } );
-    } else {
-      exitObservationFlow( {
-        navigate: ( ) => navigateToObsDetails( navigation, currentObservation?.uuid ),
-      } );
-    }
-  }, [currentObservation?.uuid, exitObservationFlow, navigation, params?.lastScreen] );
+    exitObservationFlow( {
+      navigate: ( ) => navigateToObsDetails( navigation, currentObservation?.uuid ),
+    } );
+  }, [currentObservation?.uuid, exitObservationFlow, navigation] );
 
   const discardObservation = useCallback( ( ) => {
     setDiscardObservationSheetVisible( false );
@@ -92,9 +88,12 @@ const ObsEditHeader = ( {
   const handleBackButtonPress = useCallback( ( ) => {
     if ( params?.lastScreen === "Suggestions" ) {
       navigation.navigate( "Suggestions", { lastScreen: "ObsEdit" } );
-    } else if ( params?.lastScreen === "Match" ) {
-      if ( unsavedChanges ) {
-        setDiscardChangesSheetVisible( true );
+    } else if ( params?.lastScreen === "Match" && unsavedChanges ) {
+      // When coming from the match screen, we don't have a version of the match to roll back to
+      // so if there are changes, they need to restart
+      // In the future, we'll support a rollback https://linear.app/inaturalist/issue/MOB-1091/match-screen-edit-flow-should-roll-back-changes-on-back-navigation
+      if ( hasBeenUpdated ) {
+        setDiscardObservationSheetVisible( true );
       } else {
         navigation.goBack( );
       }
@@ -118,6 +117,7 @@ const ObsEditHeader = ( {
     savedOrUploadedMultiObsFlow,
     shouldNavigateBack,
     unsavedChanges,
+    hasBeenUpdated,
   ] );
 
   const renderBackButton = useCallback( ( ) => {

From 31aaee3351caf9e52d4fcb9d77404d6b18d553f5 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Tue, 6 Jan 2026 17:53:25 -0600
Subject: [PATCH 08/18] MOB-1077: also in HeaderEditIcon

---
 .../SharedComponents/ObsDetails/HeaderEditIcon.tsx           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
index 071769958..3984d7bdb 100644
--- a/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
+++ b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
@@ -12,10 +12,12 @@ import colors from "styles/tailwindColors";
 
 interface Props {
   observation: RealmObservation;
+  lastScreen?: string;
 }
 
 const HeaderEditIcon = ( {
   observation,
+  lastScreen,
 }: Props ) => {
   const navigation = useNavigation( );
   const { t } = useTranslation( );
@@ -25,7 +27,7 @@ const HeaderEditIcon = ( {
     ( ) => (
       <INatIconButton
         testID="ObsEditIcon"
-        onPress={() => navigateToObsEdit( observation, "Match" )}
+        onPress={() => navigateToObsEdit( observation, lastScreen )}
         icon="pencil"
         color={String( colors?.darkGray )}
         accessibilityLabel={t( "Edit" )}
@@ -36,6 +38,7 @@ const HeaderEditIcon = ( {
       observation,
       navigateToObsEdit,
       t,
+      lastScreen,
     ],
   );
 

From 20fd3559bb115dc0cbf6bbac5dc4a5c70e5fbb96 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:55:29 -0600
Subject: [PATCH 09/18] MOB-968: don't make user discard match for automatic
 obs updates

---
 src/components/ObsEdit/EvidenceSectionContainer.js |  6 ++++--
 src/components/ObsEdit/ObsEdit.js                  | 14 ++++++++++++--
 src/components/ObsEdit/ObsEditHeader.js            | 10 +++++-----
 .../ObsDetails/HeaderEditIcon.test.js              |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/ObsEdit/EvidenceSectionContainer.js b/src/components/ObsEdit/EvidenceSectionContainer.js
index 950040d0f..3161dfef0 100644
--- a/src/components/ObsEdit/EvidenceSectionContainer.js
+++ b/src/components/ObsEdit/EvidenceSectionContainer.js
@@ -25,7 +25,8 @@ type Props = {
   onLocationPress: ( ) => void,
   passesEvidenceTest: boolean,
   setPassesEvidenceTest: Function,
-  updateObservationKeys: Function
+  updateObservationKeys: Function,
+  updateObservationKeysFromUserInteraction: Function
 }
 
 const EvidenceSectionContainer = ( {
@@ -35,6 +36,7 @@ const EvidenceSectionContainer = ( {
   passesEvidenceTest,
   setPassesEvidenceTest,
   updateObservationKeys,
+  updateObservationKeysFromUserInteraction,
 }: Props ): Node => {
   const cameraRollUris = useStore( state => state.cameraRollUris );
   const isNewObs = !!currentObservation?._synced_at
@@ -175,7 +177,7 @@ const EvidenceSectionContainer = ( {
       passesEvidenceTest={fullEvidenceTest}
       setShowAddEvidenceSheet={setShowAddEvidenceSheet}
       showAddEvidenceSheet={showAddEvidenceSheet}
-      updateObservationKeys={updateObservationKeys}
+      updateObservationKeys={updateObservationKeysFromUserInteraction}
     />
   );
 };
diff --git a/src/components/ObsEdit/ObsEdit.js b/src/components/ObsEdit/ObsEdit.js
index a75cc8fb7..4d21ff1b1 100644
--- a/src/components/ObsEdit/ObsEdit.js
+++ b/src/components/ObsEdit/ObsEdit.js
@@ -38,6 +38,7 @@ const ObsEdit = ( ): Node => {
   const [needLocation, setNeedLocation] = useState(
     shouldFetchObservationLocation( currentObservation ),
   );
+  const [hasUserEdited, setHasUserEdited] = useState( false );
   const isFocused = useIsFocused( );
   const currentUser = useCurrentUser( );
   const {
@@ -81,6 +82,11 @@ const ObsEdit = ( ): Node => {
     resetUploadObservationsSlice( );
   }, [resetUploadObservationsSlice] );
 
+  const updateObservationKeysFromUserInteraction = useCallback( ( ...args ) => {
+    setHasUserEdited( true );
+    updateObservationKeys( ...args );
+  }, [updateObservationKeys] );
+
   const navToLocationPicker = useCallback( ( ) => {
     stopWatch( subscriptionId );
     navigation.navigate( "LocationPicker" );
@@ -113,6 +119,7 @@ const ObsEdit = ( ): Node => {
           <ObsEditHeader
             currentObservation={currentObservation}
             observations={observations}
+            hasUserEdited={hasUserEdited}
           />
           {currentObservation && (
             <View
@@ -139,16 +146,19 @@ const ObsEdit = ( ): Node => {
                   passesEvidenceTest={passesEvidenceTest}
                   setPassesEvidenceTest={setPassesEvidenceTest}
                   updateObservationKeys={updateObservationKeys}
+                  updateObservationKeysFromUserInteraction={
+                    updateObservationKeysFromUserInteraction
+                  }
                 />
                 <IdentificationSection
                   currentObservation={currentObservation}
                   resetScreen={resetScreen}
                   setResetScreen={setResetScreen}
-                  updateObservationKeys={updateObservationKeys}
+                  updateObservationKeys={updateObservationKeysFromUserInteraction}
                 />
                 <OtherDataSection
                   currentObservation={currentObservation}
-                  updateObservationKeys={updateObservationKeys}
+                  updateObservationKeys={updateObservationKeysFromUserInteraction}
                 />
               </Animated.View>
             </View>
diff --git a/src/components/ObsEdit/ObsEditHeader.js b/src/components/ObsEdit/ObsEditHeader.js
index 439244104..0e416a9b9 100644
--- a/src/components/ObsEdit/ObsEditHeader.js
+++ b/src/components/ObsEdit/ObsEditHeader.js
@@ -23,13 +23,13 @@ const { useRealm } = RealmContext;
 type Props = {
   observations: Object[],
   currentObservation: Object,
-  hasBeenUpdated: boolean,
+  hasUserEdited: boolean,
 }
 
 const ObsEditHeader = ( {
   observations,
   currentObservation,
-  hasBeenUpdated,
+  hasUserEdited,
 }: Props ): Node => {
   const unsavedChanges = useStore( state => state.unsavedChanges );
   const updateObservations = useStore( state => state.updateObservations );
@@ -88,11 +88,11 @@ const ObsEditHeader = ( {
   const handleBackButtonPress = useCallback( ( ) => {
     if ( params?.lastScreen === "Suggestions" ) {
       navigation.navigate( "Suggestions", { lastScreen: "ObsEdit" } );
-    } else if ( params?.lastScreen === "Match" && unsavedChanges ) {
+    } else if ( params?.lastScreen === "Match" ) {
       // When coming from the match screen, we don't have a version of the match to roll back to
       // so if there are changes, they need to restart
       // In the future, we'll support a rollback https://linear.app/inaturalist/issue/MOB-1091/match-screen-edit-flow-should-roll-back-changes-on-back-navigation
-      if ( hasBeenUpdated ) {
+      if ( hasUserEdited ) {
         setDiscardObservationSheetVisible( true );
       } else {
         navigation.goBack( );
@@ -117,7 +117,7 @@ const ObsEditHeader = ( {
     savedOrUploadedMultiObsFlow,
     shouldNavigateBack,
     unsavedChanges,
-    hasBeenUpdated,
+    hasUserEdited,
   ] );
 
   const renderBackButton = useCallback( ( ) => {
diff --git a/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
index a36ade42d..1029f9ba9 100644
--- a/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
+++ b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
@@ -54,7 +54,7 @@ describe( "HeaderEditIcon", () => {
     fireEvent.press( editButton );
 
     expect( prepareObsEdit ).toHaveBeenCalledWith( mockObservation );
-    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit", { lastScreen: "Match" } );
+    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit" );
     expect( setMyObsOffsetToRestore ).toHaveBeenCalled();
   } );
 } );

From cf5ab3abe25ac457b5addb5a8884f6dc9509fc7e Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 12 Jan 2026 12:17:42 -0600
Subject: [PATCH 10/18] MOB-968: test fix

---
 .../SharedComponents/ObsDetails/HeaderEditIcon.test.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
index 1029f9ba9..9d35c9a98 100644
--- a/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
+++ b/tests/unit/components/SharedComponents/ObsDetails/HeaderEditIcon.test.js
@@ -54,7 +54,7 @@ describe( "HeaderEditIcon", () => {
     fireEvent.press( editButton );
 
     expect( prepareObsEdit ).toHaveBeenCalledWith( mockObservation );
-    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit" );
+    expect( mockNavigate ).toHaveBeenCalledWith( "ObsEdit", undefined );
     expect( setMyObsOffsetToRestore ).toHaveBeenCalled();
   } );
 } );

From 892b06de096828a3c4dbe42c17ec9e7d839ed60b Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Mon, 19 Jan 2026 22:32:16 -0600
Subject: [PATCH 11/18] MOB-968: saved match header too tall

---
 src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
index 52d12d413..57842dce9 100644
--- a/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
+++ b/src/components/ObsDetailsDefaultMode/SavedMatch/SavedMatch.tsx
@@ -30,7 +30,7 @@ const SavedMatch = ( {
   return (
     <ScrollViewWrapper testID="SavedMatch.container">
       <HeaderEditIcon observation={observation} />
-      <View className={`${matchCardClassTop} mt-[10px]`}>
+      <View className={matchCardClassTop}>
         <MatchHeader hideObservationStatus topSuggestion={observation} />
       </View>
       <PhotosSection

From 41fa4b7734b46552c9fb3c9e115453c0c4f73283 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:32:59 -0600
Subject: [PATCH 12/18] MOB-968: unrefactor Match screen

---
 src/components/Match/Match.tsx                | 229 ++++++++++++------
 .../Match/MatchScreenTopContent.tsx           |  44 ----
 .../Match/MatchScreenTopContent.test.js       |  78 ------
 3 files changed, 153 insertions(+), 198 deletions(-)
 delete mode 100644 src/components/Match/MatchScreenTopContent.tsx
 delete mode 100644 tests/unit/components/Match/MatchScreenTopContent.test.js

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index 29f22e1da..5c3867d73 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -5,9 +5,8 @@ import LocationSection
 import MapSection
   from "components/ObsDetailsDefaultMode/MapSection/MapSection";
 import {
-  Body2, Button, Heading3, ScrollViewWrapper,
+  ActivityIndicator, Body2, Button, Heading3, ScrollViewWrapper,
 } from "components/SharedComponents";
-import HeaderEditIcon from "components/SharedComponents/ObsDetails/HeaderEditIcon";
 import { View } from "components/styledComponents";
 import _ from "lodash";
 import React from "react";
@@ -22,7 +21,7 @@ import AdditionalSuggestionsScroll
 import EmptyMapSection from "./EmptyMapSection";
 import IconicSuggestionsScroll from "./IconicSuggestions/IconicSuggestionsScroll";
 import type { MatchButtonAction } from "./MatchContainer";
-import MatchScreenTopContent from "./MatchScreenTopContent";
+import MatchHeader from "./MatchHeader";
 import PhotosSection from "./PhotosSection";
 import SaveDiscardButtons from "./SaveDiscardButtons";
 
@@ -67,68 +66,90 @@ const Match = ( {
 
   const latitude = observation?.privateLatitude || observation?.latitude;
   const taxon = topSuggestion?.taxon;
-  const hasNoSuggestions = !topSuggestion && otherSuggestions.length === 0;
-  const hasOnlyOtherSuggestions = !topSuggestion && otherSuggestions.length > 0;
 
-  return (
-    <>
-      <ScrollViewWrapper scrollRef={scrollRef}>
-        <View className={matchCardClassTop}>
-          <MatchScreenTopContent
-            suggestionsLoading={suggestionsLoading}
-            topSuggestion={topSuggestion}
-            hasNoSuggestions={hasNoSuggestions}
-            hasOnlyOtherSuggestions={hasOnlyOtherSuggestions}
-          />
-          <HeaderEditIcon observation={observation} lastScreen="Match" />
-        </View>
-        <PhotosSection
-          representativePhoto={topSuggestion?.taxon?.representative_photo}
-          taxon={taxon}
-          obsPhotos={obsPhotos}
-          navToTaxonDetails={navToTaxonDetails}
-        />
-        {topSuggestion && (
-          <>
-            <View className="border-[1.5px] border-white" />
-            {!latitude
-              ? (
-                <EmptyMapSection
-                  handleAddLocationPressed={handleAddLocationPressed}
-                  isFetchingLocation={isFetchingLocation}
-                />
-              )
-              : (
-                <MapSection observation={observation} taxon={taxon} />
-              )}
-            <LocationSection
-              belongsToCurrentUser
-              observation={observation}
-            />
-            <View className={matchCardClassBottom} />
+  // In case there are no suggestions, at all
+  if ( !topSuggestion && otherSuggestions.length === 0 ) {
+    return (
+      <>
+        <ScrollViewWrapper scrollRef={scrollRef}>
+          <View className={matchCardClassTop}>
             {
-              isConnected && (
+              suggestionsLoading
+                ? (
+                  <ActivityIndicator size={33} />
+                )
+                : (
+                  <Body2>
+                    {t( "The-AI-is-not-confident-Upload-to-ask-the-community" )}
+                  </Body2>
+                )
+            }
+          </View>
+          <PhotosSection
+            taxon={taxon}
+            obsPhotos={obsPhotos}
+            navToTaxonDetails={navToTaxonDetails}
+          />
+          { !suggestionsLoading
+          && (
+            <View className="mt-5">
+              <Heading3 className="mx-5">
+                {t( "Do-you-know-what-group-this-is-in" )}
+              </Heading3>
+              <IconicSuggestionsScroll
+                iconicTaxonChosen={iconicTaxon}
+                onIconicTaxonChosen={setIconicTaxon}
+              />
+              <Body2 className="mx-5 my-[30px]">
+                {t( "If-you-save-this-observation-and-upload-it-to-iNaturalist" )}
+              </Body2>
+              <Body2 className="mx-3 my-[30px]">
+                {t( "Or-you-can-try-to-get-a-clearer-photo-by-zooming-in-getting-closer" )}
+              </Body2>
+              {!latitude && (
                 <Button
                   className="mx-4 mb-[30px]"
-                  level="primary"
-                  text={taxon?.rank_level === 10
-                    ? t( "LEARN-MORE-ABOUT-THIS-SPECIES" )
-                    : t( "LEARN-MORE-ABOUT-THIS-GROUP" )}
-                  onPress={navToTaxonDetails}
-                  accessibilityHint={t( "Navigates-to-taxon-details" )}
+                  level="neutral"
+                  text={t( "ADD-LOCATION-FOR-BETTER-IDS" )}
+                  loading={isFetchingLocation}
+                  disabled={isFetchingLocation}
+                  onPress={handleAddLocationPressed}
+                  accessibilityLabel={t( "Edit-location" )}
+                  accessibilityHint={t( "Add-location-to-refresh-suggestions" )}
                 />
-              )
-            }
-            <View className="mb-[30px]">
-              <AdditionalSuggestionsScroll
-                onSuggestionChosen={onSuggestionChosen}
-                otherSuggestions={otherSuggestions}
-                suggestionsLoading={suggestionsLoading}
-              />
+              )}
             </View>
-          </>
-        )}
-        {hasOnlyOtherSuggestions && (
+          )}
+        </ScrollViewWrapper>
+        <SaveDiscardButtons
+          handlePress={handleSaveOrDiscardPress}
+        />
+      </>
+    );
+  }
+  // In case there are suggestions but no top suggestion
+  if ( !topSuggestion ) {
+    return (
+      <>
+        <ScrollViewWrapper scrollRef={scrollRef}>
+          <View className={matchCardClassTop}>
+            {
+              suggestionsLoading
+                ? (
+                  <ActivityIndicator size={33} />
+                )
+                : (
+                  <Body2>
+                    {t( "The-AI-is-not-confident-It-may-be-one-of-the-IDs-below" )}
+                  </Body2>
+                )
+            }
+          </View>
+          <PhotosSection
+            taxon={taxon}
+            obsPhotos={obsPhotos}
+            navToTaxonDetails={navToTaxonDetails}
+          />
           <View className="mt-5 mb-[30px]">
             <AdditionalSuggestionsScroll
               noTopSuggestion
@@ -137,24 +158,80 @@ const Match = ( {
               suggestionsLoading={suggestionsLoading}
             />
           </View>
-        )}
-        {hasNoSuggestions && !suggestionsLoading && (
-          <View className="mt-5">
-            <Heading3 className="mx-5">
-              {t( "Do-you-know-what-group-this-is-in" )}
-            </Heading3>
-            <IconicSuggestionsScroll
-              iconicTaxonChosen={iconicTaxon}
-              onIconicTaxonChosen={setIconicTaxon}
+          {!latitude && (
+            <Button
+              className="mx-4 mb-[30px]"
+              level="neutral"
+              text={t( "ADD-LOCATION-FOR-BETTER-IDS" )}
+              onPress={handleAddLocationPressed}
+              loading={isFetchingLocation}
+              disabled={isFetchingLocation}
+              accessibilityLabel={t( "Edit-location" )}
+              accessibilityHint={t( "Add-location-to-refresh-suggestions" )}
             />
-            <Body2 className="mx-5 my-[30px]">
-              {t( "If-you-save-this-observation-and-upload-it-to-iNaturalist" )}
-            </Body2>
-            <Body2 className="mx-3 my-[30px]">
-              {t( "Or-you-can-try-to-get-a-clearer-photo-by-zooming-in-getting-closer" )}
-            </Body2>
-          </View>
-        )}
+          )}
+        </ScrollViewWrapper>
+        <SaveDiscardButtons
+          handlePress={handleSaveOrDiscardPress}
+        />
+      </>
+    );
+  }
+
+  return (
+    <>
+      <ScrollViewWrapper scrollRef={scrollRef}>
+        <View className={matchCardClassTop}>
+          {
+            suggestionsLoading
+              ? (
+                <ActivityIndicator size={33} />
+              )
+              : <MatchHeader topSuggestion={topSuggestion} />
+          }
+        </View>
+        <PhotosSection
+          representativePhoto={topSuggestion?.taxon?.representative_photo}
+          taxon={taxon}
+          obsPhotos={obsPhotos}
+          navToTaxonDetails={navToTaxonDetails}
+        />
+        <View className="border-[1.5px] border-white" />
+        {!latitude
+          ? (
+            <EmptyMapSection
+              handleAddLocationPressed={handleAddLocationPressed}
+              isFetchingLocation={isFetchingLocation}
+            />
+          )
+          : (
+            <MapSection observation={observation} taxon={taxon} />
+          )}
+        <LocationSection
+          belongsToCurrentUser
+          observation={observation}
+        />
+        <View className={matchCardClassBottom} />
+        {
+          isConnected && (
+            <Button
+              className="mx-4 mb-[30px]"
+              level="primary"
+              text={taxon?.rank_level === 10
+                ? t( "LEARN-MORE-ABOUT-THIS-SPECIES" )
+                : t( "LEARN-MORE-ABOUT-THIS-GROUP" )}
+              onPress={navToTaxonDetails}
+              accessibilityHint={t( "Navigates-to-taxon-details" )}
+            />
+          )
+        }
+        <View className="mb-[30px]">
+          <AdditionalSuggestionsScroll
+            onSuggestionChosen={onSuggestionChosen}
+            otherSuggestions={otherSuggestions}
+            suggestionsLoading={suggestionsLoading}
+          />
+        </View>
         {!latitude && (
           <Button
             className="mx-4 mb-[30px]"
diff --git a/src/components/Match/MatchScreenTopContent.tsx b/src/components/Match/MatchScreenTopContent.tsx
deleted file mode 100644
index 7b227f7ff..000000000
--- a/src/components/Match/MatchScreenTopContent.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { ApiSuggestion } from "api/types";
-import { ActivityIndicator, Body2 } from "components/SharedComponents";
-import React from "react";
-import { useTranslation } from "sharedHooks";
-
-import MatchHeader from "./MatchHeader";
-
-type Props = {
-  suggestionsLoading: boolean;
-  topSuggestion?: ApiSuggestion;
-  hasNoSuggestions: boolean;
-  hasOnlyOtherSuggestions: boolean;
-}
-
-const MatchScreenTopContent = ( {
-  suggestionsLoading,
-  topSuggestion,
-  hasNoSuggestions,
-  hasOnlyOtherSuggestions,
-}: Props ) => {
-  const { t } = useTranslation( );
-
-  if ( suggestionsLoading ) {
-    return <ActivityIndicator size={33} />;
-  }
-
-  return (
-    <>
-      {topSuggestion && <MatchHeader topSuggestion={topSuggestion} />}
-      {hasNoSuggestions && (
-        <Body2>
-          {t( "The-AI-is-not-confident-Upload-to-ask-the-community" )}
-        </Body2>
-      )}
-      {hasOnlyOtherSuggestions && (
-        <Body2>
-          {t( "The-AI-is-not-confident-It-may-be-one-of-the-IDs-below" )}
-        </Body2>
-      )}
-    </>
-  );
-};
-
-export default MatchScreenTopContent;
diff --git a/tests/unit/components/Match/MatchScreenTopContent.test.js b/tests/unit/components/Match/MatchScreenTopContent.test.js
deleted file mode 100644
index 7486c8bfd..000000000
--- a/tests/unit/components/Match/MatchScreenTopContent.test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { screen } from "@testing-library/react-native";
-import MatchScreenTopContent from "components/Match/MatchScreenTopContent";
-import React from "react";
-import factory from "tests/factory";
-import { renderComponent } from "tests/helpers/render";
-
-describe( "MatchScreenTopContent", () => {
-  const topSuggestion = {
-    combined_score: 95,
-    taxon: factory( "LocalTaxon", {
-      name: "Silphium perfoliatum",
-      preferred_common_name: "Cup Plant",
-      rank_level: 10,
-    } ),
-  };
-
-  it( "displays MatchHeader when topSuggestion is provided", () => {
-    renderComponent(
-      <MatchScreenTopContent
-        suggestionsLoading={false}
-        topSuggestion={topSuggestion}
-        hasNoSuggestions={false}
-        hasOnlyOtherSuggestions={false}
-      />,
-    );
-
-    expect( screen.getByText( "Cup Plant" ) ).toBeVisible();
-  } );
-
-  it( "shows message for hasNoSuggestions", () => {
-    renderComponent(
-      <MatchScreenTopContent
-        suggestionsLoading={false}
-        hasNoSuggestions
-        hasOnlyOtherSuggestions={false}
-      />,
-    );
-
-    expect( screen.getByText(
-      "The AI is not confident. Upload to ask the community.",
-    ) ).toBeVisible();
-  } );
-
-  it( "shows message for hasOnlyOtherSuggestions", () => {
-    renderComponent(
-      <MatchScreenTopContent
-        suggestionsLoading={false}
-        hasNoSuggestions={false}
-        hasOnlyOtherSuggestions
-      />,
-    );
-
-    expect( screen.getByText(
-      "The AI is not confident. It may be one of the IDs below.",
-    ) ).toBeVisible();
-  } );
-
-  it( "renders loading state over other content", () => {
-    const topSuggestion = {
-      combined_score: 90,
-      taxon: factory( "LocalTaxon", { rank_level: 10 } ),
-    };
-
-    renderComponent(
-      <MatchScreenTopContent
-        suggestionsLoading
-        topSuggestion={topSuggestion}
-        hasNoSuggestions
-        hasOnlyOtherSuggestions
-      />,
-    );
-
-    const activityIndicator = screen.getByRole( "progressbar" );
-    expect( activityIndicator ).toBeVisible();
-
-    expect( screen.queryByText( /Cup Plant/i ) ).toBeFalsy();
-  } );
-} );

From 62eda7fd1569792f252a37e7f59523f164acac41 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:34:38 -0600
Subject: [PATCH 13/18] MOB-968: replace header edit

---
 src/components/Match/Match.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index 5c3867d73..c8e399941 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -7,6 +7,7 @@ import MapSection
 import {
   ActivityIndicator, Body2, Button, Heading3, ScrollViewWrapper,
 } from "components/SharedComponents";
+import HeaderEditIcon from "components/SharedComponents/ObsDetails/HeaderEditIcon";
 import { View } from "components/styledComponents";
 import _ from "lodash";
 import React from "react";
@@ -84,6 +85,7 @@ const Match = ( {
                   </Body2>
                 )
             }
+            <HeaderEditIcon observation={observation} />
           </View>
           <PhotosSection
             taxon={taxon}
@@ -144,6 +146,7 @@ const Match = ( {
                   </Body2>
                 )
             }
+            <HeaderEditIcon observation={observation} />
           </View>
           <PhotosSection
             taxon={taxon}
@@ -189,6 +192,7 @@ const Match = ( {
               )
               : <MatchHeader topSuggestion={topSuggestion} />
           }
+          <HeaderEditIcon observation={observation} />
         </View>
         <PhotosSection
           representativePhoto={topSuggestion?.taxon?.representative_photo}

From 91b52bbe7d88329f3369ce55f3953964e15fec31 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:53:09 -0600
Subject: [PATCH 14/18] MOB-968 revert hasUserEdit logic

---
 src/components/ObsEdit/EvidenceSectionContainer.js |  6 ++----
 src/components/ObsEdit/ObsEdit.js                  | 14 ++------------
 src/components/ObsEdit/ObsEditHeader.js            |  7 ++-----
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/components/ObsEdit/EvidenceSectionContainer.js b/src/components/ObsEdit/EvidenceSectionContainer.js
index 3161dfef0..950040d0f 100644
--- a/src/components/ObsEdit/EvidenceSectionContainer.js
+++ b/src/components/ObsEdit/EvidenceSectionContainer.js
@@ -25,8 +25,7 @@ type Props = {
   onLocationPress: ( ) => void,
   passesEvidenceTest: boolean,
   setPassesEvidenceTest: Function,
-  updateObservationKeys: Function,
-  updateObservationKeysFromUserInteraction: Function
+  updateObservationKeys: Function
 }
 
 const EvidenceSectionContainer = ( {
@@ -36,7 +35,6 @@ const EvidenceSectionContainer = ( {
   passesEvidenceTest,
   setPassesEvidenceTest,
   updateObservationKeys,
-  updateObservationKeysFromUserInteraction,
 }: Props ): Node => {
   const cameraRollUris = useStore( state => state.cameraRollUris );
   const isNewObs = !!currentObservation?._synced_at
@@ -177,7 +175,7 @@ const EvidenceSectionContainer = ( {
       passesEvidenceTest={fullEvidenceTest}
       setShowAddEvidenceSheet={setShowAddEvidenceSheet}
       showAddEvidenceSheet={showAddEvidenceSheet}
-      updateObservationKeys={updateObservationKeysFromUserInteraction}
+      updateObservationKeys={updateObservationKeys}
     />
   );
 };
diff --git a/src/components/ObsEdit/ObsEdit.js b/src/components/ObsEdit/ObsEdit.js
index 4d21ff1b1..a75cc8fb7 100644
--- a/src/components/ObsEdit/ObsEdit.js
+++ b/src/components/ObsEdit/ObsEdit.js
@@ -38,7 +38,6 @@ const ObsEdit = ( ): Node => {
   const [needLocation, setNeedLocation] = useState(
     shouldFetchObservationLocation( currentObservation ),
   );
-  const [hasUserEdited, setHasUserEdited] = useState( false );
   const isFocused = useIsFocused( );
   const currentUser = useCurrentUser( );
   const {
@@ -82,11 +81,6 @@ const ObsEdit = ( ): Node => {
     resetUploadObservationsSlice( );
   }, [resetUploadObservationsSlice] );
 
-  const updateObservationKeysFromUserInteraction = useCallback( ( ...args ) => {
-    setHasUserEdited( true );
-    updateObservationKeys( ...args );
-  }, [updateObservationKeys] );
-
   const navToLocationPicker = useCallback( ( ) => {
     stopWatch( subscriptionId );
     navigation.navigate( "LocationPicker" );
@@ -119,7 +113,6 @@ const ObsEdit = ( ): Node => {
           <ObsEditHeader
             currentObservation={currentObservation}
             observations={observations}
-            hasUserEdited={hasUserEdited}
           />
           {currentObservation && (
             <View
@@ -146,19 +139,16 @@ const ObsEdit = ( ): Node => {
                   passesEvidenceTest={passesEvidenceTest}
                   setPassesEvidenceTest={setPassesEvidenceTest}
                   updateObservationKeys={updateObservationKeys}
-                  updateObservationKeysFromUserInteraction={
-                    updateObservationKeysFromUserInteraction
-                  }
                 />
                 <IdentificationSection
                   currentObservation={currentObservation}
                   resetScreen={resetScreen}
                   setResetScreen={setResetScreen}
-                  updateObservationKeys={updateObservationKeysFromUserInteraction}
+                  updateObservationKeys={updateObservationKeys}
                 />
                 <OtherDataSection
                   currentObservation={currentObservation}
-                  updateObservationKeys={updateObservationKeysFromUserInteraction}
+                  updateObservationKeys={updateObservationKeys}
                 />
               </Animated.View>
             </View>
diff --git a/src/components/ObsEdit/ObsEditHeader.js b/src/components/ObsEdit/ObsEditHeader.js
index 0e416a9b9..ba8451eb8 100644
--- a/src/components/ObsEdit/ObsEditHeader.js
+++ b/src/components/ObsEdit/ObsEditHeader.js
@@ -23,13 +23,11 @@ const { useRealm } = RealmContext;
 type Props = {
   observations: Object[],
   currentObservation: Object,
-  hasUserEdited: boolean,
 }
 
 const ObsEditHeader = ( {
   observations,
   currentObservation,
-  hasUserEdited,
 }: Props ): Node => {
   const unsavedChanges = useStore( state => state.unsavedChanges );
   const updateObservations = useStore( state => state.updateObservations );
@@ -88,11 +86,11 @@ const ObsEditHeader = ( {
   const handleBackButtonPress = useCallback( ( ) => {
     if ( params?.lastScreen === "Suggestions" ) {
       navigation.navigate( "Suggestions", { lastScreen: "ObsEdit" } );
-    } else if ( params?.lastScreen === "Match" ) {
+    } else if ( params?.lastScreen === "Match" && unsavedChanges ) {
       // When coming from the match screen, we don't have a version of the match to roll back to
       // so if there are changes, they need to restart
       // In the future, we'll support a rollback https://linear.app/inaturalist/issue/MOB-1091/match-screen-edit-flow-should-roll-back-changes-on-back-navigation
-      if ( hasUserEdited ) {
+      if ( unsavedChanges ) {
         setDiscardObservationSheetVisible( true );
       } else {
         navigation.goBack( );
@@ -117,7 +115,6 @@ const ObsEditHeader = ( {
     savedOrUploadedMultiObsFlow,
     shouldNavigateBack,
     unsavedChanges,
-    hasUserEdited,
   ] );
 
   const renderBackButton = useCallback( ( ) => {

From f774d0854794b50d2b8e5d7e08f2582d45d868f1 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Tue, 20 Jan 2026 15:30:02 -0600
Subject: [PATCH 15/18] MOB-968: last screen from Match

---
 src/components/Match/Match.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index c8e399941..20344aa4c 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -85,7 +85,7 @@ const Match = ( {
                   </Body2>
                 )
             }
-            <HeaderEditIcon observation={observation} />
+            <HeaderEditIcon observation={observation} lastScreen="Match" />
           </View>
           <PhotosSection
             taxon={taxon}

From 2c104ecbda58d0a1c74cdd0261fe21ef41bc5103 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Wed, 21 Jan 2026 10:55:48 -0600
Subject: [PATCH 16/18] MOB-968: add taxon to current observation fr match on
 edit

---
 src/components/Match/Match.tsx                    |  6 +++---
 src/components/ObsEdit/ObsEdit.js                 |  1 +
 .../ObsDetails/HeaderEditIcon.tsx                 | 15 ++++++++++-----
 src/sharedHooks/useNavigateToObsEdit.ts           | 11 ++++++++---
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index 20344aa4c..a448cca3d 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -85,7 +85,7 @@ const Match = ( {
                   </Body2>
                 )
             }
-            <HeaderEditIcon observation={observation} lastScreen="Match" />
+            <HeaderEditIcon observation={observation} lastScreen="Match" taxon={iconicTaxon} />
           </View>
           <PhotosSection
             taxon={taxon}
@@ -146,7 +146,7 @@ const Match = ( {
                   </Body2>
                 )
             }
-            <HeaderEditIcon observation={observation} />
+            <HeaderEditIcon observation={observation} lastScreen="Match" />
           </View>
           <PhotosSection
             taxon={taxon}
@@ -192,7 +192,7 @@ const Match = ( {
               )
               : <MatchHeader topSuggestion={topSuggestion} />
           }
-          <HeaderEditIcon observation={observation} />
+          <HeaderEditIcon observation={observation} lastScreen="Match" taxon={taxon} />
         </View>
         <PhotosSection
           representativePhoto={topSuggestion?.taxon?.representative_photo}
diff --git a/src/components/ObsEdit/ObsEdit.js b/src/components/ObsEdit/ObsEdit.js
index a75cc8fb7..c21114488 100644
--- a/src/components/ObsEdit/ObsEdit.js
+++ b/src/components/ObsEdit/ObsEdit.js
@@ -36,6 +36,7 @@ const ObsEdit = ( ): Node => {
   const [passesEvidenceTest, setPassesEvidenceTest] = useState( false );
   const [resetScreen, setResetScreen] = useState( false );
   const [needLocation, setNeedLocation] = useState(
+    // take a look 👀
     shouldFetchObservationLocation( currentObservation ),
   );
   const isFocused = useIsFocused( );
diff --git a/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
index 3984d7bdb..a56bb0dc9 100644
--- a/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
+++ b/src/components/SharedComponents/ObsDetails/HeaderEditIcon.tsx
@@ -1,9 +1,10 @@
 import { useNavigation } from "@react-navigation/native";
+import type { ApiTaxon } from "api/types";
 import {
   INatIconButton,
 } from "components/SharedComponents";
 import React, { useCallback, useEffect } from "react";
-import type { RealmObservation } from "realmModels/types";
+import type { RealmObservation, RealmTaxon } from "realmModels/types";
 import {
   useNavigateToObsEdit,
   useTranslation,
@@ -13,21 +14,27 @@ import colors from "styles/tailwindColors";
 interface Props {
   observation: RealmObservation;
   lastScreen?: string;
+  taxon?: ApiTaxon | RealmTaxon;
 }
 
 const HeaderEditIcon = ( {
   observation,
   lastScreen,
+  taxon,
 }: Props ) => {
   const navigation = useNavigation( );
   const { t } = useTranslation( );
   const navigateToObsEdit = useNavigateToObsEdit( );
 
+  const handleEditPress = useCallback( ( ) => {
+    navigateToObsEdit( observation, lastScreen, taxon );
+  }, [taxon, navigateToObsEdit, observation, lastScreen] );
+
   const headerRight = useCallback(
     ( ) => (
       <INatIconButton
         testID="ObsEditIcon"
-        onPress={() => navigateToObsEdit( observation, lastScreen )}
+        onPress={handleEditPress}
         icon="pencil"
         color={String( colors?.darkGray )}
         accessibilityLabel={t( "Edit" )}
@@ -35,10 +42,8 @@ const HeaderEditIcon = ( {
       />
     ),
     [
-      observation,
-      navigateToObsEdit,
+      handleEditPress,
       t,
-      lastScreen,
     ],
   );
 
diff --git a/src/sharedHooks/useNavigateToObsEdit.ts b/src/sharedHooks/useNavigateToObsEdit.ts
index cef6e8a8a..f7b436d03 100644
--- a/src/sharedHooks/useNavigateToObsEdit.ts
+++ b/src/sharedHooks/useNavigateToObsEdit.ts
@@ -1,7 +1,8 @@
 import type { ParamListBase } from "@react-navigation/native";
 import { useNavigation } from "@react-navigation/native";
 import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
-import type { RealmObservation } from "realmModels/types";
+import type { ApiTaxon } from "api/types";
+import type { RealmObservation, RealmTaxon } from "realmModels/types";
 import useStore from "stores/useStore";
 
 function useNavigateToObsEdit() {
@@ -9,8 +10,12 @@ function useNavigateToObsEdit() {
   const prepareObsEdit = useStore( state => state.prepareObsEdit );
   const setMyObsOffsetToRestore = useStore( state => state.setMyObsOffsetToRestore );
 
-  function navigateToObsEdit( localObservation: RealmObservation, lastScreen?: string ) {
-    prepareObsEdit( localObservation );
+  function navigateToObsEdit(
+    localObservation: RealmObservation,
+    lastScreen?: string,
+    taxon?: ApiTaxon | RealmTaxon,
+  ) {
+    prepareObsEdit( { ...localObservation, taxon } );
     navigation.navigate(
       "ObsEdit",
       lastScreen

From dae87109eb2d82d8fc1b73632fb7e137b01d0464 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Wed, 4 Feb 2026 10:29:15 -0600
Subject: [PATCH 17/18] MOB-968: pass unmutated taxon to be saved

---
 src/components/Match/Match.tsx          | 6 ++++--
 src/components/Match/MatchContainer.tsx | 1 +
 src/sharedHooks/useNavigateToObsEdit.ts | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Match/Match.tsx b/src/components/Match/Match.tsx
index a448cca3d..9b92a7e0b 100644
--- a/src/components/Match/Match.tsx
+++ b/src/components/Match/Match.tsx
@@ -1,5 +1,5 @@
 import { useNetInfo } from "@react-native-community/netinfo";
-import type { ApiPhoto, ApiSuggestion } from "api/types";
+import type { ApiPhoto, ApiSuggestion, ApiTaxon } from "api/types";
 import LocationSection
   from "components/ObsDetailsDefaultMode/LocationSection/LocationSection";
 import MapSection
@@ -45,6 +45,7 @@ interface Props {
   scrollRef: React.RefObject<ScrollView | null>;
   iconicTaxon?: RealmTaxon;
   setIconicTaxon: ( taxon: RealmTaxon ) => void;
+  taxonToSave?: ApiTaxon;
 }
 
 const Match = ( {
@@ -61,6 +62,7 @@ const Match = ( {
   scrollRef,
   iconicTaxon,
   setIconicTaxon,
+  taxonToSave,
 }: Props ) => {
   const { t } = useTranslation( );
   const { isConnected } = useNetInfo( );
@@ -192,7 +194,7 @@ const Match = ( {
               )
               : <MatchHeader topSuggestion={topSuggestion} />
           }
-          <HeaderEditIcon observation={observation} lastScreen="Match" taxon={taxon} />
+          <HeaderEditIcon observation={observation} lastScreen="Match" taxon={taxonToSave} />
         </View>
         <PhotosSection
           representativePhoto={topSuggestion?.taxon?.representative_photo}
diff --git a/src/components/Match/MatchContainer.tsx b/src/components/Match/MatchContainer.tsx
index 3f77819f8..5743b46e9 100644
--- a/src/components/Match/MatchContainer.tsx
+++ b/src/components/Match/MatchContainer.tsx
@@ -544,6 +544,7 @@ const MatchContainer = ( ) => {
           scrollRef={scrollRef}
           iconicTaxon={iconicTaxon}
           setIconicTaxon={setIconicTaxon}
+          taxonToSave={taxon}
         />
         {renderPermissionsGate( {
           // If the user grants location permission while on this screen,
diff --git a/src/sharedHooks/useNavigateToObsEdit.ts b/src/sharedHooks/useNavigateToObsEdit.ts
index f7b436d03..e833c0b53 100644
--- a/src/sharedHooks/useNavigateToObsEdit.ts
+++ b/src/sharedHooks/useNavigateToObsEdit.ts
@@ -9,13 +9,20 @@ function useNavigateToObsEdit() {
   const navigation = useNavigation<NativeStackNavigationProp<ParamListBase>>();
   const prepareObsEdit = useStore( state => state.prepareObsEdit );
   const setMyObsOffsetToRestore = useStore( state => state.setMyObsOffsetToRestore );
+  const updateObservationKeys = useStore( state => state.updateObservationKeys );
 
   function navigateToObsEdit(
     localObservation: RealmObservation,
     lastScreen?: string,
     taxon?: ApiTaxon | RealmTaxon,
   ) {
-    prepareObsEdit( { ...localObservation, taxon } );
+    prepareObsEdit( localObservation );
+    if ( taxon ) {
+      updateObservationKeys( {
+        owners_identification_from_vision: true,
+        taxon,
+      } );
+    }
     navigation.navigate(
       "ObsEdit",
       lastScreen

From 458d151f6d7da8cfcc22492523f9a880153922e8 Mon Sep 17 00:00:00 2001
From: sepeterson <10458078+sepeterson@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:00:36 -0600
Subject: [PATCH 18/18] MOB-968: comment cleanup

---
 src/components/ObsEdit/ObsEdit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ObsEdit/ObsEdit.js b/src/components/ObsEdit/ObsEdit.js
index c21114488..a75cc8fb7 100644
--- a/src/components/ObsEdit/ObsEdit.js
+++ b/src/components/ObsEdit/ObsEdit.js
@@ -36,7 +36,6 @@ const ObsEdit = ( ): Node => {
   const [passesEvidenceTest, setPassesEvidenceTest] = useState( false );
   const [resetScreen, setResetScreen] = useState( false );
   const [needLocation, setNeedLocation] = useState(
-    // take a look 👀
     shouldFetchObservationLocation( currentObservation ),
   );
   const isFocused = useIsFocused( );