Skip to content

🔥 The free & Open Source DocuSign alternative

fix: resolve conflict

RaktimaNXGeba87776a0ba
diff --cc apps/OpenSign/src/components/pdf/RenderPdf.js
index 39d1bece2,6dbada1e1..1195925e7
--- a/apps/OpenSign/src/components/pdf/RenderPdf.js
+++ b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@@ -62,7 -62,10 +62,11 @@@ function RenderPdf(
setIsSelectId,
ispublicTemplate,
handleUserDetails,
- pdfRotateBase64
++ pdfRotateBase64,
+ fontSize,
+ setFontSize,
+ fontColor,
+ setFontColor
}) {
const { t } = useTranslation();
const isMobile = window.innerWidth < 767;
diff --cc apps/OpenSign/src/pages/PlaceHolderSign.js
index f1741a8b1,1cf79a7e2..813c27cdb
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@@ -2039,7 -2056,10 +2070,11 @@@ function PlaceHolderSign()
setScale={setScale}
scale={scale}
setIsSelectId={setIsSelectId}
+ pdfRotateBase64={pdfRotateBase64}
+ fontSize={fontSize}
+ setFontSize={setFontSize}
+ fontColor={fontColor}
+ setFontColor={setFontColor}
/>
)}
</div>
diff --cc apps/OpenSign/src/pages/SignyourselfPdf.js
index 4707c4aac,bf94527eb..9c0a294d3
--- a/apps/OpenSign/src/pages/SignyourselfPdf.js
+++ b/apps/OpenSign/src/pages/SignyourselfPdf.js
@@@ -1378,7 -1378,10 +1388,11 @@@ function SignYourSelf()
handleTextSettingModal={handleTextSettingModal}
setScale={setScale}
scale={scale}
+ pdfRotateBase64={pdfRotateBase64}
+ fontSize={fontSize}
+ setFontSize={setFontSize}
+ fontColor={fontColor}
+ setFontColor={setFontColor}
/>
)}
</div>
diff --cc apps/OpenSign/src/pages/TemplatePlaceholder.js
index c3442f9fb,a0c5476b0..d6e6c5c89
--- a/apps/OpenSign/src/pages/TemplatePlaceholder.js
+++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js
@@@ -1518,7 -1528,10 +1550,11 @@@ const TemplatePlaceholder = () =>
setScale={setScale}
scale={scale}
setIsSelectId={setIsSelectId}
+ pdfRotateBase64={pdfRotateBase64}
+ fontSize={fontSize}
+ setFontSize={setFontSize}
+ fontColor={fontColor}
+ setFontColor={setFontColor}
/>
)}
</div>