From 57246134dcfd91cd3a80ef1640439343fe9ba358 Mon Sep 17 00:00:00 2001
From: Kelsey Thomas <101993653+Kelsey-Ethyca@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:10:27 -0700
Subject: [PATCH] hide custom fields section when there are no custom fields
 created (#3554)

---
 CHANGELOG.md                                                    | 1 +
 .../src/features/common/custom-fields/CustomFieldsList.tsx      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ceca45fa1a..06c9e32a1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ The types of changes are:
 
 - Fix race condition with consent modal link rendering [#3521](https://github.com/ethyca/fides/pull/3521)
 - Remove the `fides-js` banner from tab order when it is hidden and move the overlay components to the top of the tab order. [#3510](https://github.com/ethyca/fides/pull/3510)
+- Hide custom fields section when there are no custom fields created [#3554](https://github.com/ethyca/fides/pull/3554)
 - Disable connector dropdown in integration tab on save [#3552](https://github.com/ethyca/fides/pull/3552)
 - Handles an edge case for non-existent identities with the Kustomer API [#3513](https://github.com/ethyca/fides/pull/3513)
 
diff --git a/clients/admin-ui/src/features/common/custom-fields/CustomFieldsList.tsx b/clients/admin-ui/src/features/common/custom-fields/CustomFieldsList.tsx
index 00b77aecc9..8435d43430 100644
--- a/clients/admin-ui/src/features/common/custom-fields/CustomFieldsList.tsx
+++ b/clients/admin-ui/src/features/common/custom-fields/CustomFieldsList.tsx
@@ -26,7 +26,7 @@ export const CustomFieldsList = ({
     resourceType,
   });
 
-  if (!isEnabled) {
+  if (!isEnabled || sortedCustomFieldDefinitionIds.length === 0) {
     return null;
   }