diff --git a/client/src/containers/Purchases/Bill/BillFloatingActions.js b/client/src/containers/Purchases/Bill/BillFloatingActions.js
index ff9d2a2d6..6dc2059ce 100644
--- a/client/src/containers/Purchases/Bill/BillFloatingActions.js
+++ b/client/src/containers/Purchases/Bill/BillFloatingActions.js
@@ -23,9 +23,7 @@ export default function BillFloatingActions({
   isSubmitting,
   onSubmitClick,
   onCancelClick,
-  onClearClick,
-  billId,
-  isOpen,
+  bill,
 }) {
   const { resetForm, submitForm } = useFormikContext();
   const handleSubmitOpenBtnClick = (event) => {
@@ -81,14 +79,13 @@ export default function BillFloatingActions({
   };
 
   const handleClearBtnClick = (event) => {
-    // saveInvoke(onClearClick, event);
     resetForm();
   };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Open ----------- */}
-      <If condition={!billId || !isOpen}>
+      <If condition={!bill || !bill?.is_open}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -155,7 +152,7 @@ export default function BillFloatingActions({
         </ButtonGroup>
       </If>
       {/* ----------- Save and New ----------- */}
-      <If condition={billId && isOpen}>
+      <If condition={bill && bill?.is_open}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -191,7 +188,7 @@ export default function BillFloatingActions({
         className={'ml1'}
         disabled={isSubmitting}
         onClick={handleClearBtnClick}
-        text={billId ? <T id={'reset'} /> : <T id={'clear'} />}
+        text={bill ? <T id={'reset'} /> : <T id={'clear'} />}
       />
       {/* ----------- Cancel ----------- */}
       <Button
diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index df9bc5b96..88350100f 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -219,7 +219,7 @@ function BillForm({
         initialValues={initialValues}
         onSubmit={handleFormSubmit}
       >
-        {({ isSubmitting ,values }) => (
+        {({ isSubmitting}) => (
           <Form>
             <BillFormHeader onBillNumberChanged={handleBillNumberChanged} />
             <BillFormBody defaultBill={defaultBill} />
@@ -229,8 +229,7 @@ function BillForm({
             />
             <BillFloatingActions
               isSubmitting={isSubmitting}
-              billId={billId}
-              isOpen={values.open}
+              bill={bill}
               onSubmitClick={handleSubmitClick}
               onCancelClick={handleCancelClick}
             />
diff --git a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
index 1aa26f55d..4786bce3b 100644
--- a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
+++ b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
@@ -23,9 +23,7 @@ export default function EstimateFloatingActions({
   isSubmitting,
   onSubmitClick,
   onCancelClick,
-  onClearClick,
-  estimateId,
-  isDelivered,
+  estimate,
 }) {
   const { resetForm, submitForm } = useFormikContext();
 
@@ -82,14 +80,13 @@ export default function EstimateFloatingActions({
   };
 
   const handleClearBtnClick = (event) => {
-    // saveInvoke(onClearClick, event);
     resetForm();
   };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Deliver ----------- */}
-      <If condition={!estimateId || !isDelivered}>
+      <If condition={!estimate || !estimate?.is_delivered}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -156,7 +153,7 @@ export default function EstimateFloatingActions({
         </ButtonGroup>
       </If>
       {/* ----------- Save and New ----------- */}
-      <If condition={estimateId && isDelivered}>
+      <If condition={estimate && estimate?.is_delivered}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -192,7 +189,7 @@ export default function EstimateFloatingActions({
         className={'ml1'}
         disabled={isSubmitting}
         onClick={handleClearBtnClick}
-        text={estimateId ? <T id={'reset'} /> : <T id={'clear'} />}
+        text={estimate ? <T id={'reset'} /> : <T id={'clear'} />}
       />
       {/* ----------- Cancel ----------- */}
       <Button
diff --git a/client/src/containers/Sales/Estimate/EstimateForm.js b/client/src/containers/Sales/Estimate/EstimateForm.js
index 11e779b1a..17552fef0 100644
--- a/client/src/containers/Sales/Estimate/EstimateForm.js
+++ b/client/src/containers/Sales/Estimate/EstimateForm.js
@@ -264,7 +264,7 @@ const EstimateForm = ({
         initialValues={initialValues}
         onSubmit={handleFormSubmit}
       >
-        {({ isSubmitting, values }) => (
+        {({ isSubmitting}) => (
           <Form>
             <EstimateFormHeader
               onEstimateNumberChanged={handleEstimateNumberChange}
@@ -274,10 +274,9 @@ const EstimateForm = ({
             <EstimateFormFooter />
             <EstimateFloatingActions
               isSubmitting={isSubmitting}
-              estimateId={estimateId}
+              estimate={estimate}
               onSubmitClick={handleSubmitClick}
               onCancelClick={handleCancelClick}
-              isDelivered={values.delivered}
             />
           </Form>
         )}
diff --git a/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js b/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
index a6ecc9e56..b7fb9d1a8 100644
--- a/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
+++ b/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
@@ -23,9 +23,7 @@ export default function InvoiceFloatingActions({
   isSubmitting,
   onSubmitClick,
   onCancelClick,
-  onClearClick,
   invoice,
-  isDelivered,
 }) {
   const { resetForm, submitForm } = useFormikContext();
 
@@ -82,14 +80,13 @@ export default function InvoiceFloatingActions({
   };
 
   const handleClearBtnClick = (event) => {
-    // saveInvoke(onClearClick, event);
     resetForm();
   };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Deliver ----------- */}
-      <If condition={!invoice || !isDelivered}>
+      <If condition={!invoice || !invoice?.is_delivered}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -156,7 +153,7 @@ export default function InvoiceFloatingActions({
         </ButtonGroup>
       </If>
       {/* ----------- Save and New ----------- */}
-      <If condition={invoice && isDelivered}>
+      <If condition={invoice && invoice?.is_delivered}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
diff --git a/client/src/containers/Sales/Invoice/InvoiceForm.js b/client/src/containers/Sales/Invoice/InvoiceForm.js
index fa8bf7a0e..88d757721 100644
--- a/client/src/containers/Sales/Invoice/InvoiceForm.js
+++ b/client/src/containers/Sales/Invoice/InvoiceForm.js
@@ -246,7 +246,7 @@ function InvoiceForm({
         initialValues={initialValues}
         onSubmit={handleSubmit}
       >
-        {({ isSubmitting, values }) => (
+        {({ isSubmitting}) => (
           <Form>
             <InvoiceFormHeader
               onInvoiceNumberChanged={handleInvoiceNumberChanged}
@@ -262,10 +262,9 @@ function InvoiceForm({
             <InvoiceFormFooter />
             <InvoiceFloatingActions
               isSubmitting={isSubmitting}
-              invoice={invoiceId}
+              invoice={invoice}
               onCancelClick={handleCancelClick}
               onSubmitClick={handleSubmitClick}
-              isDelivered={values.delivered}
             />
           </Form>
         )}
diff --git a/client/src/containers/Sales/Receipt/ReceiptForm.js b/client/src/containers/Sales/Receipt/ReceiptForm.js
index f0bd79b68..d94049c85 100644
--- a/client/src/containers/Sales/Receipt/ReceiptForm.js
+++ b/client/src/containers/Sales/Receipt/ReceiptForm.js
@@ -58,7 +58,7 @@ const defaultInitialValues = {
   reference_no: '',
   receipt_message: '',
   statement: '',
-  closed:'',
+  closed: '',
   entries: [...repeatValue(defaultReceipt, MIN_LINES_NUMBER)],
 };
 
@@ -247,13 +247,15 @@ function ReceiptForm({
     },
     [history],
   );
-  
+
   return (
-    <div className={classNames(
-      CLASSES.PAGE_FORM,
-      CLASSES.PAGE_FORM_STRIP_STYLE,
-      CLASSES.PAGE_FORM_RECEIPT,
-    )}>
+    <div
+      className={classNames(
+        CLASSES.PAGE_FORM,
+        CLASSES.PAGE_FORM_STRIP_STYLE,
+        CLASSES.PAGE_FORM_RECEIPT,
+      )}
+    >
       <Formik
         validationSchema={
           isNewMode ? CreateReceiptFormSchema : EditReceiptFormSchema
@@ -261,18 +263,17 @@ function ReceiptForm({
         initialValues={initialValues}
         onSubmit={handleFormSubmit}
       >
-        {({ isSubmitting ,values }) => (
+        {({ isSubmitting}) => (
           <Form>
             <ReceiptFromHeader
               onReceiptNumberChanged={handleReceiptNumberChanged}
             />
             <ReceiptNumberWatcher receiptNumber={receiptNumber} />
-            <ReceiptFormBody defaultReceipt ={defaultReceipt} />
+            <ReceiptFormBody defaultReceipt={defaultReceipt} />
             <ReceiptFormFooter />
             <ReceiptFormFloatingActions
               isSubmitting={isSubmitting}
-              receiptId={receiptId}
-              isClosed={values.closed}
+              receipt={receipt}
               onSubmitClick={handleSubmitClick}
               onCancelClick={handleCancelClick}
             />
diff --git a/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js b/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
index 52de6af6e..2754691a8 100644
--- a/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
+++ b/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
@@ -21,11 +21,9 @@ import { If, Icon } from 'components';
  */
 export default function ReceiptFormFloatingActions({
   isSubmitting,
-  receiptId,
-  isClosed,
+  receipt,
   onSubmitClick,
   onCancelClick,
-  onClearClick,
 }) {
   const { resetForm, submitForm } = useFormikContext();
 
@@ -82,14 +80,13 @@ export default function ReceiptFormFloatingActions({
   };
 
   const handleClearBtnClick = (event) => {
-    // saveInvoke(onClearClick, event);
     resetForm();
   };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Close ----------- */}
-      <If condition={!receiptId || !isClosed}>
+      <If condition={!receipt || !receipt?.is_closed}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -156,7 +153,7 @@ export default function ReceiptFormFloatingActions({
         </ButtonGroup>
       </If>
       {/* ----------- Save and New ----------- */}
-      <If condition={receiptId && isClosed}>
+      <If condition={receipt && receipt?.is_closed}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -191,7 +188,7 @@ export default function ReceiptFormFloatingActions({
         className={'ml1'}
         disabled={isSubmitting}
         onClick={handleClearBtnClick}
-        text={receiptId ? <T id={'reset'} /> : <T id={'clear'} />}
+        text={receipt ? <T id={'reset'} /> : <T id={'clear'} />}
       />
       {/* ----------- Cancel ----------- */}
       <Button