Skip to content

Commit 12b1dd7

Browse files
authored
Merge pull request #44781 from Expensify/jasperhuangg-cherry-pick-staging-44780-1
🍒 Cherry pick PR #44780 to staging 🍒
2 parents a9b4fef + c6ae46a commit 12b1dd7

File tree

9 files changed

+26
-8
lines changed

9 files changed

+26
-8
lines changed

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ android {
107107
minSdkVersion rootProject.ext.minSdkVersion
108108
targetSdkVersion rootProject.ext.targetSdkVersion
109109
multiDexEnabled rootProject.ext.multiDexEnabled
110-
versionCode 1009000306
111-
versionName "9.0.3-6"
110+
versionCode 1009000307
111+
versionName "9.0.3-7"
112112
// Supported language variants must be declared here to avoid from being removed during the compilation.
113113
// This also helps us to not include unnecessary language variants in the APK.
114114
resConfigs "en", "es"

ios/NewExpensify/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>9.0.3.6</string>
43+
<string>9.0.3.7</string>
4444
<key>FullStory</key>
4545
<dict>
4646
<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>9.0.3.6</string>
22+
<string>9.0.3.7</string>
2323
</dict>
2424
</plist>

ios/NotificationServiceExtension/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.0.3</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.0.3.6</string>
16+
<string>9.0.3.7</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.0.3-6",
3+
"version": "9.0.3-7",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/CONST.ts

+3
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,9 @@ const CONST = {
364364
NETSUITE_ON_NEW_EXPENSIFY: 'netsuiteOnNewExpensify',
365365
REPORT_FIELDS_FEATURE: 'reportFieldsFeature',
366366
WORKSPACE_FEEDS: 'workspaceFeeds',
367+
NETSUITE_USA_TAX: 'netsuiteUsaTax',
368+
INTACCT_ON_NEW_EXPENSIFY: 'intacctOnNewExpensify',
369+
COMMENT_LINKING: 'commentLinking',
367370
},
368371
BUTTON_STATES: {
369372
DEFAULT: 'default',

src/libs/Permissions.ts

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

55+
function canUseNetSuiteUSATax(betas: OnyxEntry<Beta[]>): boolean {
56+
return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas);
57+
}
58+
59+
function canUseCommentLinking(betas: OnyxEntry<Beta[]>): boolean {
60+
return !!betas?.includes(CONST.BETAS.COMMENT_LINKING) || canUseAllBetas(betas);
61+
}
62+
5563
/**
5664
* Link previews are temporarily disabled.
5765
*/
@@ -72,4 +80,6 @@ export default {
7280
canUseNetSuiteIntegration,
7381
canUseReportFieldsFeature,
7482
canUseWorkspaceFeeds,
83+
canUseNetSuiteUSATax,
84+
canUseCommentLinking,
7585
};

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)