Skip to content

Commit 98effb3

Browse files
jasperhuanggOSBotify
authored andcommitted
Merge pull request #44780 from Expensify/jasper-commentLinkingBeta
Add back comment linking beta (cherry picked from commit 292d7b2)
1 parent 8b449e6 commit 98effb3

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

src/CONST.ts

+6
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,12 @@ const CONST = {
364364
NETSUITE_ON_NEW_EXPENSIFY: 'netsuiteOnNewExpensify',
365365
REPORT_FIELDS_FEATURE: 'reportFieldsFeature',
366366
WORKSPACE_FEEDS: 'workspaceFeeds',
367+
<<<<<<< HEAD
368+
=======
369+
NETSUITE_USA_TAX: 'netsuiteUsaTax',
370+
INTACCT_ON_NEW_EXPENSIFY: 'intacctOnNewExpensify',
371+
COMMENT_LINKING: 'commentLinking',
372+
>>>>>>> 292d7b2c (Merge pull request #44780 from Expensify/jasper-commentLinkingBeta)
367373
},
368374
BUTTON_STATES: {
369375
DEFAULT: 'default',

src/libs/Permissions.ts

+16
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ function canUseWorkspaceFeeds(betas: OnyxEntry<Beta[]>): boolean {
5252
return !!betas?.includes(CONST.BETAS.WORKSPACE_FEEDS) || canUseAllBetas(betas);
5353
}
5454

55+
<<<<<<< HEAD
56+
=======
57+
function canUseNetSuiteUSATax(betas: OnyxEntry<Beta[]>): boolean {
58+
return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas);
59+
}
60+
61+
function canUseCommentLinking(betas: OnyxEntry<Beta[]>): boolean {
62+
return !!betas?.includes(CONST.BETAS.COMMENT_LINKING) || canUseAllBetas(betas);
63+
}
64+
65+
>>>>>>> 292d7b2c (Merge pull request #44780 from Expensify/jasper-commentLinkingBeta)
5566
/**
5667
* Link previews are temporarily disabled.
5768
*/
@@ -72,4 +83,9 @@ export default {
7283
canUseNetSuiteIntegration,
7384
canUseReportFieldsFeature,
7485
canUseWorkspaceFeeds,
86+
<<<<<<< HEAD
87+
=======
88+
canUseNetSuiteUSATax,
89+
canUseCommentLinking,
90+
>>>>>>> 292d7b2c (Merge pull request #44780 from Expensify/jasper-commentLinkingBeta)
7591
};

src/pages/home/report/ContextMenu/ContextMenuActions.tsx

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import * as Localize from '@libs/Localize';
1919
import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage';
2020
import Navigation from '@libs/Navigation/Navigation';
2121
import {parseHtmlToMarkdown, parseHtmlToText} from '@libs/OnyxAwareParser';
22+
import Permissions from '@libs/Permissions';
2223
import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
2324
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
2425
import * as ReportUtils from '@libs/ReportUtils';
@@ -425,6 +426,10 @@ const ContextMenuActions: ContextMenuAction[] = [
425426
successIcon: Expensicons.Checkmark,
426427
successTextTranslateKey: 'reportActionContextMenu.copied',
427428
shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget) => {
429+
if (!Permissions.canUseCommentLinking(betas)) {
430+
return false;
431+
}
432+
428433
const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
429434

430435
// Only hide the copylink menu item when context menu is opened over img element.

0 commit comments

Comments
 (0)