WIP Toasts localizations.

client/src/containers/Dialogs/AccountFormDialog.js

@@ -49,14 +49,14 @@ function AccountFormDialog({
 
   // #withDialog
   closeDialog,
-}) {
-  const intl = useIntl();
+}) { 
+  const { formatMessage } = useIntl();
   const accountFormValidationSchema = Yup.object().shape({
-    name: Yup.string().required(intl.formatMessage({ id: 'required' })),
+    name: Yup.string().required(formatMessage({ id: 'required' })),
     code: Yup.number(),
     account_type_id: Yup.string()
       .nullable()
-      .required(intl.formatMessage({ id: 'required' })),
+      .required(formatMessage({ id: 'required' })),
     description: Yup.string().trim()
   });
 
@@ -89,6 +89,7 @@ function AccountFormDialog({
     validationSchema: accountFormValidationSchema,
     onSubmit: (values, { setSubmitting, setErrors }) => {
       const exclude = ['subaccount'];
+      const toastAccountName = (values.code) ? `${values.code} - ${values.name}` : values.name;
 
       if (payload.action === 'edit') {
         requestEditAccount({
@@ -97,7 +98,12 @@ function AccountFormDialog({
         }).then((response) => {
           closeDialog(name);
           AppToaster.show({
-            message: 'the_account_has_been_edited',
+            message: formatMessage({
+              id: 'service_has_been_successful_edited',
+            }, {
+              name: toastAccountName,
+              service: formatMessage({ id: 'account' }),
+            }),
             intent: Intent.SUCCESS,
           });
           setSubmitting(false);
@@ -110,7 +116,12 @@ function AccountFormDialog({
         requestSubmitAccount({ form: { ...omit(values, exclude) } }).then((response) => {
           closeDialog(name);
           AppToaster.show({
-            message: 'the_account_has_been_submit',
+            message: formatMessage({
+              id: 'service_has_been_successful_created',  
+            }, {
+              name: toastAccountName,
+              service: formatMessage({ id: 'account' }),
+            }),
             intent: Intent.SUCCESS,
             position: Position.BOTTOM,
           });

client/src/containers/Dialogs/ItemCategoryDialog.js

@@ -55,13 +55,13 @@ function ItemCategoryDialog({
   requestEditItemCategory,
 }) {
   const [selectedParentCategory, setParentCategory] = useState(null);
-  const intl = useIntl();
+  const { formatMessage } = useIntl();
 
   const fetchList = useQuery(['items-categories-list'],
     () => requestFetchItemCategories());
 
-  const ValidationSchema = Yup.object().shape({
-    name: Yup.string().required(intl.formatMessage({ id: 'required' })),
+  const validationSchema = Yup.object().shape({
+    name: Yup.string().required(),
     parent_category_id: Yup.string().nullable(),
     description: Yup.string().trim()
   });
@@ -88,13 +88,15 @@ function ItemCategoryDialog({
       ...(payload.action === 'edit' &&
         pick(itemCategory, Object.keys(initialValues)))
     },
-    validationSchema: ValidationSchema,
+    validationSchema,
     onSubmit: (values, { setSubmitting }) => {
       if (payload.action === 'edit') {
         requestEditItemCategory(payload.id, values).then(response => {
           closeDialog(name);
           AppToaster.show({
-            message: 'the_category_has_been_edited',
+            message: formatMessage({
+              id: 'the_item_category_has_been_successfully_edited',
+            }),
             intent: Intent.SUCCESS,
           });
           setSubmitting(false);
@@ -107,7 +109,9 @@ function ItemCategoryDialog({
           .then((response) => {
             closeDialog(name);
             AppToaster.show({
-              message: 'the_category_has_been_submit',
+              message: formatMessage({
+                id: 'the_item_category_has_been_successfully_created',
+              }),
               intent: Intent.SUCCESS,
             });
             setSubmitting(false);

client/src/containers/Dialogs/UserFormDialog.js

@@ -23,13 +23,12 @@ import { compose } from 'utils';
 function UserFormDialog({
   requestFetchUser,
   requestSubmitInvite,
-  requestEditUser,
   name,
   payload,
   isOpen,
   closeDialog,
 }) {
-  const intl = useIntl();
+  const { formatMessage } = useIntl();
   const fetchHook = useAsync(async () => {
     await Promise.all([
       ...(payload.action === 'edit' ? [requestFetchUser(payload.user.id)] : []),
@@ -37,7 +36,7 @@ function UserFormDialog({
   }, false);
 
   const validationSchema = Yup.object().shape({
-    email: Yup.string().email().required(intl.formatMessage({id:'required'})),
+    email: Yup.string().email().required(),
   });
 
   const initialValues = {
@@ -56,29 +55,23 @@ function UserFormDialog({
     resetForm,
     getFieldProps,
     handleSubmit,
+    isSubmitting,
   } = useFormik({
     enableReinitialize: true,
     initialValues,
     validationSchema,
     onSubmit: (values) => {
-      const form = {
-        ...values,
-      };
-      if (payload.action === 'edit') {
-        requestEditUser(payload.user.id, form).then((response) => {
-          AppToaster.show({
-            message: 'the_user_details_has_been_updated',
-          });
-          closeDialog(name);
+      const form = { ...values };
+
+      requestSubmitInvite(form).then((response) => {
+        AppToaster.show({
+          message: formatMessage({
+            id: 'teammate_invited_to_organization_account',
+          }),
+          intent: Intent.SUCCESS,
         });
-      } else {
-        requestSubmitInvite(form).then((response) => {
-          AppToaster.show({
-            message: 'the_user_has_been_invited',
-          });
-          closeDialog(name);
-        });
-      }
+        closeDialog(name);
+      });
     },
   });
   const onDialogOpening = () => {
@@ -89,9 +82,7 @@ function UserFormDialog({
     resetForm();
   }, [resetForm]);
 
-  const handleClose = () => {
-    closeDialog(name);
-  };
+  const handleClose = () => { closeDialog(name); };
 
   return (
     <Dialog
@@ -130,7 +121,7 @@ function UserFormDialog({
         <div className={Classes.DIALOG_FOOTER}>
           <div className={Classes.DIALOG_FOOTER_ACTIONS}>
             <Button onClick={handleClose}>Close</Button>
-            <Button intent={Intent.PRIMARY} type='submit'>
+            <Button intent={Intent.PRIMARY} type='submit' disabled={isSubmitting}>
               {payload.action === 'edit' ? 'Edit' : 'invite'}
             </Button>
           </div>