PSP-9743 Generate green button in the Expropriation tab for Form 1,5 …

…and 9 are displaying incorrect colour (#4549) * Correct color for generate expropriation buttons * Update snapshots
bcgov · Dec 24, 2024 · 0f8b808 · 0f8b808
1 parent 439c27f
commit 0f8b808
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 9 deletions.
diff --git a/...ntend/src/features/mapSideBar/acquisition/tabs/expropriation/form1/ExpropriationForm1.tsx b/...ntend/src/features/mapSideBar/acquisition/tabs/expropriation/form1/ExpropriationForm1.tsx
@@ -10,6 +10,7 @@ import { ContactInputContainer } from '@/components/common/form/ContactInput/Con
 import ContactInputView from '@/components/common/form/ContactInput/ContactInputView';
 import FormItem from '@/components/common/form/FormItem';
 import { SectionField } from '@/components/common/Section/SectionField';
+import { StyledAddButton } from '@/components/common/styles';
 import { RestrictContactType } from '@/components/contact/ContactManagerView/ContactFilterComponent/ContactFilterComponent';
 import FilePropertiesTable from '@/components/filePropertiesTable/FilePropertiesTable';
 import { ApiGen_Concepts_AcquisitionFile } from '@/models/api/generated/ApiGen_Concepts_AcquisitionFile';
@@ -102,10 +103,10 @@ export const ExpropriationForm1: React.FC<IExpropriationForm1Props> = ({
               </Button>
             </Col>
             <Col xs="auto">
-              <Button title="Download File" onClick={() => onGenerateClick(formikProps)}>
+              <StyledAddButton title="Download File" onClick={() => onGenerateClick(formikProps)}>
                 <FaFileContract size={28} className="mr-2" />
                 Generate Form 1
-              </Button>
+              </StyledAddButton>
             </Col>
           </RightFlexRow>
         </Fragment>

diff --git a/...deBar/acquisition/tabs/expropriation/form1/__snapshots__/ExpropriationForm1.test.tsx.snap b/...deBar/acquisition/tabs/expropriation/form1/__snapshots__/ExpropriationForm1.test.tsx.snap
@@ -798,6 +798,17 @@ exports[`Expropriation Form 1 > matches snapshot 1`] = `
   margin-right: 0;
 }
 
+.c2.btn.btn-primary,
+.c2.btn.btn-primary:active {
+  background-color: #42814A;
+}
+
+.c2.btn.btn-primary:hover,
+.c2.btn.btn-primary:focus {
+  background-color: #2e8540;
+  outline-color: #2e8540;
+}
+
 .c0 {
   -webkit-box-pack: end;
   -webkit-justify-content: end;
@@ -830,7 +841,7 @@ exports[`Expropriation Form 1 > matches snapshot 1`] = `
       class="col-auto"
     >
       <button
-        class="c1 Button btn btn-primary"
+        class="c1 Button c2 btn btn-primary"
         title="Download File"
         type="button"
       >

diff --git a/...ntend/src/features/mapSideBar/acquisition/tabs/expropriation/form5/ExpropriationForm5.tsx b/...ntend/src/features/mapSideBar/acquisition/tabs/expropriation/form5/ExpropriationForm5.tsx
@@ -9,6 +9,7 @@ import { ContactInputContainer } from '@/components/common/form/ContactInput/Con
 import ContactInputView from '@/components/common/form/ContactInput/ContactInputView';
 import FormItem from '@/components/common/form/FormItem';
 import { SectionField } from '@/components/common/Section/SectionField';
+import { StyledAddButton } from '@/components/common/styles';
 import { RestrictContactType } from '@/components/contact/ContactManagerView/ContactFilterComponent/ContactFilterComponent';
 import FilePropertiesTable from '@/components/filePropertiesTable/FilePropertiesTable';
 import { ApiGen_Concepts_AcquisitionFile } from '@/models/api/generated/ApiGen_Concepts_AcquisitionFile';
@@ -95,10 +96,10 @@ export const ExpropriationForm5: React.FC<IExpropriationForm5Props> = ({
               </Button>
             </Col>
             <Col xs="auto">
-              <Button title="Download File" onClick={() => onGenerateClick(formikProps)}>
+              <StyledAddButton title="Download File" onClick={() => onGenerateClick(formikProps)}>
                 <FaFileContract size={28} className="mr-2" />
                 Generate Form 5
-              </Button>
+              </StyledAddButton>
             </Col>
           </RightFlexRow>
         </React.Fragment>

diff --git a/...deBar/acquisition/tabs/expropriation/form5/__snapshots__/ExpropriationForm5.test.tsx.snap b/...deBar/acquisition/tabs/expropriation/form5/__snapshots__/ExpropriationForm5.test.tsx.snap
@@ -720,6 +720,17 @@ exports[`Expropriation Form 1 > matches snapshot 1`] = `
   margin-right: 0;
 }
 
+.c2.btn.btn-primary,
+.c2.btn.btn-primary:active {
+  background-color: #42814A;
+}
+
+.c2.btn.btn-primary:hover,
+.c2.btn.btn-primary:focus {
+  background-color: #2e8540;
+  outline-color: #2e8540;
+}
+
 .c0 {
   -webkit-box-pack: end;
   -webkit-justify-content: end;
@@ -752,7 +763,7 @@ exports[`Expropriation Form 1 > matches snapshot 1`] = `
       class="col-auto"
     >
       <button
-        class="c1 Button btn btn-primary"
+        class="c1 Button c2 btn btn-primary"
         title="Download File"
         type="button"
       >

diff --git a/...ntend/src/features/mapSideBar/acquisition/tabs/expropriation/form9/ExpropriationForm9.tsx b/...ntend/src/features/mapSideBar/acquisition/tabs/expropriation/form9/ExpropriationForm9.tsx
@@ -10,6 +10,7 @@ import { ContactInputContainer } from '@/components/common/form/ContactInput/Con
 import ContactInputView from '@/components/common/form/ContactInput/ContactInputView';
 import FormItem from '@/components/common/form/FormItem';
 import { SectionField } from '@/components/common/Section/SectionField';
+import { StyledAddButton } from '@/components/common/styles';
 import { RestrictContactType } from '@/components/contact/ContactManagerView/ContactFilterComponent/ContactFilterComponent';
 import FilePropertiesTable from '@/components/filePropertiesTable/FilePropertiesTable';
 import { ApiGen_Concepts_AcquisitionFile } from '@/models/api/generated/ApiGen_Concepts_AcquisitionFile';
@@ -99,10 +100,10 @@ export const ExpropriationForm9: React.FC<IExpropriationForm9Props> = ({
               </Button>
             </Col>
             <Col xs="auto">
-              <Button title="Download File" onClick={() => onGenerateClick(formikProps)}>
+              <StyledAddButton title="Download File" onClick={() => onGenerateClick(formikProps)}>
                 <FaFileContract size={28} className="mr-2" />
                 Generate Form 9
-              </Button>
+              </StyledAddButton>
             </Col>
           </RightFlexRow>
         </React.Fragment>

diff --git a/...deBar/acquisition/tabs/expropriation/form9/__snapshots__/ExpropriationForm9.test.tsx.snap b/...deBar/acquisition/tabs/expropriation/form9/__snapshots__/ExpropriationForm9.test.tsx.snap
@@ -759,6 +759,17 @@ exports[`Expropriation Form 1 > matches snapshot 1`] = `
   margin-right: 0;
 }
 
+.c2.btn.btn-primary,
+.c2.btn.btn-primary:active {
+  background-color: #42814A;
+}
+
+.c2.btn.btn-primary:hover,
+.c2.btn.btn-primary:focus {
+  background-color: #2e8540;
+  outline-color: #2e8540;
+}
+
 .c0 {
   -webkit-box-pack: end;
   -webkit-justify-content: end;
@@ -791,7 +802,7 @@ exports[`Expropriation Form 1 > matches snapshot 1`] = `
       class="col-auto"
     >
       <button
-        class="c1 Button btn btn-primary"
+        class="c1 Button c2 btn btn-primary"
         title="Download File"
         type="button"
       >