diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 362df1fe6ff9..f5589addb083 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -12014,6 +12014,7 @@ function saveSplitTransactions(draftTransaction: OnyxEntry>(() => getTransactionDetails(splitExpenseDraftTransaction) ?? {}, [splitExpenseDraftTransaction]); + const policy = getPolicy(report?.policyID); + const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`, {canBeMissing: false}); + const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`, {canBeMissing: false}); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: false}); const transactionDetails = useMemo>(() => getTransactionDetails(transaction) ?? {}, [transaction]); @@ -45,8 +52,11 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) { const currentAmount = transactionDetailsAmount >= 0 ? Math.abs(Number(splitExpenseDraftTransactionDetails?.amount)) : Number(splitExpenseDraftTransactionDetails?.amount); const currentDescription = getParsedComment(Parser.htmlToMarkdown(splitExpenseDraftTransactionDetails?.comment ?? '')); - const report = getReportOrDraftReport(reportID); - const policy = getPolicy(report?.policyID); + const transactionTag = getTag(splitExpenseDraftTransaction); + const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]); + + const shouldShowTag = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists)); + const shouldShowCategory = !!policy?.areCategoriesEnabled && !!policyCategories; return ( @@ -59,7 +69,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) { })} onBackButtonPress={() => Navigation.goBack(backTo)} /> - + - {!!policy?.areCategoriesEnabled && ( + {shouldShowCategory && ( )} - {!!policy?.areTagsEnabled && ( + {shouldShowTag && ( { Navigation.navigate( @@ -146,7 +156,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) { style={[styles.moneyRequestMenuItem]} titleStyle={styles.flex1} /> - + {Number(splitExpensesList?.length) > 2 && (