fix: Estimate customize values

bigcapitalhq · Oct 7, 2024 · d92b46a · d92b46a
1 parent 682d40c
commit d92b46a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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/...ages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeContent.tsx b/...ages/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
@@ -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} />;
  };