From fca4f9ba6c8115d65c459d0e24a063ecc76a5e72 Mon Sep 17 00:00:00 2001
From: Darcy Ye <darcyye@silverhand.io>
Date: Tue, 2 Apr 2024 23:38:50 +0800
Subject: [PATCH] chore(console,phrases): update content and fix console

---
 .../CreateButton/index.module.scss            |  5 ---
 .../pages/CustomizeJwt/CreateButton/index.tsx |  4 --
 .../CustomizerItem/index.module.scss          |  7 +++-
 .../CustomizeJwt/CustomizerItem/index.tsx     |  8 ++--
 .../SettingsSection/InstructionTab/index.tsx  | 38 +++++++++----------
 .../SettingsSection/index.module.scss         |  1 +
 .../CustomizeJwtDetails/MainContent/index.tsx |  8 ++--
 .../CustomizeJwtDetails/utils/config.tsx      |  4 +-
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 .../translation/admin-console/jwt-claims.ts   | 18 ++++-----
 23 files changed, 143 insertions(+), 202 deletions(-)
 delete mode 100644 packages/console/src/pages/CustomizeJwt/CreateButton/index.module.scss

diff --git a/packages/console/src/pages/CustomizeJwt/CreateButton/index.module.scss b/packages/console/src/pages/CustomizeJwt/CreateButton/index.module.scss
deleted file mode 100644
index 4b6cc13ad5d..00000000000
--- a/packages/console/src/pages/CustomizeJwt/CreateButton/index.module.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@use '@/scss/underscore' as _;
-
-.icon {
-  color: var(--color-button-icon);
-}
diff --git a/packages/console/src/pages/CustomizeJwt/CreateButton/index.tsx b/packages/console/src/pages/CustomizeJwt/CreateButton/index.tsx
index 52a76cf3b0e..cd35c9bc480 100644
--- a/packages/console/src/pages/CustomizeJwt/CreateButton/index.tsx
+++ b/packages/console/src/pages/CustomizeJwt/CreateButton/index.tsx
@@ -1,12 +1,9 @@
 import { type LogtoJwtTokenPath } from '@logto/schemas';
 
-import PlusIcon from '@/assets/icons/plus.svg';
 import Button from '@/ds-components/Button';
 import useTenantPathname from '@/hooks/use-tenant-pathname';
 import { getPagePath } from '@/pages/CustomizeJwt/utils/path';
 
-import * as styles from './index.module.scss';
-
 type Props = {
   tokenType: LogtoJwtTokenPath;
 };
@@ -17,7 +14,6 @@ function CreateButton({ tokenType }: Props) {
 
   return (
     <Button
-      icon={<PlusIcon className={styles.icon} />}
       type="primary"
       title="jwt_claims.custom_jwt_create_button"
       onClick={() => {
diff --git a/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.module.scss b/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.module.scss
index a80174c34a4..c1c9852af94 100644
--- a/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.module.scss
+++ b/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.module.scss
@@ -15,9 +15,14 @@
 
   .actions {
     display: flex;
-    gap: _.unit(2);
+    gap: _.unit(4);
     align-items: center;
 
+    .icon {
+      max-width: _.unit(4);
+      max-height: _.unit(4);
+    }
+
     .danger {
       color: var(--color-error);
 
diff --git a/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.tsx b/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.tsx
index b2f0f15f713..1286ffbfc0c 100644
--- a/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.tsx
+++ b/packages/console/src/pages/CustomizeJwt/CustomizerItem/index.tsx
@@ -2,7 +2,7 @@ import { LogtoJwtTokenPath } from '@logto/schemas';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import DeletIcon from '@/assets/icons/delete.svg';
+import DeleteIcon from '@/assets/icons/delete.svg';
 import EditIcon from '@/assets/icons/edit.svg';
 import Button from '@/ds-components/Button';
 import useApi from '@/hooks/use-api';
@@ -53,8 +53,9 @@ function CustomizerItem({ tokenType }: Props) {
       </div>
       <div className={styles.actions}>
         <Button
-          icon={<EditIcon />}
+          icon={<EditIcon className={styles.icon} />}
           type="text"
+          size="small"
           title="general.edit"
           onClick={() => {
             navigate(editLink);
@@ -62,8 +63,9 @@ function CustomizerItem({ tokenType }: Props) {
         />
         <Button
           className={styles.danger}
-          icon={<DeletIcon />}
+          icon={<DeleteIcon className={styles.icon} />}
           type="text"
+          size="small"
           title="general.delete"
           onClick={onDelete}
         />
diff --git a/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/InstructionTab/index.tsx b/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/InstructionTab/index.tsx
index bab6c286cbe..5ffd0e9f8b7 100644
--- a/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/InstructionTab/index.tsx
+++ b/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/InstructionTab/index.tsx
@@ -38,25 +38,6 @@ function InstructionTab({ isActive }: Props) {
 
   return (
     <div className={classNames(tabContentStyles.tabContent, isActive && tabContentStyles.active)}>
-      <div className={tabContentStyles.description}>{t('jwt_claims.jwt_claims_description')}</div>
-      {tokenType === LogtoJwtTokenPath.AccessToken && (
-        <GuideCard
-          name={CardType.UserData}
-          isExpanded={expendCard === CardType.UserData}
-          setExpanded={(expand) => {
-            setExpendCard(expand ? CardType.UserData : undefined);
-          }}
-        >
-          <Editor
-            language="typescript"
-            className={styles.sampleCode}
-            value={jwtCustomizerUserContextTypeDefinition}
-            height="700px"
-            theme="logto-dark"
-            options={typeDefinitionCodeEditorOptions}
-          />
-        </GuideCard>
-      )}
       <GuideCard
         name={CardType.TokenData}
         isExpanded={expendCard === CardType.TokenData}
@@ -77,6 +58,24 @@ function InstructionTab({ isActive }: Props) {
           options={typeDefinitionCodeEditorOptions}
         />
       </GuideCard>
+      {tokenType === LogtoJwtTokenPath.AccessToken && (
+        <GuideCard
+          name={CardType.UserData}
+          isExpanded={expendCard === CardType.UserData}
+          setExpanded={(expand) => {
+            setExpendCard(expand ? CardType.UserData : undefined);
+          }}
+        >
+          <Editor
+            language="typescript"
+            className={styles.sampleCode}
+            value={jwtCustomizerUserContextTypeDefinition}
+            height="700px"
+            theme="logto-dark"
+            options={typeDefinitionCodeEditorOptions}
+          />
+        </GuideCard>
+      )}
       <GuideCard
         name={CardType.FetchExternalData}
         isExpanded={expendCard === CardType.FetchExternalData}
@@ -114,6 +113,7 @@ function InstructionTab({ isActive }: Props) {
           options={sampleCodeEditorOptions}
         />
       </GuideCard>
+      <div className={tabContentStyles.description}>{t('jwt_claims.jwt_claims_description')}</div>
     </div>
   );
 }
diff --git a/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/index.module.scss b/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/index.module.scss
index 25f20ce168f..cc0b98018a2 100644
--- a/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/index.module.scss
+++ b/packages/console/src/pages/CustomizeJwtDetails/MainContent/SettingsSection/index.module.scss
@@ -48,6 +48,7 @@
   .description {
     font: var(--font-body-2);
     color: var(--color-text-secondary);
+    padding: 0 _.unit(1);
   }
 }
 
diff --git a/packages/console/src/pages/CustomizeJwtDetails/MainContent/index.tsx b/packages/console/src/pages/CustomizeJwtDetails/MainContent/index.tsx
index 05bc972a579..7147bf7cb18 100644
--- a/packages/console/src/pages/CustomizeJwtDetails/MainContent/index.tsx
+++ b/packages/console/src/pages/CustomizeJwtDetails/MainContent/index.tsx
@@ -56,11 +56,13 @@ function MainContent<T extends LogtoJwtTokenPath>({
       const { tokenType } = data;
       const payload = formatFormDataToRequestData(data);
 
-      await api.put(getApiPath(tokenType), { json: payload });
+      const updatedJwtCustomizer = await api
+        .put(getApiPath(tokenType), { json: payload })
+        .json<JwtCustomizer<T>>();
 
-      const result = await mutate();
+      await mutate(updatedJwtCustomizer);
 
-      reset(formatResponseDataToFormData(tokenType, result));
+      reset(formatResponseDataToFormData(tokenType, updatedJwtCustomizer));
 
       /**
        * Should `reset` (to set `isDirty` to false) before navigating back to the custom JWT listing page.
diff --git a/packages/console/src/pages/CustomizeJwtDetails/utils/config.tsx b/packages/console/src/pages/CustomizeJwtDetails/utils/config.tsx
index d55c7d4bf2a..bf5341b403e 100644
--- a/packages/console/src/pages/CustomizeJwtDetails/utils/config.tsx
+++ b/packages/console/src/pages/CustomizeJwtDetails/utils/config.tsx
@@ -82,7 +82,7 @@ export const defaultAccessTokenJwtCustomizerCode = `/**
 * @returns The custom claims.
 */
 
-exports.getCustomJwtClaims = async (token, data) => {
+exports.getCustomJwtClaims = async (token, data, envVariables) => {
   return {};
 }`;
 
@@ -95,7 +95,7 @@ export const defaultClientCredentialsJwtCustomizerCode = `/**
 * @returns The custom claims.
 */
 
-exports.getCustomJwtClaims = async (token) => {
+exports.getCustomJwtClaims = async (token, envVariables) => {
   return {};
 }`;
 
diff --git a/packages/phrases/src/locales/de/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/de/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/de/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/de/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/en/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/en/translation/admin-console/jwt-claims.ts
index cc8273650bc..1f856d7784f 100644
--- a/packages/phrases/src/locales/en/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/en/translation/admin-console/jwt-claims.ts
@@ -11,11 +11,11 @@ const jwt_claims = {
   machine_to_machine_jwt: {
     card_title: 'For M2M',
     card_field: 'Machine-to-machine token',
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     for: 'for M2M',
   },
   code_editor_title: 'Customize the {{token}} claims',
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   custom_jwt_item: 'Custom claims {{for}}',
   delete_modal_title: 'Delete custom claims',
   delete_modal_content: 'Are you sure you want to delete the custom claims?',
@@ -25,28 +25,24 @@ const jwt_claims = {
   restored: 'Restored',
   data_source_tab: 'Data source',
   test_tab: 'Test claim',
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     title: 'User data',
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     title: 'Token data',
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     title: 'Fetch external data',
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
   },
   environment_variables: {
     title: 'Set environment variables',
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     input_field_title: 'Add environment variables',
     sample_code: 'Accessing environment variables in your custom JWT claims handler. Example: ',
   },
diff --git a/packages/phrases/src/locales/es/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/es/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/es/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/es/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/fr/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/fr/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/fr/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/fr/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/it/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/it/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/it/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/it/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/ja/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/ja/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/ja/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/ja/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/ko/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/ko/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/ko/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/ko/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/pl-pl/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/pl-pl/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/pl-pl/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/pl-pl/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/pt-br/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/pt-br/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/pt-br/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/pt-br/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/pt-pt/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/pt-pt/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/pt-pt/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/pt-pt/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/ru/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/ru/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/ru/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/ru/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/tr-tr/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/tr-tr/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/tr-tr/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/tr-tr/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/zh-cn/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/zh-hk/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/zh-hk/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/zh-hk/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/zh-hk/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */
diff --git a/packages/phrases/src/locales/zh-tw/translation/admin-console/jwt-claims.ts b/packages/phrases/src/locales/zh-tw/translation/admin-console/jwt-claims.ts
index fffd62734a0..852edbc5f00 100644
--- a/packages/phrases/src/locales/zh-tw/translation/admin-console/jwt-claims.ts
+++ b/packages/phrases/src/locales/zh-tw/translation/admin-console/jwt-claims.ts
@@ -20,14 +20,14 @@ const jwt_claims = {
     /** UNTRANSLATED */
     card_field: 'Machine-to-machine token',
     /** UNTRANSLATED */
-    card_description: 'Add extra data fro machine-to-machine communication.',
+    card_description: 'Add extra data during machine-to-machine token issuance.',
     /** UNTRANSLATED */
     for: 'for M2M',
   },
   /** UNTRANSLATED */
   code_editor_title: 'Customize the {{token}} claims',
   /** UNTRANSLATED */
-  custom_jwt_create_button: 'Create custom claims',
+  custom_jwt_create_button: 'Add custom claims',
   /** UNTRANSLATED */
   custom_jwt_item: 'Custom claims {{for}}',
   /** UNTRANSLATED */
@@ -47,27 +47,24 @@ const jwt_claims = {
   /** UNTRANSLATED */
   test_tab: 'Test claim',
   /** UNTRANSLATED */
-  jwt_claims_description:
-    'Handler that will be called during the access token generation process to add custom claims to the token. The function should return an object with the custom claims.',
+  jwt_claims_description: 'Default claims are auto-included in the JWT and cannot be overridden.',
   user_data: {
     /** UNTRANSLATED */
     title: 'User data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `data.user`, providing essential user information linked to the present access token.',
+    subtitle: 'Use `data.user` input parameter to provide vital user info.',
   },
   token_data: {
     /** UNTRANSLATED */
     title: 'Token data',
     /** UNTRANSLATED */
-    subtitle:
-      'Input parameter `token`, providing the payload of the current access token for contextual reference.',
+    subtitle: 'Use `token` input parameter for current access token payload. ',
   },
   fetch_external_data: {
     /** UNTRANSLATED */
     title: 'Fetch external data',
     /** UNTRANSLATED */
-    subtitle: 'Incorporate data sources from your external APIs directly into your custom claims.',
+    subtitle: 'Incorporate data from your external APIs directly into claims.',
     /** UNTRANSLATED */
     description:
       'Use the `fetch` function to call your external APIs and include the data in your custom claims. Example: ',
@@ -76,8 +73,7 @@ const jwt_claims = {
     /** UNTRANSLATED */
     title: 'Set environment variables',
     /** UNTRANSLATED */
-    subtitle:
-      'Use environment variables to store sensitive information and access them in your custom claims handler.',
+    subtitle: 'Use environment variables to store sensitive information.',
     /** UNTRANSLATED */
     input_field_title: 'Add environment variables',
     /** UNTRANSLATED */