diff --git a/client/admin/users/UserForm.js b/client/admin/users/UserForm.js
index e8968fe9e9d..0f8693befe4 100644
--- a/client/admin/users/UserForm.js
+++ b/client/admin/users/UserForm.js
@@ -1,5 +1,5 @@
import React, { useCallback, useMemo, useState } from 'react';
-import { Field, TextInput, TextAreaInput, PasswordInput, MultiSelectFiltered, Box, ToggleSwitch, Icon, Divider } from '@rocket.chat/fuselage';
+import { Field, TextInput, TextAreaInput, PasswordInput, MultiSelectFiltered, Box, ToggleSwitch, Icon, Divider, FieldGroup } from '@rocket.chat/fuselage';
import { useTranslation } from '../../contexts/TranslationContext';
import { isEmail } from '../../../app/utils/lib/isEmail.js';
@@ -47,93 +47,95 @@ export default function UserForm({ formValues, formHandlers, availableRoles, app
const onLoadCustomFields = useCallback((hasCustomFields) => setHasCustomFields(hasCustomFields), []);
return e.preventDefault(), [])} { ...props }>
- { prepend }
- {useMemo(() =>
- {t('Name')}
-
-
-
- , [t, name, handleName])}
- {useMemo(() =>
- {t('Username')}
-
- }/>
-
- , [t, username, handleUsername])}
- {useMemo(() =>
- {t('Email')}
-
- 0 ? 'error' : undefined} onChange={handleEmail} addon={}/>
-
-
-
- {t('Verified')}
-
-
- , [t, email, handleEmail, verified, handleVerified])}
- {useMemo(() =>
- {t('StatusMessage')}
-
- }/>
-
- , [t, statusText, handleStatusText])}
- {useMemo(() =>
- {t('Bio')}
-
- }/>
-
- , [bio, handleBio, t])}
- {useMemo(() =>
- {t('Nickname')}
-
- }/>
-
- , [nickname, handleNickname, t])}
- {useMemo(() =>
- {t('Password')}
-
- }/>
-
- , [t, password, handlePassword])}
- {useMemo(() =>
-
-
- {t('Require_password_change')}
-
-
- , [t, setRandomPassword, requirePasswordChange, handleRequirePasswordChange])}
- {useMemo(() =>
-
-
- {t('Set_random_password_and_send_by_email')}
-
-
- , [t, setRandomPassword, handleSetRandomPassword])}
- {useMemo(() =>
- {t('Roles')}
-
-
-
- , [availableRoles, handleRoles, roles, t])}
- {useMemo(() => handleJoinDefaultChannels &&
-
-
- {t('Join_default_channels')}
-
-
- , [handleJoinDefaultChannels, t, joinDefaultChannels])}
- {useMemo(() => handleSendWelcomeEmail &&
-
-
- {t('Send_welcome_email')}
-
-
- , [handleSendWelcomeEmail, t, sendWelcomeEmail])}
- {hasCustomFields && <>
-
- {t('Custom_Fields')}
- }
-
- { append }
+
+ { prepend }
+ {useMemo(() =>
+ {t('Name')}
+
+
+
+ , [t, name, handleName])}
+ {useMemo(() =>
+ {t('Username')}
+
+ }/>
+
+ , [t, username, handleUsername])}
+ {useMemo(() =>
+ {t('Email')}
+
+ 0 ? 'error' : undefined} onChange={handleEmail} addon={}/>
+
+
+
+ {t('Verified')}
+
+
+ , [t, email, handleEmail, verified, handleVerified])}
+ {useMemo(() =>
+ {t('StatusMessage')}
+
+ }/>
+
+ , [t, statusText, handleStatusText])}
+ {useMemo(() =>
+ {t('Bio')}
+
+ }/>
+
+ , [bio, handleBio, t])}
+ {useMemo(() =>
+ {t('Nickname')}
+
+ }/>
+
+ , [nickname, handleNickname, t])}
+ {useMemo(() =>
+ {t('Password')}
+
+ }/>
+
+ , [t, password, handlePassword])}
+ {useMemo(() =>
+
+
+ {t('Require_password_change')}
+
+
+ , [t, setRandomPassword, requirePasswordChange, handleRequirePasswordChange])}
+ {useMemo(() =>
+
+
+ {t('Set_random_password_and_send_by_email')}
+
+
+ , [t, setRandomPassword, handleSetRandomPassword])}
+ {useMemo(() =>
+ {t('Roles')}
+
+
+
+ , [availableRoles, handleRoles, roles, t])}
+ {useMemo(() => handleJoinDefaultChannels &&
+
+
+ {t('Join_default_channels')}
+
+
+ , [handleJoinDefaultChannels, t, joinDefaultChannels])}
+ {useMemo(() => handleSendWelcomeEmail &&
+
+
+ {t('Send_welcome_email')}
+
+
+ , [handleSendWelcomeEmail, t, sendWelcomeEmail])}
+ {hasCustomFields && <>
+
+ {t('Custom_Fields')}
+ }
+
+ { append }
+
;
}
diff --git a/client/channel/ExportMessages/index.js b/client/channel/ExportMessages/index.js
index a60f5ad2903..7dbc537b3fa 100644
--- a/client/channel/ExportMessages/index.js
+++ b/client/channel/ExportMessages/index.js
@@ -1,5 +1,5 @@
import React, { useState, useEffect, useMemo } from 'react';
-import { Field, TextInput, Select, ButtonGroup, Button, Box, Icon, Callout } from '@rocket.chat/fuselage';
+import { Field, TextInput, Select, ButtonGroup, Button, Box, Icon, Callout, FieldGroup } from '@rocket.chat/fuselage';
import { css } from '@rocket.chat/css-in-js';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import toastr from 'toastr';
@@ -61,7 +61,7 @@ const FileExport = ({ onCancel, rid }) => {
};
return (
- <>
+
{t('Date')}
@@ -83,7 +83,7 @@ const FileExport = ({ onCancel, rid }) => {
{t('Export')}
-
+
);
};
@@ -185,12 +185,14 @@ const MailExportForm = ({ onCancel, rid }) => {
};
return (
- <>
- 0 ? 'success' : 'info'}>
- {`${ selectedMessages.length } Messages selected`}
- { selectedMessages.length > 0 && {t('Click here to clear the selection')} }
- { selectedMessages.length === 0 && {t('Click_the_messages_you_would_like_to_send_by_email')} }
-
+
+
+ 0 ? 'success' : 'info'}>
+ {`${ selectedMessages.length } Messages selected`}
+ { selectedMessages.length > 0 && {t('Click here to clear the selection')} }
+ { selectedMessages.length === 0 && {t('Click_the_messages_you_would_like_to_send_by_email')} }
+
+
{t('To_users')}
@@ -220,7 +222,7 @@ const MailExportForm = ({ onCancel, rid }) => {
{t('Send')}
-
+
);
};
@@ -240,16 +242,18 @@ export const ExportMessages = function ExportMessages({ rid, tabBar }) {
{t('Export_Messages')}
tabBar.close()} />
-
-
- {t('Method')}
-
-
-
+
+
+
+ {t('Method')}
+
+
+
+
{type && type === 'file' && tabBar.close()} />}
{type && type === 'email' && tabBar.close()} />}
-
+
);
};
diff --git a/client/components/basic/Buttons/ActionButton.js b/client/components/basic/Buttons/ActionButton.js
index 013f7dd52eb..8e6a9d2cae9 100644
--- a/client/components/basic/Buttons/ActionButton.js
+++ b/client/components/basic/Buttons/ActionButton.js
@@ -1,4 +1,4 @@
import React from 'react';
import { Button, Icon } from '@rocket.chat/fuselage';
// TODO fuselage
-export const ActionButton = ({ icon, ...props }) => ;
+export const ActionButton = ({ icon, ...props }) => ;
diff --git a/client/components/basic/PlanTag.js b/client/components/basic/PlanTag.js
index a33c264fadf..9a3d88d1259 100644
--- a/client/components/basic/PlanTag.js
+++ b/client/components/basic/PlanTag.js
@@ -16,7 +16,7 @@ function PlanTag() {
})();
}, []);
- return plans.map(({ plan, background }) => {plan});
+ return plans.map(({ plan, background }) => {plan});
}
export default PlanTag;
diff --git a/client/components/basic/Sidebar.js b/client/components/basic/Sidebar.js
index 065a6ff9371..c0eb249aacc 100644
--- a/client/components/basic/Sidebar.js
+++ b/client/components/basic/Sidebar.js
@@ -1,9 +1,10 @@
import React, { useMemo } from 'react';
import { css } from '@rocket.chat/css-in-js';
-import { Box, Scrollable, Button, Icon } from '@rocket.chat/fuselage';
+import { Box, Scrollable, Icon } from '@rocket.chat/fuselage';
import { useTranslation } from '../../contexts/TranslationContext';
import { useRoutePath } from '../../contexts/RouterContext';
+import { ActionButton } from './Buttons/ActionButton';
const Sidebar = ({ children, ...props }) =>
{children}
@@ -18,7 +19,7 @@ const Content = ({ children, ...props }) =>
const Header = ({ title, onClose, children = undefined, ...props }) =>
{(title || onClose) &&
{title && {title}}
- {onClose && }
+ {onClose && }
}
{children}
;