From cafdad75daa9ccaa9145bfca06f1e9c4baabf6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 4 Jan 2024 18:40:35 -0600 Subject: [PATCH] Refactor DIRECT_REIMBURSEMENT_CURRENCIES array in CONST.ts and update type declaration in ReportUtils.ts --- src/CONST.ts | 11 ++--------- src/libs/ReportUtils.ts | 9 +++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index aa304baaf19f..742a91dfac1c 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -448,14 +448,7 @@ const CONST = { EUR: 'EUR', }, get DIRECT_REIMBURSEMENT_CURRENCIES() { - return [ - this.CURRENCY.USD, - this.CURRENCY.AUD, - this.CURRENCY.CAD, - this.CURRENCY.GBP, - this.CURRENCY.NZD, - this.CURRENCY.EUR, - ]; + return [this.CURRENCY.USD, this.CURRENCY.AUD, this.CURRENCY.CAD, this.CURRENCY.GBP, this.CURRENCY.NZD, this.CURRENCY.EUR]; }, EXAMPLE_PHONE_NUMBER: '+15005550006', CONCIERGE_CHAT_NAME: 'Concierge', @@ -1307,7 +1300,7 @@ const CONST = { REIMBURSEMENT_YES: 'reimburseYes', REIMBURSEMENT_NO: 'reimburseNo', REIMBURSEMENT_MANUAL: 'reimburseManual', - } + }, }, CUSTOM_UNITS: { diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index e077f30369f6..733c972042c0 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -4275,10 +4275,15 @@ function canBeAutoReimbursed(report: OnyxEntry, policy: OnyxEntry= reimbursableTotal && reimbursableTotal > 0 && CONST.DIRECT_REIMBURSEMENT_CURRENCIES.includes(report?.currency as CurrencyType); + const isAutoReimbursable = + isGroupPolicy(report) && + policy.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && + autoReimbursementLimit >= reimbursableTotal && + reimbursableTotal > 0 && + CONST.DIRECT_REIMBURSEMENT_CURRENCIES.includes(report?.currency as CurrencyType); return isAutoReimbursable; }