Merge branch 'master' of https://github.com/abouolia/Ratteb

2026-02-17 13:20:31 +00:00 · 2021-01-26 08:44:17 +02:00
parent b26f6c937c 9fa329bef5
commit 0e6d2142c7
37 changed files with 191 additions and 193 deletions
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js
@@ -189,8 +189,8 @@ function MakeJournalEntriesForm({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'the_journal_has_been_successfully_created'
-              : 'the_journal_has_been_successfully_edited',
+              ? 'the_journal_has_been_created_successfully'
+              : 'the_journal_has_been_edited_successfully',
          },
          { number: values.journal_number },
        ),
--- a/client/src/containers/Accounting/ManualJournalsList.js
+++ b/client/src/containers/Accounting/ManualJournalsList.js
@@ -95,7 +95,7 @@ function ManualJournalsTable({
    requestDeleteManualJournal(deleteManualJournal.id).then(() => {
      AppToaster.show({
        message: formatMessage(
-          { id: 'the_journal_has_been_successfully_deleted' },
+          { id: 'the_journal_has_been_deleted_successfully' },
          { number: deleteManualJournal.journal_number },
        ),
        intent: Intent.SUCCESS,
@@ -123,7 +123,7 @@ function ManualJournalsTable({
        setBulkDelete(false);
        AppToaster.show({
          message: formatMessage(
-            { id: 'the_journals_has_been_successfully_deleted' },
+            { id: 'the_journals_has_been_deleted_successfully' },
            { count: selectedRowsCount },
          ),
          intent: Intent.SUCCESS,
--- a/client/src/containers/Customers/CustomerForm.js
+++ b/client/src/containers/Customers/CustomerForm.js
@@ -178,8 +178,8 @@ function CustomerForm({
      AppToaster.show({
        message: formatMessage({
          id: customer
-            ? 'the_item_customer_has_been_successfully_edited'
-            : 'the_customer_has_been_successfully_created',
+            ? 'the_item_customer_has_been_edited_successfully'
+            : 'the_customer_has_been_created_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/Customers/CustomersList.js
+++ b/client/src/containers/Customers/CustomersList.js
@@ -108,7 +108,7 @@ function CustomersList({
        setDeleteCustomer(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_customer_has_been_successfully_deleted',
+            id: 'the_customer_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -172,7 +172,7 @@ function CustomersList({
        setBulkDelete(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_customers_has_been_successfully_deleted',
+            id: 'the_customers_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js
+++ b/client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js
@@ -81,8 +81,8 @@ function AccountFormDialogContent({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'service_has_been_successful_created'
-              : 'service_has_been_successful_edited',
+              ? 'service_has_been_created_successfully'
+              : 'service_has_been_edited_successfully',
          },
          {
            name: toastAccountName,
--- a/client/src/containers/Dialogs/CurrencyFormDialog/CurencyFormDialogContent.js
+++ b/client/src/containers/Dialogs/CurrencyFormDialog/CurencyFormDialogContent.js
@@ -85,7 +85,7 @@ function CurencyFormDialogContent({
            closeDialog(dialogName);
            AppToaster.show({
              message: formatMessage({
-                id: 'the_currency_has_been_successfully_edited',
+                id: 'the_currency_has_been_edited_successfully',
              }),
              intent: Intent.SUCCESS,
            });
@@ -101,7 +101,7 @@ function CurencyFormDialogContent({
            closeDialog(dialogName);
            AppToaster.show({
              message: formatMessage({
-                id: 'the_currency_has_been_successfully_created',
+                id: 'the_currency_has_been_created_successfully',
              }),
              intent: Intent.SUCCESS,
            });
--- a/client/src/containers/Dialogs/ExchangeRateFormDialog/ExchangeRateFormDialogContent.js
+++ b/client/src/containers/Dialogs/ExchangeRateFormDialog/ExchangeRateFormDialogContent.js
@@ -112,7 +112,7 @@ function ExchangeRateFormDialogContent({
            closeDialog(dialogName);
            AppToaster.show({
              message: formatMessage({
-                id: 'the_exchange_rate_has_been_successfully_edited',
+                id: 'the_exchange_rate_has_been_edited_successfully',
              }),
              intent: Intent.SUCCESS,
            });
@@ -128,7 +128,7 @@ function ExchangeRateFormDialogContent({
            closeDialog(dialogName);
            AppToaster.show({
              message: formatMessage({
-                id: 'the_exchange_rate_has_been_successfully_created',
+                id: 'the_exchange_rate_has_been_created_successfully',
              }),
              intent: Intent.SUCCESS,
            });
--- a/client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogContent.js
+++ b/client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogContent.js
@@ -89,7 +89,7 @@ function InventoryAdjustmentFormDialogContent({

      AppToaster.show({
        message: formatMessage({
-          id: 'the_make_adjustment_has_been_successfully_created',
+          id: 'the_make_adjustment_has_been_created_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormDialogContent.js
+++ b/client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormDialogContent.js
@@ -103,8 +103,8 @@ function ItemCategoryFormDialogContent({
      AppToaster.show({
        message: formatMessage({
          id: isNewMode
-            ? 'the_item_category_has_been_successfully_created'
-            : 'the_item_category_has_been_successfully_edited',
+            ? 'the_item_category_has_been_created_successfully'
+            : 'the_item_category_has_been_edited_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/ExchangeRates/ExchangeRatesList.js
+++ b/client/src/containers/ExchangeRates/ExchangeRatesList.js
@@ -75,7 +75,7 @@ function ExchangeRatesList({
        setDeleteExchangeRate(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_exchange_rates_has_been_successfully_deleted',
+            id: 'the_exchange_rates_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Expenses/ExpenseForm.js
+++ b/client/src/containers/Expenses/ExpenseForm.js
@@ -152,8 +152,8 @@ function ExpenseForm({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'the_expense_has_been_successfully_created'
-              : 'the_expense_has_been_successfully_edited',
+              ? 'the_expense_has_been_created_successfully'
+              : 'the_expense_has_been_edited_successfully',
          },
          { number: values.payment_account_id },
        ),
--- a/client/src/containers/Expenses/ExpensesList.js
+++ b/client/src/containers/Expenses/ExpensesList.js
@@ -83,7 +83,7 @@ function ExpensesList({
    requestDeleteExpense(deleteExpense.id).then(() => {
      AppToaster.show({
        message: formatMessage(
-          { id: 'the_expense_has_been_successfully_deleted' },
+          { id: 'the_expense_has_been_deleted_successfully' },
          { number: deleteExpense.payment_account_id },
        ),
        intent: Intent.SUCCESS,
@@ -110,7 +110,7 @@ function ExpensesList({
      .then(() => {
        AppToaster.show({
          message: formatMessage(
-            { id: 'the_expenses_have_been_successfully_deleted' },
+            { id: 'the_expenses_have_been_deleted_successfully' },
            { count: selectedRowsCount },
          ),
          intent: Intent.SUCCESS,
--- a/client/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.js
+++ b/client/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.js
@@ -31,6 +31,7 @@ function ReceivableAgingSummarySheet({
  // #withDashboardActions
  changePageTitle,
  setDashboardBackLink,
+  setSidebarShrink,

  // #withARAgingSummaryActions
  requestReceivableAgingSummary,
@@ -59,6 +60,7 @@ function ReceivableAgingSummarySheet({
  }, [ARAgingSummaryRefresh, refreshARAgingSummary]);

  useEffect(() => {
+    setSidebarShrink()
    // Show the back link on dashboard topbar.
    setDashboardBackLink(true);

@@ -66,7 +68,7 @@ function ReceivableAgingSummarySheet({
      // Hide the back link on dashboard topbar.
      setDashboardBackLink(false);
    };
-  }, [setDashboardBackLink]);
+  }, [setDashboardBackLink,setSidebarShrink]);

  // Handle fetching receivable aging summary report.
  const fetchARAgingSummarySheet = useQuery(
--- a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js
+++ b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js
@@ -30,6 +30,7 @@ function BalanceSheet({
  // #withDashboardActions
  changePageTitle,
  setDashboardBackLink,
+  setSidebarShrink,

  // #withBalanceSheetActions
  fetchBalanceSheet,
@@ -58,8 +59,9 @@ function BalanceSheet({
  );

  useEffect(() => {
+    setSidebarShrink();
    changePageTitle(formatMessage({ id: 'balance_sheet' }));
-  }, [changePageTitle, formatMessage]);
+  }, [changePageTitle, formatMessage, setSidebarShrink]);

  // Observes the balance sheet refresh to invalid the query to refresh it.
  useEffect(() => {
--- a/client/src/containers/FinancialStatements/Journal/Journal.js
+++ b/client/src/containers/FinancialStatements/Journal/Journal.js
@@ -32,6 +32,7 @@ function Journal({
  // #withDashboardActions
  changePageTitle,
  setDashboardBackLink,
+  setSidebarShrink,

  // #withPreferences
  organizationName,
@@ -54,6 +55,7 @@ function Journal({
  }, [changePageTitle, formatMessage]);

  useEffect(() => {
+    setSidebarShrink();
    // Show the back link on dashboard topbar.
    setDashboardBackLink(true);

@@ -61,7 +63,7 @@ function Journal({
      // Hide the back link on dashboard topbar.
      setDashboardBackLink(false);
    };
-  });
+  }, [setDashboardBackLink, setSidebarShrink]);

  useEffect(() => {
    if (journalSheetRefresh) {
--- a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js
+++ b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js
@@ -28,7 +28,8 @@ function ProfitLossSheet({
  // #withDashboardActions
  changePageTitle,
  setDashboardBackLink,
-
+  setSidebarShrink,
+  
  // #withProfitLoss
  profitLossSheetRefresh,

@@ -62,6 +63,7 @@ function ProfitLossSheet({
  }, [profitLossSheetRefresh, refreshProfitLossSheet]);

  useEffect(() => {
+    setSidebarShrink()
    // Show the back link on dashboard topbar.
    setDashboardBackLink(true);

@@ -69,7 +71,7 @@ function ProfitLossSheet({
      // Hide the back link on dashboard topbar.
      setDashboardBackLink(false);
    };
-  });
+  },[setDashboardBackLink,setSidebarShrink]);

  // Fetches profit/loss sheet.
  const fetchSheetHook = useQuery(['profit-loss-sheet', filter],
--- a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.js
+++ b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.js
@@ -27,6 +27,7 @@ function TrialBalanceSheet({
  // #withDashboardActions
  changePageTitle,
  setDashboardBackLink,
+  setSidebarShrink,

  // #withTrialBalance
  trialBalanceSheetRefresh,
@@ -62,6 +63,7 @@ function TrialBalanceSheet({
  }, [changePageTitle, formatMessage]);

  useEffect(() => {
+    setSidebarShrink();
    // Show the back link on dashboard topbar.
    setDashboardBackLink(true);

@@ -69,7 +71,7 @@ function TrialBalanceSheet({
      // Hide the back link on dashboard topbar.
      setDashboardBackLink(false);
    };
-  });
+  }, [setDashboardBackLink, setSidebarShrink]);

  const handleFilterSubmit = useCallback(
    (filter) => {
--- a/client/src/containers/Items/InventoryAdjustmentList.js
+++ b/client/src/containers/Items/InventoryAdjustmentList.js
@@ -69,7 +69,7 @@ function InventoryAdjustmentList({
        setDeleteInventoryAdjustment(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_adjustment_has_been_successfully_deleted',
+            id: 'the_adjustment_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Items/ItemsList.js
+++ b/client/src/containers/Items/ItemsList.js
@@ -131,7 +131,7 @@ function ItemsList({
      .then(() => {
        AppToaster.show({
          message: formatMessage({
-            id: 'the_item_has_been_successfully_deleted',
+            id: 'the_item_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -187,7 +187,7 @@ function ItemsList({
        setBulkDelete(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_items_has_been_successfully_deleted',
+            id: 'the_items_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -219,7 +219,7 @@ function ItemsList({
        setInactiveItem(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_item_has_been_successfully_inactivated',
+            id: 'the_item_has_been_inactivated_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -247,7 +247,7 @@ function ItemsList({
        setActivateItem(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_item_has_been_successfully_activated',
+            id: 'the_item_has_been_activated_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Preferences/Currencies/CurrenciesList.js
+++ b/client/src/containers/Preferences/Currencies/CurrenciesList.js
@@ -57,7 +57,7 @@ function CurrenciesList({
          setDeleteCurrencyState(false);
          AppToaster.show({
            message: formatMessage({
-              id: 'the_currency_has_been_successfully_deleted',
+              id: 'the_currency_has_been_deleted_successfully',
            }),
            intent: Intent.SUCCESS,
          });
--- a/client/src/containers/Preferences/General/General.js
+++ b/client/src/containers/Preferences/General/General.js
@@ -57,7 +57,7 @@ function GeneralPreferences({
      .then((response) => {
        AppToaster.show({
          message: formatMessage({
-            id: 'the_options_has_been_successfully_created',
+            id: 'the_options_has_been_created_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Preferences/Users/UsersList.js
+++ b/client/src/containers/Preferences/Users/UsersList.js
@@ -53,7 +53,7 @@ function UsersListPreferences({
        setInactiveUserState(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_user_has_been_successfully_inactivated',
+            id: 'the_user_has_been_inactivated_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -86,7 +86,7 @@ function UsersListPreferences({
        setDeleteUserState(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_user_has_been_successfully_deleted',
+            id: 'the_user_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -151,8 +151,8 @@ function BillForm({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'the_bill_has_been_successfully_created' :
-              'the_bill_has_been_successfully_edited',
+              ? 'the_bill_has_been_created_successfully' :
+              'the_bill_has_been_edited_successfully',
          },
          { number: values.bill_number },
        ),
--- a/client/src/containers/Purchases/Bill/BillsList.js
+++ b/client/src/containers/Purchases/Bill/BillsList.js
@@ -83,7 +83,7 @@ function BillsList({
    requestDeleteBill(deleteBill.id).then(() => {
      AppToaster.show({
        message: formatMessage({
-          id: 'the_bill_has_been_successfully_deleted',
+          id: 'the_bill_has_been_deleted_successfully',
        }),
        intent: Intent.SUCCESS,
      });
@@ -108,7 +108,7 @@ function BillsList({
        setOpenBill(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_bill_has_been_successfully_opened',
+            id: 'the_bill_has_been_opened_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
@@ -150,8 +150,8 @@ function PaymentMadeForm({
      AppToaster.show({
        message: formatMessage({
          id: paymentMadeId
-            ? 'the_payment_made_has_been_successfully_edited'
-            : 'the_payment_made_has_been_successfully_created',
+            ? 'the_payment_made_has_been_edited_successfully'
+            : 'the_payment_made_has_been_created_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeList.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeList.js
@@ -78,7 +78,7 @@ function PaymentMadeList({
    requestDeletePaymentMade(deletePaymentMade.id).then(() => {
      AppToaster.show({
        message: formatMessage({
-          id: 'the_payment_made_has_been_successfully_deleted',
+          id: 'the_payment_made_has_been_deleted_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/Sales/Estimate/EstimateForm.js
+++ b/client/src/containers/Sales/Estimate/EstimateForm.js
@@ -195,8 +195,8 @@ const EstimateForm = ({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'the_estimate_has_been_successfully_edited'
-              : 'the_estimate_has_been_successfully_created',
+              ? 'the_estimate_has_been_edited_successfully'
+              : 'the_estimate_has_been_created_successfully',
          },
          { number: values.estimate_number },
        ),
--- a/client/src/containers/Sales/Estimate/EstimatesList.js
+++ b/client/src/containers/Sales/Estimate/EstimatesList.js
@@ -86,7 +86,7 @@ function EstimatesList({
    requestDeleteEstimate(deleteEstimate.id).then(() => {
      AppToaster.show({
        message: formatMessage({
-          id: 'the_estimate_has_been_successfully_deleted',
+          id: 'the_estimate_has_been_deleted_successfully',
        }),
        intent: Intent.SUCCESS,
      });
@@ -111,7 +111,7 @@ function EstimatesList({
        setDeliverEstimate(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_estimate_has_been_successfully_delivered',
+            id: 'the_estimate_has_been_delivered_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -139,7 +139,7 @@ function EstimatesList({
        setApproveEstimate(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_estimate_has_been_successfully_approved',
+            id: 'the_estimate_has_been_approved_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -167,7 +167,7 @@ function EstimatesList({
        setRejectEstimate(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_estimate_has_been_successfully_rejected',
+            id: 'the_estimate_has_been_rejected_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Sales/Invoice/InvoiceForm.js
+++ b/client/src/containers/Sales/Invoice/InvoiceForm.js
@@ -179,8 +179,8 @@ function InvoiceForm({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'the_invocie_has_been_successfully_created'
-              : 'the_invoice_has_been_successfully_edited',
+              ? 'the_invoice_has_been_created_successfully'
+              : 'the_invoice_has_been_edited_successfully',
          },
          { number: values.invoice_no },
        ),
--- a/client/src/containers/Sales/Invoice/InvoicesList.js
+++ b/client/src/containers/Sales/Invoice/InvoicesList.js
@@ -100,7 +100,7 @@ function InvoicesList({
        setDeleteInvoice(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_invoice_has_been_successfully_deleted',
+            id: 'the_invoice_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
@@ -128,7 +128,7 @@ function InvoicesList({
        setDeliverInvoice(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_invoice_has_been_successfully_delivered',
+            id: 'the_invoice_has_been_delivered_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Sales/PaymentReceive/PaymentReceivesList.js
+++ b/client/src/containers/Sales/PaymentReceive/PaymentReceivesList.js
@@ -78,7 +78,7 @@ function PaymentReceiveList({
    requestDeletePaymentReceive(deletePaymentReceive.id).then(() => {
      AppToaster.show({
        message: formatMessage({
-          id: 'the_payment_receive_has_been_successfully_deleted',
+          id: 'the_payment_receive_has_been_deleted_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/Sales/Receipt/ReceiptForm.js
+++ b/client/src/containers/Sales/Receipt/ReceiptForm.js
@@ -194,8 +194,8 @@ function ReceiptForm({
        message: formatMessage(
          {
            id: isNewMode
-              ? 'the_receipt_has_been_successfully_created'
-              : 'the_receipt_has_been_successfully_edited',
+              ? 'the_receipt_has_been_created_successfully'
+              : 'the_receipt_has_been_edited_successfully',
          },
          { number: values.receipt_number },
        ),
--- a/client/src/containers/Sales/Receipt/ReceiptsList.js
+++ b/client/src/containers/Sales/Receipt/ReceiptsList.js
@@ -75,7 +75,7 @@ function ReceiptsList({
    requestDeleteReceipt(deleteReceipt.id).then(() => {
      AppToaster.show({
        message: formatMessage({
-          id: 'the_receipt_has_been_successfully_deleted',
+          id: 'the_receipt_has_been_deleted_successfully',
        }),
        intent: Intent.SUCCESS,
      });
@@ -100,7 +100,7 @@ function ReceiptsList({
        setCloseReceipt(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_receipt_has_been_successfully_closed',
+            id: 'the_receipt_has_been_closed_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Vendors/VendorForm.js
+++ b/client/src/containers/Vendors/VendorForm.js
@@ -114,8 +114,8 @@ function VendorForm({
      AppToaster.show({
        message: formatMessage({
          id: isNewMode
-            ? 'the_vendor_has_been_successfully_created'
-            : 'the_item_vendor_has_been_successfully_edited',
+            ? 'the_vendor_has_been_created_successfully'
+            : 'the_item_vendor_has_been_edited_successfully',
        }),
        intent: Intent.SUCCESS,
      });
--- a/client/src/containers/Vendors/VendorsList.js
+++ b/client/src/containers/Vendors/VendorsList.js
@@ -100,7 +100,7 @@ function VendorsList({
        setDeleteVendor(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_vendor_has_been_successfully_deleted',
+            id: 'the_vendor_has_been_deleted_successfully',
          }),
          intent: Intent.SUCCESS,
        });
--- a/client/src/containers/Views/ViewFormPage.js
+++ b/client/src/containers/Views/ViewFormPage.js
@@ -77,7 +77,7 @@ function ViewFormPage({
      setStateDeleteView(null);
      AppToaster.show({
        message: formatMessage({
-          id: 'the_custom_view_has_been_successfully_deleted',
+          id: 'the_custom_view_has_been_deleted_successfully',
        }),
        intent: Intent.SUCCESS,
      });