From 96d0c47c87d1ae92d8ce339fbd5d583c85d87e75 Mon Sep 17 00:00:00 2001
From: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Wed, 27 Sep 2023 17:39:07 -0300
Subject: [PATCH] fix button

---
 .../views/admin/users/UsersTable/UsersTable.tsx  |  2 +-
 .../admin/users/UsersTable/UsersTableRow.tsx     | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index f2e8a468f66e..7e24e60317eb 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -137,7 +137,7 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 				</GenericTableHeaderCell>
 			),
 
-			<GenericTableHeaderCell key='menu' w='x40' justifyItems='center' />,
+			<GenericTableHeaderCell key='menu' />,
 		],
 		[mediaQuery, setSort, sortBy, sortDirection, t, tab],
 	);
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 81e821e8121c..0e3733105cb2 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -92,7 +92,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 				>
 					<Box display='flex' flexDirection='row' alignContent='flex-end'>
 						{active ? t('User_first_log_in') : t('Activation')}
-						{active ? (
+						{/* {active ? (
 							<Button small secondary mi='x32'>
 								{t('Resend_welcome_email')}
 							</Button>
@@ -100,12 +100,22 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 							<Button small primary mi='x32'>
 								{t('Activate')}
 							</Button>
-						)}
+						)} */}
 					</Box>
 				</GenericTableCell>
 			)}
 
-			<GenericTableCell justifyContent='center'>
+			<GenericTableCell display='flex' flexDirection='row'>
+				{tab === 'pending' &&
+					(active ? (
+						<Button small secondary mie='x16'>
+							{t('Resend_welcome_email')}
+						</Button>
+					) : (
+						<Button small primary mie='x16'>
+							{t('Activate')}
+						</Button>
+					))}
 				<ActionsMenu user={user} refetchUsers={refetchUsers} onReload={onReload} tab={tab} />
 			</GenericTableCell>
 		</GenericTableRow>