fix button

RocketChat · Sep 27, 2023 · 96d0c47 · 96d0c47
1 parent 270a38e
commit 96d0c47
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git 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
@@ -92,20 +92,30 @@ 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>
 						) : (
 							<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>