Fixes companies verification button (#3333)

MTES-MCT · May 16, 2024 · 86b6eb9 · 86b6eb9
1 parent 87abd0f
commit 86b6eb9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/front/src/Apps/Companies/CompanyInfo/CompanyInfo.tsx b/front/src/Apps/Companies/CompanyInfo/CompanyInfo.tsx
@@ -2,19 +2,31 @@ import { CompanyPrivate } from "@td/codegen-ui";
 import React from "react";
 import CompanyIdentificationForm from "./CompanyIdentificationForm";
 import CompanyProfileForm from "./CompanyProfileForm";
+import AccountFieldCompanyVerificationStatus from "../../Account/fields/AccountFieldCompanyVerificationStatus";
+import { PROFESSIONALS } from "@td/constants";
+
 import "./companyInfo.scss";
 
+const { VITE_VERIFY_COMPANY } = import.meta.env;
+
 interface CompanyInfoProps {
   company: CompanyPrivate;
 }
 
 const CompanyInfo = ({ company }: CompanyInfoProps) => {
+  const isWasteProfessional = company.companyTypes.some(ct =>
+    PROFESSIONALS.includes(ct)
+  );
+
   return (
     <div className="company-info">
       <CompanyIdentificationForm company={company} />
       <br />
       <hr />
       <CompanyProfileForm company={company} />
+      {isWasteProfessional && VITE_VERIFY_COMPANY === "true" && (
+        <AccountFieldCompanyVerificationStatus company={company} />
+      )}
     </div>
   );
 };

diff --git a/front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx b/front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx
@@ -42,12 +42,8 @@ import { gql, useMutation } from "@apollo/client";
 import { Loader } from "../../common/Components";
 import CompanyProfileSubForm from "./CompanyProfileSubForm";
 import { NotificationError } from "../../common/Components/Error/Error";
-import AccountFieldCompanyVerificationStatus from "../../Account/fields/AccountFieldCompanyVerificationStatus";
-import { PROFESSIONALS } from "@td/constants";
 import CompanyProfileInformation from "./CompanyProfileInformation";
 
-const { VITE_VERIFY_COMPANY } = import.meta.env;
-
 interface CompanyProfileFormProps {
   company: CompanyPrivate;
 }
@@ -660,10 +656,6 @@ const CompanyProfileForm = ({ company }: CompanyProfileFormProps) => {
     updateCompanyWorkerCertifError ||
     deleteErrorWorkerCertif;
 
-  const isWasteProfessional = company.companyTypes.some(ct =>
-    PROFESSIONALS.includes(ct)
-  );
-
   return (
     <CompanyFormWrapper
       title="Profil"
@@ -713,9 +705,6 @@ const CompanyProfileForm = ({ company }: CompanyProfileFormProps) => {
                 </div>
               );
             })}
-            {isWasteProfessional && VITE_VERIFY_COMPANY === "true" && (
-              <AccountFieldCompanyVerificationStatus company={company} />
-            )}
             {loading && <Loader />}
             {error && <NotificationError apolloError={error} />}
           </form>