From 5c7f5925a8f6b43d63e473151c8564424c8151dc Mon Sep 17 00:00:00 2001
From: Jan Kassens <jkassens@meta.com>
Date: Fri, 22 Mar 2024 14:00:37 -0400
Subject: [PATCH] Fix test after merge conflict

---
 packages/react-dom/src/__tests__/ReactDOMForm-test.js           | 2 +-
 .../src/__tests__/ReactFlightDOMForm-test.js                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMForm-test.js b/packages/react-dom/src/__tests__/ReactDOMForm-test.js
index b0d66a9e94c92..677c18425b522 100644
--- a/packages/react-dom/src/__tests__/ReactDOMForm-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMForm-test.js
@@ -1324,7 +1324,7 @@ describe('ReactDOMForm', () => {
 
     let dispatch;
     function App() {
-      const [state, _dispatch, isPending] = useFormState(action, 0);
+      const [state, _dispatch, isPending] = useActionState(action, 0);
       dispatch = _dispatch;
       const pending = isPending ? 'Pending ' : '';
       return <Text text={pending + state} />;
diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js
index bff9fdabcfd0d..e8da630d4ee16 100644
--- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js
@@ -914,7 +914,7 @@ describe('ReactFlightDOMForm', () => {
     );
 
     function Form({action}) {
-      const [errorMsg, dispatch] = useFormState(action, null);
+      const [errorMsg, dispatch] = useActionState(action, null);
       return <form action={dispatch}>{errorMsg}</form>;
     }