From d92b46aa7ba7bcc0645abc48f51c514b44b5aa2f Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 7 Oct 2024 17:20:45 +0200
Subject: [PATCH] fix: Estimate customize values

---
 .../containers/BrandingTemplates/BrandingTemplateBoot.tsx    | 5 ++---
 .../Estimates/EstimateCustomize/EstimateCustomizeContent.tsx | 2 +-
 .../Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplateBoot.tsx b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplateBoot.tsx
index da653c4cf..5cb9d8441 100644
--- a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplateBoot.tsx
+++ b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplateBoot.tsx
@@ -11,7 +11,7 @@ interface PdfTemplateContextValue {
   templateId: number | string;
 
   // Pdf template.
-  pdfTemplate: GetPdfTemplateResponse;
+  pdfTemplate: GetPdfTemplateResponse | undefined;
   isPdfTemplateLoading: boolean;
 
   // Branding state.
@@ -42,8 +42,7 @@ export const BrandingTemplateBoot = ({
 
   const isLoading = isPdfTemplateLoading ||
     isBrandingTemplateLoading ||
-    !brandingTemplateState ||
-    !pdfTemplate;
+    !brandingTemplateState;
 
   if (isLoading) {
     return <Spinner size={20} />;
diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeContent.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeContent.tsx
index 8a8144e36..edea835e7 100644
--- a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeContent.tsx
+++ b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeContent.tsx
@@ -49,7 +49,7 @@ function EstimatePaperTemplateFormConnected() {
   const { values } = useFormikContext<EstimateCustomizeValues>();
   const { brandingState } = useElementCustomizeContext()
 
-  const mergedProps: EstimatePaperTemplateProps = { ...values, ...brandingState }
+  const mergedProps: EstimatePaperTemplateProps = { ...brandingState, ...values, }
 
   return <EstimatePaperTemplate {...mergedProps} />;
 }
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
index 2b021b324..17b452265 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
@@ -63,7 +63,7 @@ const withInvoicePreviewTemplateProps = <P extends object>(
     const { values } = useFormikContext<InvoiceCustomizeFormValues>();
     const { brandingState, } = useElementCustomizeContext();
 
-    const mergedProps: InvoicePaperTemplateProps = { ...brandingState, ...values }
+    const mergedProps: InvoicePaperTemplateProps = { ...brandingState, ...values };
 
     return <Component {...(props as P)} {...mergedProps} />;
   };