added a check if current is admin and manager to show gbr if there is a manager assigned

Author: kubabutkiewicz

src/libs/ReportUtils.ts

@@ -2396,11 +2396,17 @@ function isPayer(session: OnyxEntry<Session>, iouReport: OnyxEntry<Report>, only
     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(iouReport)) {
         if (policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES) {
-            // If we get here without a reimburser only show the pay button if we are the admin.
             if (!policy?.achAccount?.reimburser) {
+                // if there is a manager assigned we need to check if user is admin and manager to fix issue https://github.com/Expensify/App/issues/64825
+                if (iouReport?.managerID) {
+                    return isAdmin && isManager;
+                } 
+                // If we get here without a reimburser only show the pay button if we are the admin.
                 return isAdmin;
+
             }
 
             // If we are the reimburser and the report is approved or we are the manager then we can pay it.

src/libs/actions/IOU.ts

@@ -9453,17 +9453,7 @@ function getIOUReportActionToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report
         // eslint-disable-next-line deprecation/deprecation
         const policy = getPolicy(iouReport?.policyID);
 
-        const canPay = canIOUBePaid(iouReport, chatReport, policy);
-        const canApprove = canApproveIOU(iouReport, policy);
-
-        // Don't show settlement button if user is expense owner but not manager
-        const isExpenseOwner = iouReport?.ownerAccountID === getCurrentUserAccountID();
-        const isManager = iouReport?.managerID === getCurrentUserAccountID();
-        const canUserPay = isExpenseOwner && !isManager ? false : canPay;
-
-        // For submitted expense reports, prioritize approval workflow
-        const isSubmittedExpenseReport = isExpenseReport(iouReport) && iouReport?.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED;
-        const shouldShowSettlementButton = isSubmittedExpenseReport ? canApprove : canUserPay || canApprove;
+        const shouldShowSettlementButton = canIOUBePaid(iouReport, chatReport, policy) || canApproveIOU(iouReport, policy);
 
         return action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && shouldShowSettlementButton && !isDeletedAction(action);
     });