Progress

client/src/pages/contract-create/contract-create.page.container.jsx

@@ -3,7 +3,7 @@ import { Form, notification } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useNavigate, useLocation } from "react-router-dom";
+import { useSearchParams, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { INSERT_NEW_CONTRACT } from "../../graphql/cccontracts.queries";
@@ -31,11 +31,11 @@ export function ContractCreatePageContainer({
   const [form] = Form.useForm();
   const { t } = useTranslation();
   const history = useNavigate();
-  const location = useLocation();
+  const searchParams = useSearchParams();
   const [loading, setLoading] = useState(false);
   const selectedCarState = useState(null);
   const selectedJobState = useState(
-    (location.state && location.state.jobId) || null
+      (searchParams.get('state') && searchParams.get('state').jobId) || null
   );
   const [insertContract] = useMutation(INSERT_NEW_CONTRACT);
   const [intakeJob] = useMutation(UPDATE_JOB);
@@ -87,7 +87,7 @@ export function ContractCreatePageContainer({
 
         form.resetFields();
         form.resetFields();
-        history.push(
+        history(
           `/manage/courtesycars/contracts/${result.data.insert_cccontracts.returning[0].id}`
         );
       } else {