fewer params for isPayer,simplify paidPolicy check

Expensify · Mar 4, 2024 · e9306bd · e9306bd
1 parent f0b7d00
commit e9306bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
@@ -55,11 +55,10 @@ function MoneyReportHeader({session, policy, chatReport, nextStep, report: money
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
     const canAllowSettlement = ReportUtils.hasUpdatedTotal(moneyRequestReport);
     const policyType = policy?.type;
-    const isPolicyAdmin = policyType !== CONST.POLICY.TYPE.PERSONAL && policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isAutoReimbursable = ReportUtils.canBeAutoReimbursed(moneyRequestReport, policy);
     const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicy(moneyRequestReport);
     const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && session?.accountID === moneyRequestReport.managerID;
-    const isPayer = ReportUtils.isPayer(policy, session, moneyRequestReport, isPaidGroupPolicy, isPolicyAdmin);
+    const isPayer = ReportUtils.isPayer(session, moneyRequestReport);
     const isDraft = ReportUtils.isDraftExpenseReport(moneyRequestReport);
     const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
 

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
@@ -120,7 +120,6 @@ function ReportPreview({
     const managerID = iouReport?.managerID ?? 0;
     const isCurrentUserManager = managerID === session?.accountID;
     const {totalDisplaySpend, reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(iouReport);
-    const policyType = policy?.type;
     const isAutoReimbursable = ReportUtils.canBeAutoReimbursed(iouReport, policy);
 
     const iouSettled = ReportUtils.isSettled(iouReportID);
@@ -208,8 +207,7 @@ function ReportPreview({
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
 
     const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicyExpenseChat(chatReport);
-    const isPolicyAdmin = policyType !== CONST.POLICY.TYPE.PERSONAL && policy?.role === CONST.POLICY.ROLE.ADMIN;
-    const isPayer = ReportUtils.isPayer(policy, session, iouReport, isPaidGroupPolicy, isPolicyAdmin);
+    const isPayer = ReportUtils.isPayer(session, iouReport);
     const isOnInstantSubmitPolicy = PolicyUtils.isInstantSubmitEnabled(policy);
     const isOnSubmitAndClosePolicy = PolicyUtils.isSubmitAndClose(policy);
     const shouldShowPayButton = useMemo(

diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
@@ -137,7 +137,7 @@ function SettlementButton({
     const policy = ReportUtils.getPolicy(policyID);
     const session = useSession();
     const chatReport = ReportUtils.getReport(chatReportID);
-    const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicy(iouReport as OnyxEntry<Report>) || ReportUtils.isPaidGroupPolicyExpenseChat(chatReport as OnyxEntry<Report>);
+    const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicyExpenseChat(chatReport as OnyxEntry<Report>);
     const shouldShowPaywithExpensifyOption =
         !isPaidGroupPolicy ||
         (!shouldHidePaymentOptions && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && policy?.reimburserEmail === session?.email);

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -1225,17 +1225,13 @@ function isOneOnOneChat(report: OnyxEntry<Report>): boolean {
  * Checks if the current user is a payer of the request
  */
 
-function isPayer(
-    policy: OnyxEntry<Policy> | EmptyObject,
-    session: OnyxEntry<Session>,
-    iouReport: OnyxEntry<Report>,
-    // eslint-disable-next-line @typescript-eslint/no-shadow
-    isPaidGroupPolicy: boolean,
-    isAdmin: boolean,
-) {
+function isPayer(session: OnyxEntry<Session>, iouReport: OnyxEntry<Report>) {
     const isApproved = isReportApproved(iouReport);
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`] ?? null;
+    const policyType = policy?.type;
+    const isAdmin = policyType !== CONST.POLICY.TYPE.PERSONAL && policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isManager = iouReport?.managerID === session?.accountID;
-    if (isPaidGroupPolicy) {
+    if (isPaidGroupPolicy(iouReport)) {
         if (policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES) {
             const isReimburser = session?.email === policy?.reimburserEmail;
             return isReimburser && (isApproved || isManager);
@@ -1630,10 +1626,9 @@ function getIcons(
             name: personalDetails?.[report?.ownerAccountID ?? -1]?.displayName ?? '',
             fallbackIcon: personalDetails?.[report?.ownerAccountID ?? -1]?.fallbackIcon,
         };
-        // eslint-disable-next-line @typescript-eslint/no-shadow
-        const isPayer = currentUserAccountID === report?.managerID;
+        const isManager = currentUserAccountID === report?.managerID;
 
-        return isPayer ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
+        return isManager ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
     }
 
     return getIconsForParticipants(report?.participantAccountIDs ?? [], personalDetails);