From d90b7d48c3b049ceec81e5b7190cc18e09154bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Elias=20M=C3=A9ndez?=
 <67445275+joelmendez1@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:22:52 -0300
Subject: [PATCH] [DEV-226] fix modal behavior when pressing enter (#1139)

---
 .../admin/panel/settings/admin-panel-custom-tags-modal.js   | 6 +++---
 .../admin/panel/settings/admin-panel-custom-tags-modal.scss | 1 +
 client/src/app/admin/panel/users/invite-user-widget.js      | 2 +-
 client/src/app/admin/panel/users/invite-user-widget.scss    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.js b/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.js
index c4ee43c6..17d2cbb8 100644
--- a/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.js
+++ b/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.js
@@ -65,12 +65,12 @@ class AdminPanelCustomTagsModal extends React.Component {
                         <FormField name="name" label={i18n('NAME')} fieldProps={{size: 'large'}} required={nameRequired} />
                         <FormField name="color" label={i18n('COLOR')} decorator={ColorSelector} />
                         <div className='admin-panel-custom-tags-modal__actions'>
-                            <Button onClick={this.onDiscardClick.bind(this)} size="small">
-                                {i18n('CANCEL')}
-                            </Button>
                             <SubmitButton type="secondary" size="small">
                                 {i18n('SAVE')}
                             </SubmitButton>
+                            <Button onClick={this.onDiscardClick.bind(this)} size="small">
+                                {i18n('CANCEL')}
+                            </Button>
                         </div>
                 </Form>
             </div>
diff --git a/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.scss b/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.scss
index 1d1d8b89..3b3680a9 100644
--- a/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.scss
+++ b/client/src/app/admin/panel/settings/admin-panel-custom-tags-modal.scss
@@ -2,6 +2,7 @@
 
     &__actions{
         display: flex;
+        flex-direction: row-reverse;
         justify-content: space-between;
     }
 }
diff --git a/client/src/app/admin/panel/users/invite-user-widget.js b/client/src/app/admin/panel/users/invite-user-widget.js
index e7e9cfcb..334b566e 100644
--- a/client/src/app/admin/panel/users/invite-user-widget.js
+++ b/client/src/app/admin/panel/users/invite-user-widget.js
@@ -63,8 +63,8 @@ class InviteUserWidget extends React.Component {
                             <Captcha ref="captcha" />
                         </div>
                         <div className="invite-user-widget__buttons-container">
-                            <Button onClick={(e) => {e.preventDefault(); ModalContainer.closeModal();}} type="link">{i18n('CANCEL')}</Button>
                             <SubmitButton type="secondary">{i18n('INVITE_USER')}</SubmitButton>
+                            <Button onClick={(e) => {e.preventDefault(); ModalContainer.closeModal();}} type="link">{i18n('CANCEL')}</Button>
                         </div>
                     </Form>
                     {this.renderMessage()}
diff --git a/client/src/app/admin/panel/users/invite-user-widget.scss b/client/src/app/admin/panel/users/invite-user-widget.scss
index 363c46aa..56c823f8 100644
--- a/client/src/app/admin/panel/users/invite-user-widget.scss
+++ b/client/src/app/admin/panel/users/invite-user-widget.scss
@@ -18,7 +18,7 @@
 
     &__buttons-container {
         display: flex;
-        flex-direction: row;
+        flex-direction: row-reverse;
         justify-content: space-between;
         align-items: center;
     }