From 6e49a3e1c32bf2d747c655710f6f7cba070143f7 Mon Sep 17 00:00:00 2001
From: Peer Richelsen <peeroke@gmail.com>
Date: Wed, 21 Sep 2022 16:35:19 +0000
Subject: [PATCH] fixed <Meta> and fixed dropdown in api keys (#4652)

* fixed dropdown in api keys

* nit

* fixed meta title for settings
---
 .../pages/v2/settings/developer/api-keys.tsx  |  2 +-
 .../v2/settings/my-account/conferencing.tsx   |  2 +-
 apps/web/public/static/locales/en/common.json |  2 +-
 .../api-keys/components/v2/ApiKeyListItem.tsx | 35 ++++++++++---------
 .../ee/teams/pages/team-appearance-view.tsx   |  2 +-
 .../ee/teams/pages/team-members-view.tsx      |  2 +-
 .../ee/teams/pages/team-profile-view.tsx      |  2 +-
 .../webhooks/pages/webhook-edit-view.tsx      |  6 +++-
 .../webhooks/pages/webhook-new-view.tsx       |  6 +++-
 .../features/webhooks/pages/webhooks-view.tsx |  5 ++-
 10 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/apps/web/pages/v2/settings/developer/api-keys.tsx b/apps/web/pages/v2/settings/developer/api-keys.tsx
index f10449b9b1..ab5594b81e 100644
--- a/apps/web/pages/v2/settings/developer/api-keys.tsx
+++ b/apps/web/pages/v2/settings/developer/api-keys.tsx
@@ -39,7 +39,7 @@ const ApiKeysView = () => {
 
   return (
     <>
-      <Meta title="api_keys" description="webhooks_description" />
+      <Meta title="API Keys" description="API keys allow other apps to communicate with Cal.com" />
 
       <LicenseRequired>
         <>
diff --git a/apps/web/pages/v2/settings/my-account/conferencing.tsx b/apps/web/pages/v2/settings/my-account/conferencing.tsx
index 15f27f4eb7..6d7cc95993 100644
--- a/apps/web/pages/v2/settings/my-account/conferencing.tsx
+++ b/apps/web/pages/v2/settings/my-account/conferencing.tsx
@@ -51,7 +51,7 @@ const ConferencingLayout = () => {
 
   return (
     <div className="w-full bg-white sm:mx-0 xl:mt-0">
-      <Meta title="conferencing" description="conferencing_description" />
+      <Meta title="Conferencing" description="Add your favourite video conferencing apps for your meetings" />
       <List roundContainer={true}>
         {apps?.items &&
           apps.items
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 1c30204427..0f09cf60a7 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1196,7 +1196,7 @@
   "event_one": "event",
   "event_other": "events",
   "profile_team_description": "Manage settings for your team profile",
-  "members_team_description": "Users that are in the group. Apes together strong!",
+  "members_team_description": "Users that are in the group",
   "team_url": "Team URL",
   "delete_team": "Delete Team",
   "team_members": "Team members",
diff --git a/packages/features/ee/api-keys/components/v2/ApiKeyListItem.tsx b/packages/features/ee/api-keys/components/v2/ApiKeyListItem.tsx
index 3157c90310..70f2a11191 100644
--- a/packages/features/ee/api-keys/components/v2/ApiKeyListItem.tsx
+++ b/packages/features/ee/api-keys/components/v2/ApiKeyListItem.tsx
@@ -7,6 +7,7 @@ import { Icon } from "@calcom/ui";
 import Badge from "@calcom/ui/v2/core/Badge";
 import Button from "@calcom/ui/v2/core/Button";
 import Dropdown, {
+  DropdownItem,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
@@ -50,7 +51,7 @@ const ApiKeyListItem = ({
               {t("active")}
             </Badge>
           )}
-          <p className="text-gray-600">
+          <p className="text-xs text-gray-600">
             {" "}
             {neverExpires ? (
               <div className="flex flex-row space-x-3 text-gray-500">{t("api_key_never_expires")}</div>
@@ -63,24 +64,26 @@ const ApiKeyListItem = ({
       <div>
         <Dropdown>
           <DropdownMenuTrigger asChild>
-            <Button size="icon" StartIcon={Icon.FiMoreHorizontal} color="secondary" />
+            <Button type="button" size="icon" color="secondary" StartIcon={Icon.FiMoreHorizontal} />
           </DropdownMenuTrigger>
+
           <DropdownMenuContent>
-            <DropdownMenuItem
-              className="flex items-center space-x-2.5 py-3 pr-32 pl-3.5"
-              onClick={onEditClick}>
-              <Icon.FiEdit2 />
-              <p>{t("edit")}</p>
+            <DropdownMenuItem>
+              <DropdownItem type="button" onClick={onEditClick} StartIcon={Icon.FiEdit2}>
+                {t("edit") as string}
+              </DropdownItem>
             </DropdownMenuItem>
-            <DropdownMenuItem
-              className="flex items-center space-x-2.5 py-3 pr-32 pl-3.5"
-              onClick={() =>
-                deleteApiKey.mutate({
-                  id: apiKey.id,
-                })
-              }>
-              <Icon.FiTrash2 />
-              <p>{t("delete")}</p>
+            <DropdownMenuItem>
+              <DropdownItem
+                type="button"
+                onClick={() =>
+                  deleteApiKey.mutate({
+                    id: apiKey.id,
+                  })
+                }
+                StartIcon={Icon.FiTrash}>
+                {t("delete") as string}
+              </DropdownItem>
             </DropdownMenuItem>
           </DropdownMenuContent>
         </Dropdown>
diff --git a/packages/features/ee/teams/pages/team-appearance-view.tsx b/packages/features/ee/teams/pages/team-appearance-view.tsx
index ba16ce06e9..ab6b99d40b 100644
--- a/packages/features/ee/teams/pages/team-appearance-view.tsx
+++ b/packages/features/ee/teams/pages/team-appearance-view.tsx
@@ -45,7 +45,7 @@ const ProfileView = () => {
 
   return (
     <>
-      <Meta title="booking_appearance" description="appearance_team_description" />
+      <Meta title="Booking Appearance" description="Manage settings for your team's booking appearance" />
       {!isLoading && (
         <>
           {isAdmin ? (
diff --git a/packages/features/ee/teams/pages/team-members-view.tsx b/packages/features/ee/teams/pages/team-members-view.tsx
index 7ce3062c15..50138e4310 100644
--- a/packages/features/ee/teams/pages/team-members-view.tsx
+++ b/packages/features/ee/teams/pages/team-members-view.tsx
@@ -36,7 +36,7 @@ const MembersView = () => {
 
   return (
     <>
-      <Meta title="team_members" description="members_team_description" />
+      <Meta title="Team Members" description="Users that are in the group" />
       {!isLoading && (
         <>
           <div>
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index 702fea3616..01bbb71d11 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -103,7 +103,7 @@ const ProfileView = () => {
 
   return (
     <>
-      <Meta title="profile" description="profile_team_description" />
+      <Meta title="Profile" description="Manage settings for your team profile" />
       {!isLoading && (
         <>
           {isAdmin ? (
diff --git a/packages/features/webhooks/pages/webhook-edit-view.tsx b/packages/features/webhooks/pages/webhook-edit-view.tsx
index ef7f298920..75857c8bf2 100644
--- a/packages/features/webhooks/pages/webhook-edit-view.tsx
+++ b/packages/features/webhooks/pages/webhook-edit-view.tsx
@@ -50,7 +50,11 @@ const EditWebhook = () => {
 
   return (
     <>
-      <Meta title="edit_webhook" description="add_webhook_description" backButton />
+      <Meta
+        title="Edit Webhook"
+        description="Receive meeting data in real-time when something happens in Cal.com"
+        backButton
+      />
       <WebhookForm
         webhook={webhook}
         onSubmit={(values: WebhookFormSubmitData) => {
diff --git a/packages/features/webhooks/pages/webhook-new-view.tsx b/packages/features/webhooks/pages/webhook-new-view.tsx
index 35ac4e895a..c18e0567d4 100644
--- a/packages/features/webhooks/pages/webhook-new-view.tsx
+++ b/packages/features/webhooks/pages/webhook-new-view.tsx
@@ -63,7 +63,11 @@ const NewWebhookView = () => {
 
   return (
     <>
-      <Meta title="add_webhook" description="add_webhook_description" backButton />
+      <Meta
+        title="Add Webhook"
+        description="Receive meeting data in real-time when something happens in Cal.com"
+        backButton
+      />
 
       <WebhookForm onSubmit={onCreateWebhook} apps={installedApps?.items.map((app) => app.slug)} />
     </>
diff --git a/packages/features/webhooks/pages/webhooks-view.tsx b/packages/features/webhooks/pages/webhooks-view.tsx
index 2256134a1d..af51aef371 100644
--- a/packages/features/webhooks/pages/webhooks-view.tsx
+++ b/packages/features/webhooks/pages/webhooks-view.tsx
@@ -15,7 +15,10 @@ import { WebhookListItem, WebhookListSkeleton } from "../components";
 const WebhooksView = () => {
   return (
     <>
-      <Meta title="webhooks" description="webhooks_description" />
+      <Meta
+        title="Webhooks"
+        description="Receive meeting data in real-time when something happens in Cal.com"
+      />
       <div>
         <Suspense fallback={<WebhookListSkeleton />}>
           <WebhooksList />