From 8c17d22ab39c43f167a99a5f50f78094465bba49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Elias=20M=C3=A9ndez?=
 <67445275+joelmendez1@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:29:57 -0300
Subject: [PATCH] Fix frontend issues (#1055)

* fix login widget bugs

* fix ticket issues

* fix path name
---
 client/src/app-components/ticket-viewer.js    | 19 ++++++++++---------
 client/src/app-components/ticket-viewer.scss  |  5 +++--
 .../main-home/main-home-page-login-widget.js  |  4 +---
 .../main-home-page-login-widget.scss          |  1 -
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js
index 4ac8b076..cd5fedce 100644
--- a/client/src/app-components/ticket-viewer.js
+++ b/client/src/app-components/ticket-viewer.js
@@ -108,18 +108,20 @@ class TicketViewer extends React.Component {
                 <div className="ticket-viewer__comments">
                     {ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))}
                 </div>
-                <div className="ticket-viewer__reopen-closeticket-buttons">
-                    {!showResponseField ? this.renderReopenTicketButton() : null}
-                    {
-                        showResponseField ?
-                            this.renderResponseField() :
-                            (this.showDeleteButton()) ? this.renderDeleteTicketButton() : null
-                    }
-                </div>
+                {showResponseField ? this.renderResponseField() : this.renderReopenCloseButtons()}
             </div>
         );
     }
 
+    renderReopenCloseButtons() {
+        return(
+            <div className="ticket-viewer__reopen-close-buttons">
+                {this.renderReopenTicketButton()}
+                {this.showDeleteButton() ? this.renderDeleteTicketButton() : null}
+            </div>
+        )
+    }
+
     renderTitleHeader() {
         const {ticket, userStaff, userId} = this.props;
         const {ticketNumber, title, author, editedTitle, language} = ticket;
@@ -445,7 +447,6 @@ class TicketViewer extends React.Component {
                         </div>
                         <div className="ticket-viewer__buttons-column">
                             <div className="ticket-viewer__buttons-row">
-                                {(this.showDeleteButton()) ? this.renderDeleteTicketButton() : null}
                                 {this.renderCloseTicketButton()}
                             </div>
                         </div>
diff --git a/client/src/app-components/ticket-viewer.scss b/client/src/app-components/ticket-viewer.scss
index 8d973d52..25c8e761 100644
--- a/client/src/app-components/ticket-viewer.scss
+++ b/client/src/app-components/ticket-viewer.scss
@@ -168,10 +168,11 @@
         position: relative;
     }
 
-    &__reopen-closeticket-buttons {
+    &__reopen-close-buttons {
+        width: 230px;
         display: flex;
+        align-content: left;
         justify-content: space-between;
-        align-content: center;
     }
     
     &__response {
diff --git a/client/src/app/main/main-home/main-home-page-login-widget.js b/client/src/app/main/main-home/main-home-page-login-widget.js
index 23d27d07..ef287951 100644
--- a/client/src/app/main/main-home/main-home-page-login-widget.js
+++ b/client/src/app/main/main-home/main-home-page-login-widget.js
@@ -164,8 +164,6 @@ class MainHomePageLoginWidget extends React.Component {
 
     onLoginFormSubmit(formState) {
         this.setState({
-            loadingRecover: true,
-            recoverSent: false,
             reSendEmailVerificationStep: UNVERIFIED_USER_STEP
         })
         this.props.dispatch(SessionActions.login(formState));
@@ -230,7 +228,7 @@ class MainHomePageLoginWidget extends React.Component {
         })
 
         API.call({
-            path: '/user/resend-email-verification',
+            path: '/user/resend-email-token',
             data: {
                 email: this.state.email
             }
diff --git a/client/src/app/main/main-home/main-home-page-login-widget.scss b/client/src/app/main/main-home/main-home-page-login-widget.scss
index 88979ac3..3a26913e 100644
--- a/client/src/app/main/main-home/main-home-page-login-widget.scss
+++ b/client/src/app/main/main-home/main-home-page-login-widget.scss
@@ -31,7 +31,6 @@
 .main-home-page__link-buttons-container {
     display: flex;
     flex-direction: column;
-    width: 329px;
     margin: auto;
 }