- Merge release

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/csi-response-form/csi-response-form.container.jsx

@@ -5,6 +5,7 @@ import React, {useEffect} from "react";
 import {useTranslation} from "react-i18next";
 import {useLocation} from "react-router-dom";
 import {QUERY_CSI_RESPONSE_BY_PK} from "../../graphql/csi.queries";
+import {DateFormatter} from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
@@ -44,7 +45,13 @@ export default function CsiResponseFormContainer() {
                     readOnly
                     componentList={data.csi_by_pk.csiquestion.config}
                 />
-            </Form>
+                {data.csi_by_pk.validuntil ? (
+                    <>
+                        {t("csi.fields.validuntil")}
+                        {": "}
+                        <DateFormatter>{data.csi_by_pk.validuntil}</DateFormatter>
+                    </>
+                ) : null}</Form>
         </Card>
     );
 }