From cee71e9ad40163b2528311ccd6f2120a8a2fdd4f Mon Sep 17 00:00:00 2001
From: Adam Whitlock <8332986+adamwhitlock1@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:25:24 -0700
Subject: [PATCH] fix: use correct property for inProgressFormId (#33042)

---
 src/platform/forms-system/src/js/containers/FormApp.jsx | 2 +-
 src/platform/forms/save-in-progress/actions.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/platform/forms-system/src/js/containers/FormApp.jsx b/src/platform/forms-system/src/js/containers/FormApp.jsx
index cbc579f882a0..efe746feeb20 100644
--- a/src/platform/forms-system/src/js/containers/FormApp.jsx
+++ b/src/platform/forms-system/src/js/containers/FormApp.jsx
@@ -150,7 +150,7 @@ FormApp.propTypes = {
 const mapStateToProps = state => ({
   formData: state.form.data,
   isLoggedIn: isLoggedIn(state),
-  inProgressFormId: state.form.loadedData?.metadata?.inProgressFormId,
+  inProgressFormId: state?.form?.inProgressFormId,
 });
 
 export default connect(mapStateToProps)(FormApp);
diff --git a/src/platform/forms/save-in-progress/actions.js b/src/platform/forms/save-in-progress/actions.js
index c87a1a4eb812..4a7ad888bd05 100644
--- a/src/platform/forms/save-in-progress/actions.js
+++ b/src/platform/forms/save-in-progress/actions.js
@@ -271,7 +271,7 @@ function saveForm(saveType, formId, formData, version, returnUrl, submission) {
             SAVE_STATUSES.success,
             savedAt,
             json.data.attributes.metadata.expiresAt,
-            json.data.id,
+            json.data.attributes.metadata.inProgressFormId,
           ),
         );