From ab7770b5c377048907a852c5956bc509a61a6b9b Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Feb 2025 17:28:14 +0700 Subject: [PATCH 1/5] fix: Add Description Hints to NewDot --- .../iou/request/step/IOURequestStepDescription.tsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx index 7006b66ed3b9..b33d39262df2 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.tsx +++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx @@ -45,6 +45,7 @@ function IOURequestStepDescription({ const policy = usePolicy(report?.policyID); const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`); const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`); + const [draftTransaciton] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`); const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`); const reportActionsReportID = useMemo(() => { let actionsReportID; @@ -134,6 +135,16 @@ function IOURequestStepDescription({ const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !isMoneyRequestAction(reportAction) || !canEditMoneyRequest(reportAction)); const isReportInGroupPolicy = !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE; + const getDescriptionHint = () => { + if (!policyCategories) { + return ''; + } + const categoryName = Object.keys(policyCategories) + .filter((value) => value === draftTransaciton?.category) + .at(0); + return categoryName ? policyCategories[categoryName].commentHint : ''; + }; + return ( From f3f406257547ab12b20dd64ffefc663ec0377dd8 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Feb 2025 17:41:05 +0700 Subject: [PATCH 2/5] add descrition hint after create expense --- src/pages/iou/request/step/IOURequestStepDescription.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx index b33d39262df2..ef3c564de165 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.tsx +++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx @@ -134,13 +134,12 @@ function IOURequestStepDescription({ // eslint-disable-next-line rulesdir/no-negated-variables const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !isMoneyRequestAction(reportAction) || !canEditMoneyRequest(reportAction)); const isReportInGroupPolicy = !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE; - const getDescriptionHint = () => { if (!policyCategories) { return ''; } const categoryName = Object.keys(policyCategories) - .filter((value) => value === draftTransaciton?.category) + .filter((value) => value === draftTransaciton?.category || value === transaction?.category) .at(0); return categoryName ? policyCategories[categoryName].commentHint : ''; }; From d293cdb4370a8f32bb65ae02da37bf5e57e703fe Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Thu, 6 Feb 2025 16:56:22 +0700 Subject: [PATCH 3/5] fix logic show des hint --- src/pages/iou/request/step/IOURequestStepDescription.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx index ef3c564de165..b9a710db2a02 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.tsx +++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx @@ -45,7 +45,6 @@ function IOURequestStepDescription({ const policy = usePolicy(report?.policyID); const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`); const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`); - const [draftTransaciton] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`); const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`); const reportActionsReportID = useMemo(() => { let actionsReportID; @@ -139,7 +138,7 @@ function IOURequestStepDescription({ return ''; } const categoryName = Object.keys(policyCategories) - .filter((value) => value === draftTransaciton?.category || value === transaction?.category) + .filter((value) => value === transaction?.category) .at(0); return categoryName ? policyCategories[categoryName].commentHint : ''; }; From 30449d0f99f4bd904c9dfc0ff95aafd34c5a009b Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 7 Feb 2025 15:59:25 +0700 Subject: [PATCH 4/5] fix: logic get description hint --- src/pages/iou/request/step/IOURequestStepDescription.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx index b9a710db2a02..2023bb771280 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.tsx +++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx @@ -134,13 +134,7 @@ function IOURequestStepDescription({ const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !isMoneyRequestAction(reportAction) || !canEditMoneyRequest(reportAction)); const isReportInGroupPolicy = !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE; const getDescriptionHint = () => { - if (!policyCategories) { - return ''; - } - const categoryName = Object.keys(policyCategories) - .filter((value) => value === transaction?.category) - .at(0); - return categoryName ? policyCategories[categoryName].commentHint : ''; + return transaction?.category && policyCategories ? policyCategories[transaction?.category].commentHint : ''; }; return ( From 6dca6b760ddae8fc2d28fed07174fdf79d518ae0 Mon Sep 17 00:00:00 2001 From: nkdengineer <161821005+nkdengineer@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:06:01 +0700 Subject: [PATCH 5/5] Update src/pages/iou/request/step/IOURequestStepDescription.tsx Co-authored-by: ahmedGaber93 <41129870+ahmedGaber93@users.noreply.github.com> --- src/pages/iou/request/step/IOURequestStepDescription.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx index 2023bb771280..70bb913d0738 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.tsx +++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx @@ -134,7 +134,7 @@ function IOURequestStepDescription({ const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !isMoneyRequestAction(reportAction) || !canEditMoneyRequest(reportAction)); const isReportInGroupPolicy = !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE; const getDescriptionHint = () => { - return transaction?.category && policyCategories ? policyCategories[transaction?.category].commentHint : ''; + return transaction?.category && policyCategories ? policyCategories[transaction?.category]?.commentHint ?? '' : ''; }; return (