Resolved contracts list not showing correct entries based on dates. BOD-313. Added changes not saved indicator to shop info BOD-325

client/src/components/contracts-list/contracts-list.component.jsx

@@ -55,7 +55,7 @@ export default function ContractsList({ loading, contracts, refetch, total }) {
         `${record.driver_fn || ""} ${record.driver_ln || ""}`,
     },
     {
-      title: t("contracts.fields.vehicle"),
+      title: t("contracts.labels.vehicle"),
       dataIndex: "vehicle",
       key: "vehicle",
       //sorter: (a, b) => alphaSort(a.status, b.status),

client/src/components/shop-info/shop-info.container.jsx

@@ -7,6 +7,7 @@ import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import AlertComponent from "../alert/alert.component";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import FormsFieldChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 
 export default function ShopInfoContainer() {
   const [form] = Form.useForm();
@@ -40,15 +41,17 @@ export default function ShopInfoContainer() {
     if (data) form.resetFields();
   }, [form, data]);
 
-  if (error) return <AlertComponent message={error.message} type='error' />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
   if (loading) return <LoadingSpinner />;
   return (
     <Form
       form={form}
-      layout='vertical'
-      autoComplete='new-password'
+      layout="vertical"
+      autoComplete="new-password"
       onFinish={handleFinish}
-      initialValues={data ? data.bodyshops[0] : null}>
+      initialValues={data ? data.bodyshops[0] : null}
+    >
+      <FormsFieldChanged form={form} />
       <ShopInfoComponent form={form} saveLoading={saveLoading} />
     </Form>
   );