diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesFooter.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesFooter.tsx
deleted file mode 100644
index 43e74a42d..000000000
--- a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesFooter.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-// @ts-nocheck
-import React from 'react';
-import {
-  Intent,
-  Button,
-  ButtonGroup,
-  Popover,
-  PopoverInteractionKind,
-  Position,
-  Menu,
-  MenuItem,
-} from '@blueprintjs/core';
-import classNames from 'classnames';
-import { useFormikContext } from 'formik';
-import { FormattedMessage as T, If, Icon } from '@/components';
-import { CLASSES } from '@/constants/classes';
-import { useMakeJournalFormContext } from './MakeJournalProvider';
-import { useHistory } from 'react-router-dom';
-
-/**
- * Make Journal floating actions bar.
- */
-export default function MakeJournalEntriesFooter() {
-  const history = useHistory();
-
-  // Formik context.
-  const { isSubmitting, submitForm } = useFormikContext();
-
-  // Make journal form context.
-  const {
-    manualJournalId,
-    setSubmitPayload,
-    manualJournalPublished = false,
-  } = useMakeJournalFormContext();
-
-  // Handle `submit & publish` button click.
-  const handleSubmitPublishBtnClick = (event) => {
-    setSubmitPayload({ redirect: true, publish: true });
-    submitForm();
-  };
-
-  // Handle `submit, publish & new` button click.
-  const handleSubmitPublishAndNewBtnClick = (event) => {
-    setSubmitPayload({ redirect: false, publish: true, resetForm: true });
-    submitForm();
-  };
-
-  // Handle `submit, publish & continue editing` button click.
-  const handleSubmitPublishContinueEditingBtnClick = (event) => {
-    setSubmitPayload({ redirect: false, publish: true });
-    submitForm();
-  };
-
-  // Handle `submit as draft` button click.
-  const handleSubmitDraftBtnClick = (event) => {
-    setSubmitPayload({ redirect: true, publish: false });
-  };
-
-  // Handle `submit as draft & new` button click.
-  const handleSubmitDraftAndNewBtnClick = (event) => {
-    setSubmitPayload({ redirect: false, publish: false, resetForm: true });
-    submitForm();
-  };
-
-  // Handles submit as draft & continue editing button click.
-  const handleSubmitDraftContinueEditingBtnClick = (event) => {
-    setSubmitPayload({ redirect: false, publish: false });
-    submitForm();
-  };
-
-  // Handle cancel button action click.
-  const handleCancelBtnClick = (event) => {
-    history.goBack();
-  };
-
-  const handleClearBtnClick = (event) => {};
-
-  return (
-    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
-      {/* ----------- Save And Publish ----------- */}
-      <If condition={!manualJournalId || !manualJournalPublished}>
-        <ButtonGroup>
-          <Button
-            disabled={isSubmitting}
-            intent={Intent.PRIMARY}
-            type="submit"
-            onClick={handleSubmitPublishBtnClick}
-            text={<T id={'save_publish'} />}
-          />
-          <Popover
-            content={
-              <Menu>
-                <MenuItem
-                  text={<T id={'publish_and_new'} />}
-                  onClick={handleSubmitPublishAndNewBtnClick}
-                />
-                <MenuItem
-                  text={<T id={'publish_continue_editing'} />}
-                  onClick={handleSubmitPublishContinueEditingBtnClick}
-                />
-              </Menu>
-            }
-            minimal={true}
-            interactionKind={PopoverInteractionKind.CLICK}
-            position={Position.BOTTOM_LEFT}
-          >
-            <Button
-              disabled={isSubmitting}
-              intent={Intent.PRIMARY}
-              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
-            />
-          </Popover>
-        </ButtonGroup>
-        {/* ----------- Save As Draft ----------- */}
-        <ButtonGroup>
-          <Button
-            disabled={isSubmitting}
-            className={'ml1'}
-            type="submit"
-            onClick={handleSubmitDraftBtnClick}
-            text={<T id={'save_as_draft'} />}
-          />
-          <Popover
-            content={
-              <Menu>
-                <MenuItem
-                  text={<T id={'save_and_new'} />}
-                  onClick={handleSubmitDraftAndNewBtnClick}
-                />
-                <MenuItem
-                  text={<T id={'save_continue_editing'} />}
-                  onClick={handleSubmitDraftContinueEditingBtnClick}
-                />
-              </Menu>
-            }
-            minimal={true}
-            interactionKind={PopoverInteractionKind.CLICK}
-            position={Position.BOTTOM_LEFT}
-          >
-            <Button
-              disabled={isSubmitting}
-              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
-            />
-          </Popover>
-        </ButtonGroup>
-      </If>
-      {/* ----------- Save and New ----------- */}
-      <If condition={manualJournalId && manualJournalPublished}>
-        <ButtonGroup>
-          <Button
-            disabled={isSubmitting}
-            intent={Intent.PRIMARY}
-            type="submit"
-            onClick={handleSubmitPublishBtnClick}
-            text={<T id={'save'} />}
-          />
-          <Popover
-            content={
-              <Menu>
-                <MenuItem
-                  text={<T id={'save_and_new'} />}
-                  onClick={handleSubmitPublishAndNewBtnClick}
-                />
-              </Menu>
-            }
-            minimal={true}
-            interactionKind={PopoverInteractionKind.CLICK}
-            position={Position.BOTTOM_LEFT}
-          >
-            <Button
-              disabled={isSubmitting}
-              intent={Intent.PRIMARY}
-              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
-            />
-          </Popover>
-        </ButtonGroup>
-      </If>
-      {/* ----------- Clear & Reset----------- */}
-      <Button
-        className={'ml1'}
-        disabled={isSubmitting}
-        onClick={handleClearBtnClick}
-        text={manualJournalId ? <T id={'reset'} /> : <T id={'clear'} />}
-      />
-      {/* ----------- Cancel ----------- */}
-      <Button
-        className={'ml1'}
-        onClick={handleCancelBtnClick}
-        text={<T id={'cancel'} />}
-      />
-    </div>
-  );
-}
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx
index 40297f988..644aa9a7f 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx
@@ -27,13 +27,10 @@ function MoneyInFloatingActions({
     setSubmitPayload({ publish: false });
     submitForm();
   };
-
   // Handle submit  button click.
   const handleSubmittBtnClick = (event) => {
     setSubmitPayload({ publish: true });
-    submitForm();
   };
-
   // Handle close button click.
   const handleCloseBtnClick = (event) => {
     closeDialog(dialogName);
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx
index 00e0e5692..a370d328d 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx
@@ -32,7 +32,6 @@ function MoneyOutFloatingActions({
   // Handle submit  button click.
   const handleSubmittBtnClick = (event) => {
     setSubmitPayload({ publish: true });
-    submitForm();
   };
 
   // Handle close button click.
diff --git a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx
index f20f82494..6c3c28299 100644
--- a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx
+++ b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx
@@ -31,7 +31,6 @@ function InventoryAdjustmentFloatingActions({
   // Handle submit make adjustment button click.
   const handleSubmitMakeAdjustmentBtnClick = (event) => {
     setSubmitPayload({ publish: true });
-    submitForm();
   };
 
   // Handle close button click.
@@ -53,7 +52,6 @@ function InventoryAdjustmentFloatingActions({
         <Button
           loading={isSubmitting && !submitPayload.publish}
           style={{ minWidth: '75px' }}
-          type="submit"
           onClick={handleSubmitDraftBtnClick}
         >
           {<T id={'save_as_draft'} />}
diff --git a/packages/webapp/src/containers/Items/ItemFormFloatingActions.tsx b/packages/webapp/src/containers/Items/ItemFormFloatingActions.tsx
index 8c5e70e35..8bb4412f5 100644
--- a/packages/webapp/src/containers/Items/ItemFormFloatingActions.tsx
+++ b/packages/webapp/src/containers/Items/ItemFormFloatingActions.tsx
@@ -18,7 +18,7 @@ export default function ItemFormFloatingActions({ onCancel }) {
   const { setSubmitPayload, isNewMode } = useItemFormContext();
 
   // Formik context.
-  const { isSubmitting } = useFormikContext();
+  const { isSubmitting, submitForm } = useFormikContext();
 
   // Handle cancel button click.
   const handleCancelBtnClick = (event) => {
@@ -33,6 +33,7 @@ export default function ItemFormFloatingActions({ onCancel }) {
   // Handle submit & new button click.
   const handleSubmitAndNewBtnClick = (event) => {
     setSubmitPayload({ redirect: false });
+    submitForm();
   };
 
   return (
@@ -52,7 +53,6 @@ export default function ItemFormFloatingActions({ onCancel }) {
         className={classNames('ml1', 'btn--submit-new')}
         disabled={isSubmitting}
         onClick={handleSubmitAndNewBtnClick}
-        type="submit"
       >
         <T id={'save_new'} />
       </Button>
@@ -84,4 +84,4 @@ export default function ItemFormFloatingActions({ onCancel }) {
 
 const SaveButton = styled(Button)`
   min-width: 100px;
-`;
\ No newline at end of file
+`;
diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.tsx
index cefc67779..970c25054 100644
--- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.tsx
+++ b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.tsx
@@ -27,7 +27,7 @@ export default function PaymentMadeFloatingActions() {
   const history = useHistory();
 
   // Formik context.
-  const { isSubmitting, resetForm } = useFormikContext();
+  const { isSubmitting, resetForm, submitForm } = useFormikContext();
 
   // Payment made form context.
   const { setSubmitPayload, paymentMadeId } = usePaymentMadeFormContext();
@@ -50,12 +50,15 @@ export default function PaymentMadeFloatingActions() {
   // Handle submit & new button click.
   const handleSubmitAndNewClick = (event) => {
     setSubmitPayload({ redirect: false, resetForm: true });
+    submitForm();
   };
 
-  // handle submit & continue editing button click.
+  // Handle submit & continue editing button click.
   const handleSubmitContinueEditingBtnClick = (event) => {
     setSubmitPayload({ redirect: false, publish: true });
+    submitForm()
   };
+
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save and New ----------- */}
diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx
index b5633718b..792dd095e 100644
--- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx
+++ b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx
@@ -87,18 +87,19 @@ function PaymentMadeForm({
         message: intl.get('you_cannot_make_payment_with_zero_total_amount'),
         intent: Intent.DANGER,
       });
+      setSubmitting(false);
       return;
     }
     // Transformes the form values to request body.
     const form = transformFormToRequest(values);
 
     // Triggers once the save request success.
-    const onSaved = (response) => {
+    const onSaved = () => {
       AppToaster.show({
         message: intl.get(
           isNewMode
-            ? 'the_payment_made_has_been_edited_successfully'
-            : 'the_payment_made_has_been_created_successfully',
+            ? 'the_payment_made_has_been_created_successfully'
+            : 'the_payment_made_has_been_edited_successfully',
         ),
         intent: Intent.SUCCESS,
       });
@@ -116,7 +117,6 @@ function PaymentMadeForm({
       if (errors) {
         transformErrors(errors, { setFieldError });
       }
-
       setSubmitting(false);
     };
 
diff --git a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.tsx b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.tsx
index 435b6ce13..4289e056b 100644
--- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFloatingActions.tsx
@@ -34,25 +34,20 @@ export default function PaymentReceiveFormFloatingActions() {
   // Handle submit button click.
   const handleSubmitBtnClick = (event) => {
     setSubmitPayload({ redirect: true });
-    submitForm();
   };
-
   // Handle clear button click.
   const handleClearBtnClick = (event) => {
     resetForm();
   };
-
   // Handle cancel button click.
   const handleCancelBtnClick = (event) => {
     history.goBack();
   };
-
   // Handle submit & new button click.
   const handleSubmitAndNewClick = (event) => {
     setSubmitPayload({ redirect: false, resetForm: true });
     submitForm();
   };
-
   // Handle submit & continue editing button click.
   const handleSubmitContinueEditingBtnClick = (event) => {
     setSubmitPayload({ redirect: false, publish: true });
diff --git a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.tsx b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.tsx
index d0e75204e..a0c84bacb 100644
--- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.tsx
@@ -110,6 +110,7 @@ function PaymentReceiveForm({
         message: intl.get('you_cannot_make_payment_with_zero_total_amount'),
         intent: Intent.DANGER,
       });
+      setSubmitting(false);
       return;
     }
     // Transformes the form values to request body.
diff --git a/packages/webapp/src/containers/Vendors/VendorForm/VendorFloatingActions.tsx b/packages/webapp/src/containers/Vendors/VendorForm/VendorFloatingActions.tsx
index 1bd97563c..0801cbf91 100644
--- a/packages/webapp/src/containers/Vendors/VendorForm/VendorFloatingActions.tsx
+++ b/packages/webapp/src/containers/Vendors/VendorForm/VendorFloatingActions.tsx
@@ -32,7 +32,6 @@ export default function VendorFloatingActions({ onCancel }) {
   // Handle the submit button.
   const handleSubmitBtnClick = (event) => {
     setSubmitPayload({ noRedirect: false });
-    submitForm();
   };
 
   // Handle the submit & new button click.
diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.tsx
index c9fb1fa98..7e4d1e6b0 100644
--- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.tsx
+++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.tsx
@@ -35,7 +35,6 @@ export default function WarehouseTransferFloatingActions() {
   // Handle submit initiate button click.
   const handleSubmitInitiateBtnClick = (event) => {
     setSubmitPayload({ redirect: true, initiate: true, deliver: false });
-    submitForm();
   };
 
   // Handle submit transferred button click.