diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index 2c8de1c33..e396982d8 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -624,7 +624,7 @@ export function JobsDetailHeaderActions({
         {
             key: 'cancelallappointments',
             onClick: () => {
-                if ( job.status !== bodyshop.md_ro_statuses.default_scheduled) {
+                if (job.status !== bodyshop.md_ro_statuses.default_scheduled) {
                     return;
                 }
                 showCancelScheduleModal()
@@ -713,12 +713,7 @@ export function JobsDetailHeaderActions({
     menuItems.push({
         key: 'cccontract',
         disabled: jobRO || !job.converted,
-        label: <Link
-            to={{
-                pathname: "/manage/courtesycars/contracts/new",
-                state: {jobId: job.id},
-            }}
-        >
+        label: <Link state={{jobId: job.id}} to='/manage/courtesycars/contracts/new'>
             {t("menus.jobsactions.newcccontract")}
         </Link>
     });
@@ -993,10 +988,11 @@ export function JobsDetailHeaderActions({
                 onOk={handleCancelScheduleOK}
                 onCancel={handleCancelScheduleModalCancel}
                 footer={[
-                    <Button form="cancelScheduleForm" key="back"  onClick={handleCancelScheduleModalCancel}>
+                    <Button form="cancelScheduleForm" key="back" onClick={handleCancelScheduleModalCancel}>
                         {t("general.actions.cancel")}
                     </Button>,
-                    <Button  form="cancelScheduleForm" htmlType="submit" key="submit" type="primary" loading={loading} onClick={handleCancelScheduleOK}>
+                    <Button form="cancelScheduleForm" htmlType="submit" key="submit" type="primary" loading={loading}
+                            onClick={handleCancelScheduleOK}>
                         {t("appointments.actions.cancel")}
                     </Button>,
                 ]}
@@ -1004,7 +1000,7 @@ export function JobsDetailHeaderActions({
                 <Form
                     layout="vertical"
                     id="cancelScheduleForm"
-                    onFinish={s =>{
+                    onFinish={s => {
                         console.log(s);
                         handleLostSaleFinish(s);
                     }}
diff --git a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
index c448e4f4a..ca6753dca 100644
--- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
+++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
@@ -225,7 +225,7 @@ export function PayableExportAll({
 
   if (bodyshop.pbs_serialnumber)
     return (
-      <Link to={{ state: { billids }, pathname: `/manage/dmsap` }}>
+      <Link to='/manage/dmsap' state={{ billids }}>
         <Button>{t("jobs.actions.export")}</Button>
       </Link>
     );
diff --git a/client/src/components/payable-export-button/payable-export-button.component.jsx b/client/src/components/payable-export-button/payable-export-button.component.jsx
index c2970b8d8..3a8d1b559 100644
--- a/client/src/components/payable-export-button/payable-export-button.component.jsx
+++ b/client/src/components/payable-export-button/payable-export-button.component.jsx
@@ -218,7 +218,7 @@ export function PayableExportButton({
 
   if (bodyshop.pbs_serialnumber)
     return (
-      <Link to={{ state: { billids: [billId] }, pathname: `/manage/dmsap` }}>
+      <Link to='/manage/dmsap' state={{billids: [billId]}}>
         <Button>{t("jobs.actions.export")}</Button>
       </Link>
     );