only show remove hold in transaction thread secondary actions for admin if he is not the holder

Author: dominictb

src/libs/ReportSecondaryActionUtils.ts

@@ -546,6 +546,10 @@ function isRemoveHoldAction(report: Report, chatReport: OnyxEntry<Report>, repor
     return policy?.role === CONST.POLICY.ROLE.ADMIN;
 }
 
+function isRemoveHoldActionForTransaction(report: Report, reportTransaction: Transaction, policy?: Policy): boolean {
+    return isOnHoldTransactionUtils(reportTransaction) && policy?.role === CONST.POLICY.ROLE.ADMIN && !isHoldCreator(reportTransaction, report.reportID);
+}
+
 function getSecondaryReportActions({
     report,
     chatReport,
@@ -670,6 +674,10 @@ function getSecondaryTransactionThreadActions(
         options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD);
     }
 
+    if (isRemoveHoldActionForTransaction(parentReport, reportTransaction, policy)) {
+        options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REMOVE_HOLD);
+    }
+
     if (isSplitAction(parentReport, [reportTransaction], policy)) {
         options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.SPLIT);
     }

tests/unit/ReportSecondaryActionUtilsTest.ts

@@ -1247,7 +1247,7 @@ describe('getSecondaryExportReportActions', () => {
         expect(result.includes(CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
-    it('includes REMOVE HOLD option for admin in expense report but not in transaction thread report', () => {
+    it('includes REMOVE HOLD option for expense report admin', () => {
         const report = {} as unknown as Report;
         const policy = {
             role: CONST.POLICY.ROLE.ADMIN,
@@ -1266,6 +1266,27 @@ describe('getSecondaryExportReportActions', () => {
         const result = getSecondaryReportActions({report, chatReport, reportTransactions, violations: {}, policy});
         expect(result).toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
     });
+
+    it('includes REMOVE HOLD option for transaction thread report admin if he is not the holder', () => {
+        const report = {} as unknown as Report;
+        const policy = {
+            role: CONST.POLICY.ROLE.ADMIN,
+        } as unknown as Policy;
+        const transaction = {
+            comment: {
+                hold: 'REPORT_ACTION_ID',
+            },
+        } as unknown as Transaction;
+
+        jest.spyOn(ReportUtils, 'isHoldCreator').mockReturnValue(false);
+        const result = getSecondaryTransactionThreadActions(report, transaction, [], policy);
+        expect(result).toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
+
+        // Do not show if admin is the holder
+        jest.spyOn(ReportUtils, 'isHoldCreator').mockReturnValue(true);
+        const result2 = getSecondaryTransactionThreadActions(report, transaction, [], policy);
+        expect(result2).not.toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
+    });
 });
 
 describe('getSecondaryTransactionThreadActions', () => {