reverted typescript changes

Expensify · Jan 19, 2024 · 87bbdc6 · 87bbdc6
1 parent 9dbde5a
commit 87bbdc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
@@ -2,7 +2,7 @@ import Str from 'expensify-common/lib/str';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Policy, PolicyMembers, PolicyTags} from '@src/types/onyx';
+import type {PersonalDetailsList, Policy, PolicyMembers, PolicyTag, PolicyTags} from '@src/types/onyx';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -158,7 +158,7 @@ function getIneligibleInvitees(policyMembers: OnyxEntry<PolicyMembers>, personal
 /**
  * Gets the tag from policy tags, defaults to the first if no key is provided.
  */
-function getTag(policyTags: OnyxEntry<Record<string, PolicyTags>>, tagKey?: keyof typeof policyTags): PolicyTags | undefined | EmptyObject {
+function getTag(policyTags: OnyxEntry<PolicyTags>, tagKey?: keyof typeof policyTags): PolicyTag | undefined | EmptyObject {
     if (isEmptyObject(policyTags)) {
         return {};
     }
@@ -171,7 +171,7 @@ function getTag(policyTags: OnyxEntry<Record<string, PolicyTags>>, tagKey?: keyo
 /**
  * Gets the first tag name from policy tags.
  */
-function getTagListName(policyTags: OnyxCollection<PolicyTags>) {
+function getTagListName(policyTags: OnyxEntry<PolicyTags>) {
     if (Object.keys(policyTags ?? {})?.length === 0) {
         return '';
     }

diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 import type {Phrase, PhraseParameters} from '@libs/Localize';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyCategories, PolicyTag, Transaction, TransactionViolation} from '@src/types/onyx';
+import type {PolicyCategories, PolicyTags, Transaction, TransactionViolation} from '@src/types/onyx';
 
 const ViolationsUtils = {
     /**
@@ -14,7 +14,7 @@ const ViolationsUtils = {
         transaction: Transaction,
         transactionViolations: TransactionViolation[],
         policyRequiresTags: boolean,
-        policyTags: Record<string, PolicyTag>,
+        policyTags: PolicyTags,
         policyRequiresCategories: boolean,
         policyCategories: PolicyCategories,
     ): {

diff --git a/src/types/onyx/PolicyTag.ts b/src/types/onyx/PolicyTag.ts
@@ -10,10 +10,6 @@ type PolicyTag = {
     'GL Code': string;
 };
 
-type PolicyTags = {
-    name: string;
-    required: boolean;
-    tags: Record<string, PolicyTag>;
-};
+type PolicyTags = Record<string, PolicyTag>;
 
 export type {PolicyTag, PolicyTags};