From f63cb969c1ae49319fb3327321016e56a8418bf0 Mon Sep 17 00:00:00 2001
From: amendelsohn <andrew.j.mendelsohn@gmail.com>
Date: Tue, 25 Jun 2024 16:57:37 -0700
Subject: [PATCH 1/2] fix edit page back button

---
 packages/web/src/pages/edit-page/EditTrackPage.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/web/src/pages/edit-page/EditTrackPage.tsx b/packages/web/src/pages/edit-page/EditTrackPage.tsx
index 827b6494bd2..d5cdbfad2e6 100644
--- a/packages/web/src/pages/edit-page/EditTrackPage.tsx
+++ b/packages/web/src/pages/edit-page/EditTrackPage.tsx
@@ -27,6 +27,7 @@ import Header from 'components/header/desktop/Header'
 import LoadingSpinnerFullPage from 'components/loading-spinner-full-page/LoadingSpinnerFullPage'
 import Page from 'components/page/Page'
 import { useTrackCoverArt2 } from 'hooks/useTrackCoverArt'
+import { useHistoryContext } from 'app/HistoryProvider'
 
 const { deleteTrack, editTrack } = cacheTracksActions
 const { getStems } = cacheTracksSelectors
@@ -45,10 +46,9 @@ export const EditFormScrollContext = createContext(() => {})
 // This component is in development, only used behind the EDIT_TRACK_REDESIGN feature flag
 export const EditTrackPage = (props: EditPageProps) => {
   const { scrollToTop } = props
-  //   const dispatch = useDispatch()
-  //   const [formState, setFormState] = useState<UploadFormState>(initialFormState)
   const { handle, slug } = useParams<{ handle: string; slug: string }>()
   const dispatch = useDispatch()
+  const { history } = useHistoryContext()
 
   const { data: currentUserId } = useGetCurrentUserId({})
   const permalink = `/${handle}/${slug}`
@@ -126,7 +126,13 @@ export const EditTrackPage = (props: EditPageProps) => {
   return (
     <Page
       title={messages.title}
-      header={<Header primary={messages.title} showBackButton />}
+      header={
+        <Header
+          primary={messages.title}
+          showBackButton
+          onClickBack={history.goBack}
+        />
+      }
     >
       {trackStatus !== Status.SUCCESS || !coverArtUrl ? (
         <LoadingSpinnerFullPage />

From a2d6ea0c7e6d932c13e9a129ca523a66820e1f60 Mon Sep 17 00:00:00 2001
From: amendelsohn <andrew.j.mendelsohn@gmail.com>
Date: Tue, 25 Jun 2024 17:49:41 -0700
Subject: [PATCH 2/2] lint

---
 packages/web/src/pages/edit-page/EditTrackPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/src/pages/edit-page/EditTrackPage.tsx b/packages/web/src/pages/edit-page/EditTrackPage.tsx
index d5cdbfad2e6..4616e1e5703 100644
--- a/packages/web/src/pages/edit-page/EditTrackPage.tsx
+++ b/packages/web/src/pages/edit-page/EditTrackPage.tsx
@@ -19,6 +19,7 @@ import { push as pushRoute } from 'connected-react-router'
 import { useDispatch } from 'react-redux'
 import { useParams } from 'react-router'
 
+import { useHistoryContext } from 'app/HistoryProvider'
 import { useSelector } from 'common/hooks/useSelector'
 import { DeleteConfirmationModal } from 'components/delete-confirmation'
 import { EditTrackForm } from 'components/edit-track/EditTrackForm'
@@ -27,7 +28,6 @@ import Header from 'components/header/desktop/Header'
 import LoadingSpinnerFullPage from 'components/loading-spinner-full-page/LoadingSpinnerFullPage'
 import Page from 'components/page/Page'
 import { useTrackCoverArt2 } from 'hooks/useTrackCoverArt'
-import { useHistoryContext } from 'app/HistoryProvider'
 
 const { deleteTrack, editTrack } = cacheTracksActions
 const { getStems } = cacheTracksSelectors