Merge branch 'main' of https://github.com/Expensify/App into fix/60633-global-vbba-followup

Author: MrMuzyk

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009014100
-        versionName "9.1.41-0"
+        versionCode 1009014200
+        versionName "9.1.42-0"
         // 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"

android/app/build.gradle

@@ -0,0 +1,70 @@
+---
+title: Prohibited Expenses Rule
+description: Learn how to enable and use the Prohibited expenses rule to automatically flag receipts with restricted items such as alcohol, gambling, or tobacco.
+keywords: [prohibited expenses, receipt violation, SmartScan, alcohol, gambling, expense rules, workspace settings, line item compliance]
+---
+<div id="new-expensify" markdown="1">
+
+Enable the **Prohibited expenses** rule to automatically flag receipts containing restricted purchases like alcohol, gambling, or tobacco. This rule uses Expensify’s AI-powered SmartScan to detect violations at the line-item level and notify admins for review.
+
+# Prohibited Expense Rule
+
+The Prohibited expenses rule allows Workspace Admins to enforce compliance by flagging receipts that contain restricted items. SmartScan analyzes individual line items and applies violations when prohibited categories are detected.
+
+## How it works
+
+Once enabled, this rule uses AI to review receipt line items during SmartScan. If a prohibited item is found, the expense is flagged for review.
+
+- Available in both Expensify Classic and New Expensify.
+- Configuration is only available in New Expensify.
+- Automatically flags receipts for manual review by a Workspace Admin or approver.
+
+## How to enable the rule
+
+To turn on the Prohibited expenses rule:
+
+1. Go to **Settings** > **Workspaces** > click _Workspace Name_ > **Rules** > **Expenses**.
+2. Scroll to the section titled **Prohibited expenses**.
+3. Toggle on the rule.
+4. Select the prohibited categories you want to monitor:
+   - Adult entertainment
+   - Alcohol
+   - Gambling
+   - Hotel incidentals
+   - Tobacco
+
+**Note:** This rule is disabled by default. Admins must enable it and choose which categories to apply.
+
+## What happens when a prohibited item is detected?
+
+If a SmartScan detects a prohibited item:
+
+- A violation is added to the expense.
+- The expense displays the messages:
+  - `"Receipt Issue Found"`
+  - `"Prohibited expense: Alcohol"` (or the relevant flagged category).
+- The expense requires manual review by the approver.
+
+---
+
+# FAQ
+
+## Who can enable the Prohibited Expenses Rule?
+
+Only Workspace Admins can enable or adjust this rule in New Expensify.
+
+## Will violations appear in Expensify Classic?
+
+Yes. Even though configuration is handled in New Expensify, violations appear in both **Expensify Classic** and **New Expensify** when viewing expenses.
+
+If the Domain Group setting, **Strictly enforce expense workspace rules** is enabled, it will block the submission of the expense with the prohibited item violation. 
+
+## Will SmartScan still work if the rule is off?
+
+Yes. SmartScan will still extract the merchant, date, and amount. However, it will not flag line items for violations unless the rule is enabled.
+
+## Is this rule part of SmartScan?
+
+Yes. Once enabled, the rule works seamlessly with SmartScan to detect prohibited line items in all scanned receipts.
+
+</div>

docs/articles/new-expensify/workspaces/Prohibited-Expense-Rule.md

@@ -30,6 +30,22 @@ Once Rules are enabled, you can customize individual expense settings:
 - **Billable default**: Set expenses as billable or non-billable by default.
 - **eReceipts**: Enable eReceipts for most USD credit transactions. This is available when the Default currency set in the Overview is set to USD.
 
+# Configure Prohibited Expense Rule
+
+To flag restricted expense types for manual review:
+
+1. Go to **Settings** > **Workspaces** > click **Workspace Name** > **Rules** > **Expenses**.
+2. Scroll to the **Prohibited expenses** section.
+3. Toggle on the feature, then select the types of restricted items to flag:
+   - Alcohol  
+   - Gambling  
+   - Tobacco  
+   - Hotel incidentals  
+   - Adult entertainment  
+4. If an uploaded receipt contains any of the flagged items, the expense will be marked for manual review.
+
+**Note:** Prohibited expense violations appear in both New Expensify and Expensify Classic. However, a Workspace Admin must enable the rules in **New Expensify** for them to take effect.
+
 # Configure expense report rules
 
 1. Click **Rules** in the left menu.

docs/articles/new-expensify/workspaces/Set-up-rules.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.41</string>
+	<string>9.1.42</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.41.0</string>
+	<string>9.1.42.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.41</string>
+	<string>9.1.42</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.41.0</string>
+	<string>9.1.42.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.41</string>
+	<string>9.1.42</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.41.0</string>
+	<string>9.1.42.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.41-0",
+  "version": "9.1.42-0",
   "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.",

package-lock.json

@@ -1103,6 +1103,7 @@ const CONST = {
     PLAN_TYPES_AND_PRICING_HELP_URL: 'https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing',
     MERGE_ACCOUNT_HELP_URL: 'https://help.expensify.com/articles/new-expensify/settings/Merge-Accounts',
     CONNECT_A_BUSINESS_BANK_ACCOUNT_HELP_URL: 'https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account',
+    REGISTER_FOR_WEBINAR_URL: 'https://events.zoom.us/eo/Aif1I8qCi1GZ7KnLnd1vwGPmeukSRoPjFpyFAZ2udQWn0-B86e1Z~AggLXsr32QYFjq8BlYLZ5I06Dg',
     TEST_RECEIPT_URL: `${CLOUDFRONT_URL}/images/fake-receipt__tacotodds.png`,
     // Use Environment.getEnvironmentURL to get the complete URL with port number
     DEV_NEW_EXPENSIFY_URL: 'https://dev.new.expensify.com:',
@@ -1995,6 +1996,7 @@ const CONST = {
         HEIGHT: 416,
     },
     DESKTOP_HEADER_PADDING: 12,
+    SEARCH_ITEM_LIMIT: 15,
     CATEGORY_SHORTCUT_BAR_HEIGHT: 32,
     SMALL_EMOJI_PICKER_SIZE: {
         WIDTH: '100%',
@@ -7004,6 +7006,9 @@ const CONST = {
         SCAN_TEST_TOOLTIP: 'scanTestTooltip',
         SCAN_TEST_TOOLTIP_MANAGER: 'scanTestTooltipManager',
         SCAN_TEST_CONFIRMATION: 'scanTestConfirmation',
+        OUTSANDING_FILTER: 'outstandingFilter',
+        SETTINGS_TAB: 'settingsTab',
+        WORKSPACES_SETTINGS: 'workspacesSettings',
         GBR_RBR_CHAT: 'chatGBRRBR',
         ACCOUNT_SWITCHER: 'accountSwitcher',
         EXPENSE_REPORTS_FILTER: 'expenseReportsFilter',
@@ -7057,6 +7062,11 @@ const CONST = {
         EMBEDDED_DEMO_WHITELIST: ['http://', 'https://', 'about:'] as string[],
         EMBEDDED_DEMO_IFRAME_TITLE: 'Test Drive',
     },
+
+    ONBOARDING_HELP: {
+        TALK_TO_SALES: 'talkToSales',
+        REGISTER_FOR_WEBINAR: 'registerForWebinar',
+    },
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;

package.json

@@ -501,6 +501,9 @@ const ONYXKEYS = {
     /** Information about loading states while talking with AI sales */
     TALK_TO_AI_SALES: 'talkToAISales',
 
+    /** Stores draft information while user is scheduling the call. */
+    SCHEDULE_CALL_DRAFT: 'scheduleCallDraft',
+
     /** Onyx updates that should be stored after sequential queue is flushed */
     QUEUE_FLUSHED_DATA: 'queueFlushedData',
 
@@ -1154,6 +1157,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.SHOULD_BILL_WHEN_DOWNGRADING]: boolean | undefined;
     [ONYXKEYS.BILLING_RECEIPT_DETAILS]: OnyxTypes.BillingReceiptDetails;
     [ONYXKEYS.NVP_SIDE_PANEL]: OnyxTypes.SidePanel;
+    [ONYXKEYS.SCHEDULE_CALL_DRAFT]: OnyxTypes.ScheduleCallDraft;
     [ONYXKEYS.IS_FORCED_TO_CHANGE_CURRENCY]: boolean | undefined;
     [ONYXKEYS.IS_COMING_FROM_GLOBAL_REIMBURSEMENTS_FLOW]: boolean | undefined;
 };

src/CONST.ts

@@ -2483,6 +2483,14 @@ const ROUTES = {
         route: 'debug/transaction/:transactionID/violations/:index/json',
         getRoute: (transactionID: string, index: string) => `debug/transaction/${transactionID}/violations/${index}/json` as const,
     },
+    SCHEDULE_CALL_BOOK: {
+        route: 'r/:reportID/schedule-call/book',
+        getRoute: (reportID: string) => `r/${reportID}/schedule-call/book` as const,
+    },
+    SCHEDULE_CALL_CONFIRMATON: {
+        route: 'r/:reportID/schedule-call/confimation',
+        getRoute: (reportID: string) => `r/${reportID}/schedule-call/confimation` as const,
+    },
 } as const;
 
 /**

src/ONYXKEYS.ts

@@ -215,6 +215,7 @@ const SCREENS = {
         REPORT_EXPORT: 'Report_Export',
         MISSING_PERSONAL_DETAILS: 'MissingPersonalDetails',
         DEBUG: 'Debug',
+        SCHEDULE_CALL: 'ScheduleCall',
     },
     PUBLIC_CONSOLE_DEBUG: 'Console_Debug',
     ONBOARDING_MODAL: {
@@ -717,6 +718,10 @@ const SCREENS = {
         TRANSACTION_VIOLATION_CREATE: 'Debug_Transaction_Violation_Create',
         TRANSACTION_VIOLATION: 'Debug_Transaction_Violation',
     },
+    SCHEDULE_CALL: {
+        BOOK: 'ScheduleCall_Book',
+        CONFIRMATION: 'ScheduleCall_Confirmation',
+    },
 } as const;
 
 type Screen = DeepValueOf<typeof SCREENS>;

src/ROUTES.ts

@@ -18,6 +18,8 @@ type WorkspaceTaxRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.BULK_ACTI
 
 type ReportExportType = DeepValueOf<typeof CONST.REPORT.EXPORT_OPTIONS>;
 
+type OnboardingHelpType = DeepValueOf<typeof CONST.ONBOARDING_HELP>;
+
 type DropdownOption<TValueType> = {
     value: TValueType;
     text: string;
@@ -134,4 +136,5 @@ export type {
     ButtonWithDropdownMenuProps,
     WorkspaceTaxRatesBulkActionType,
     ReportExportType,
+    OnboardingHelpType,
 };

src/SCREENS.ts

@@ -161,7 +161,7 @@ function ConfirmModal({
             shouldSetModalVisibility={shouldSetModalVisibility}
             onModalHide={onModalHide}
             type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM}
-            innerContainerStyle={image ? styles.pt0 : {}}
+            innerContainerStyle={styles.pv0}
             shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
             restoreFocusType={restoreFocusType}
             shouldHandleNavigationBack={shouldHandleNavigationBack}

src/components/ButtonWithDropdownMenu/types.ts

@@ -0,0 +1,44 @@
+import React from 'react';
+import {View} from 'react-native';
+import Text from '@components/Text';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useThemeStyles from '@hooks/useThemeStyles';
+import getButtonState from '@libs/getButtonState';
+
+type DayProps = {
+    /** Whether day is disabled */
+    disabled?: boolean;
+
+    /** Whether day is selected */
+    selected?: boolean;
+
+    /** Whether day is pressed */
+    pressed?: boolean;
+
+    /** Whether day is hovered */
+    hovered?: boolean;
+
+    /** date to show */
+    children?: number;
+};
+
+function Day({disabled, selected, pressed, hovered, children}: DayProps) {
+    const themeStyles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    return (
+        <View
+            style={[
+                themeStyles.calendarDayContainer,
+                selected ? themeStyles.buttonDefaultBG : {},
+                !disabled ? StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed)) : {},
+            ]}
+        >
+            <Text style={disabled ? themeStyles.buttonOpacityDisabled : {}}>{children}</Text>
+        </View>
+    );
+}
+
+Day.displayName = 'Day';
+
+export default Day;
+export type {DayProps};