From 5a38ae246d61d5a42c7c196af3860df980c68483 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Tue, 6 Apr 2021 17:57:46 +0200
Subject: [PATCH 1/2] fix (Invite user): catch message error.

---
 .../containers/Dialogs/InviteUserDialog/InviteUserForm.js | 8 +++++++-
 client/src/containers/Dialogs/InviteUserDialog/utils.js   | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/src/containers/Dialogs/InviteUserDialog/InviteUserForm.js b/client/src/containers/Dialogs/InviteUserDialog/InviteUserForm.js
index 7c322db10..639ed98c2 100644
--- a/client/src/containers/Dialogs/InviteUserDialog/InviteUserForm.js
+++ b/client/src/containers/Dialogs/InviteUserDialog/InviteUserForm.js
@@ -55,7 +55,13 @@ function InviteUserForm({
     };
 
     // Handle the response error.
-    const onError = (errors) => {
+    const onError = (error) => {
+      const {
+        response: {
+          data: { errors },
+        },
+      } = error;
+      
       const errorsTransformed = transformApiErrors(errors);
 
       setErrors({ ...errorsTransformed });
diff --git a/client/src/containers/Dialogs/InviteUserDialog/utils.js b/client/src/containers/Dialogs/InviteUserDialog/utils.js
index aab4cfeb6..205ad922f 100644
--- a/client/src/containers/Dialogs/InviteUserDialog/utils.js
+++ b/client/src/containers/Dialogs/InviteUserDialog/utils.js
@@ -6,5 +6,8 @@ export const transformApiErrors = (errors) => {
   if (errors.find((error) => error.type === 'EMAIL.ALREADY.INVITED')) {
     fields.email = formatMessage({ id: 'email_is_already_used' });
   }
+  if (errors.find((error) => error.type === 'EMAIL.ALREADY.EXISTS')) {
+    fields.email = formatMessage({ id: 'email_is_already_used' });
+  }
   return fields;
 };

From 038a90aac3206d2f5eddb5cecd95d73ed24c7dfa Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Tue, 6 Apr 2021 18:40:29 +0200
Subject: [PATCH 2/2] fix(receipt) : receipt floating action.

---
 .../Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.js b/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.js
index 18283bb4e..c39a8b78f 100644
--- a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.js
+++ b/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.js
@@ -81,6 +81,7 @@ export default function ReceiptFormFloatingActions() {
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
+            loading={isSubmitting}
             intent={Intent.PRIMARY}
             onClick={handleSubmitCloseBtnClick}
             text={<T id={'save_close'} />}