diff --git a/android/app/build.gradle b/android/app/build.gradle index 192537f08e3d..724b78f42105 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,8 +107,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009000306 - versionName "9.0.3-6" + versionCode 1009000307 + versionName "9.0.3-7" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 17eaae3cc3fc..a7feebde91ae 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.3.6 + 9.0.3.7 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 618d394349ed..466bb117b747 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.3.6 + 9.0.3.7 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index d5e50828e3c7..0549fd58dd67 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.3 CFBundleVersion - 9.0.3.6 + 9.0.3.7 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 50c8825c3ca6..41d8e353ef28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.3-6", + "version": "9.0.3-7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.3-6", + "version": "9.0.3-7", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 5177eb99a441..f72fa3a3c3dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.3-6", + "version": "9.0.3-7", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", diff --git a/src/CONST.ts b/src/CONST.ts index c316a2327cc8..23307f26a631 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -364,6 +364,9 @@ const CONST = { NETSUITE_ON_NEW_EXPENSIFY: 'netsuiteOnNewExpensify', REPORT_FIELDS_FEATURE: 'reportFieldsFeature', WORKSPACE_FEEDS: 'workspaceFeeds', + NETSUITE_USA_TAX: 'netsuiteUsaTax', + INTACCT_ON_NEW_EXPENSIFY: 'intacctOnNewExpensify', + COMMENT_LINKING: 'commentLinking', }, BUTTON_STATES: { DEFAULT: 'default', diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 79936d498280..b9e26ce5ecf7 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -52,6 +52,14 @@ function canUseWorkspaceFeeds(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.WORKSPACE_FEEDS) || canUseAllBetas(betas); } +function canUseNetSuiteUSATax(betas: OnyxEntry): boolean { + return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas); +} + +function canUseCommentLinking(betas: OnyxEntry): boolean { + return !!betas?.includes(CONST.BETAS.COMMENT_LINKING) || canUseAllBetas(betas); +} + /** * Link previews are temporarily disabled. */ @@ -72,4 +80,6 @@ export default { canUseNetSuiteIntegration, canUseReportFieldsFeature, canUseWorkspaceFeeds, + canUseNetSuiteUSATax, + canUseCommentLinking, }; diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx index bf634b4ac8ae..0e29e7496def 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx @@ -19,6 +19,7 @@ import * as Localize from '@libs/Localize'; import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage'; import Navigation from '@libs/Navigation/Navigation'; import {parseHtmlToMarkdown, parseHtmlToText} from '@libs/OnyxAwareParser'; +import Permissions from '@libs/Permissions'; import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager'; import * as ReportActionsUtils from '@libs/ReportActionsUtils'; import * as ReportUtils from '@libs/ReportUtils'; @@ -425,6 +426,10 @@ const ContextMenuActions: ContextMenuAction[] = [ successIcon: Expensicons.Checkmark, successTextTranslateKey: 'reportActionContextMenu.copied', shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget) => { + if (!Permissions.canUseCommentLinking(betas)) { + return false; + } + const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction); // Only hide the copylink menu item when context menu is opened over img element.