diff --git a/packages/console/src/components/ApplicationCreation/index.tsx b/packages/console/src/components/ApplicationCreation/index.tsx index 94ce16ef9..1bc0566b4 100644 --- a/packages/console/src/components/ApplicationCreation/index.tsx +++ b/packages/console/src/components/ApplicationCreation/index.tsx @@ -35,7 +35,6 @@ function ApplicationCreation({ onCompleted, ...reset }: Props) { return ( - {!isForUser && isMachineToMachineRoleCreationHintVisible && ( -
- , - }} - > - {t('applications.m2m_role_assignment.role_creation_hint')} - -
- )} +
+ , + }} + > + {t( + isForUser + ? 'user_details.roles.create_user_role_hint' + : 'applications.m2m_role_assignment.role_creation_hint' + )} + +
); diff --git a/packages/console/src/pages/Roles/components/CreateRoleForm/index.module.scss b/packages/console/src/pages/Roles/components/CreateRoleForm/index.module.scss index d4b7a13ad..ffa1e76b0 100644 --- a/packages/console/src/pages/Roles/components/CreateRoleForm/index.module.scss +++ b/packages/console/src/pages/Roles/components/CreateRoleForm/index.module.scss @@ -5,10 +5,6 @@ gap: _.unit(6); } -.roleTypeSelectionSwitch { - margin-top: _.unit(2); -} - .trailingIcon { width: 16px; height: 16px; diff --git a/packages/console/src/pages/Roles/components/CreateRoleForm/index.tsx b/packages/console/src/pages/Roles/components/CreateRoleForm/index.tsx index ae3282664..f4433e696 100644 --- a/packages/console/src/pages/Roles/components/CreateRoleForm/index.tsx +++ b/packages/console/src/pages/Roles/components/CreateRoleForm/index.tsx @@ -2,14 +2,10 @@ import { type AdminConsoleKey } from '@logto/phrases'; import type { Role, ScopeResponse } from '@logto/schemas'; import { RoleType, internalRolePrefix } from '@logto/schemas'; import { conditional } from '@silverhand/essentials'; -import { useState } from 'react'; import { Controller, useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import KeyboardArrowDown from '@/assets/icons/keyboard-arrow-down.svg'; -import KeyboardArrowUp from '@/assets/icons/keyboard-arrow-up.svg'; import RoleScopesTransfer from '@/components/RoleScopesTransfer'; -import Button from '@/ds-components/Button'; import DynamicT from '@/ds-components/DynamicT'; import FormField from '@/ds-components/FormField'; import ModalLayout from '@/ds-components/ModalLayout'; @@ -41,7 +37,6 @@ type CreateRolePayload = Pick & { }; function CreateRoleForm({ onClose }: Props) { - const [isTypeSelectorVisible, setIsTypeSelectorVisible] = useState(false); const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' }); const { @@ -106,47 +101,27 @@ function CreateRoleForm({ onClose }: Props) { placeholder={t('roles.role_name_placeholder')} error={errors.name?.message} /> -