Merge branch 'main' into @OlGierd03/migrate-AddUnreportedExpense

Author: zfurtak

.env.example

@@ -14,6 +14,7 @@ USE_REDUX_DEVTOOLS=false
 CAPTURE_METRICS=false
 ONYX_METRICS=false
 USE_THIRD_PARTY_SCRIPTS=false
+IS_EXPENSIFY_EMPLOYEE=false
 
 EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
 EXPENSIFY_ACCOUNT_ID_ACCOUNTS_PAYABLE=-1

.github/actions/javascript/proposalPoliceComment/index.js

@@ -12699,7 +12699,7 @@ class OpenAIUtils {
     /**
      * Prompt the Chat Completions API.
      */
-    async promptChatCompletions({ userPrompt, systemPrompt = '', model = 'gpt-5' }) {
+    async promptChatCompletions({ userPrompt, systemPrompt = '', model = 'gpt-5.1' }) {
         const messages = [{ role: 'user', content: userPrompt }];
         if (systemPrompt) {
             messages.unshift({ role: 'system', content: systemPrompt });
@@ -20712,27 +20712,12 @@ const SessionsAPI = tslib_1.__importStar(__nccwpck_require__(13223));
 const sessions_1 = __nccwpck_require__(13223);
 const ThreadsAPI = tslib_1.__importStar(__nccwpck_require__(40997));
 const threads_1 = __nccwpck_require__(40997);
-const headers_1 = __nccwpck_require__(63591);
-const uploads_1 = __nccwpck_require__(67620);
 class ChatKit extends resource_1.APIResource {
     constructor() {
         super(...arguments);
         this.sessions = new SessionsAPI.Sessions(this._client);
         this.threads = new ThreadsAPI.Threads(this._client);
     }
-    /**
-     * Upload a ChatKit file
-     *
-     * @example
-     * ```ts
-     * const response = await client.beta.chatkit.uploadFile({
-     *   file: fs.createReadStream('path/to/file'),
-     * });
-     * ```
-     */
-    uploadFile(body, options) {
-        return this._client.post('/chatkit/files', (0, uploads_1.maybeMultipartFormRequestOptions)({ body, ...options, headers: (0, headers_1.buildHeaders)([{ 'OpenAI-Beta': 'chatkit_beta=v1' }, options?.headers]) }, this._client));
-    }
 }
 exports.ChatKit = ChatKit;
 ChatKit.Sessions = sessions_1.Sessions;
@@ -22128,20 +22113,19 @@ class Files extends resource_1.APIResource {
      * up to 512 MB, and the size of all files uploaded by one organization can be up
      * to 1 TB.
      *
-     * The Assistants API supports files up to 2 million tokens and of specific file
-     * types. See the
-     * [Assistants Tools guide](https://platform.openai.com/docs/assistants/tools) for
-     * details.
-     *
-     * The Fine-tuning API only supports `.jsonl` files. The input also has certain
-     * required formats for fine-tuning
-     * [chat](https://platform.openai.com/docs/api-reference/fine-tuning/chat-input) or
-     * [completions](https://platform.openai.com/docs/api-reference/fine-tuning/completions-input)
-     * models.
-     *
-     * The Batch API only supports `.jsonl` files up to 200 MB in size. The input also
-     * has a specific required
-     * [format](https://platform.openai.com/docs/api-reference/batch/request-input).
+     * - The Assistants API supports files up to 2 million tokens and of specific file
+     *   types. See the
+     *   [Assistants Tools guide](https://platform.openai.com/docs/assistants/tools)
+     *   for details.
+     * - The Fine-tuning API only supports `.jsonl` files. The input also has certain
+     *   required formats for fine-tuning
+     *   [chat](https://platform.openai.com/docs/api-reference/fine-tuning/chat-input)
+     *   or
+     *   [completions](https://platform.openai.com/docs/api-reference/fine-tuning/completions-input)
+     *   models.
+     * - The Batch API only supports `.jsonl` files up to 200 MB in size. The input
+     *   also has a specific required
+     *   [format](https://platform.openai.com/docs/api-reference/batch/request-input).
      *
      * Please [contact us](https://help.openai.com/) if you need to increase these
      * storage limits.
@@ -22966,6 +22950,33 @@ exports.InputItems = InputItems;
 
 /***/ }),
 
+/***/ 37133:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.InputTokens = void 0;
+const resource_1 = __nccwpck_require__(19318);
+class InputTokens extends resource_1.APIResource {
+    /**
+     * Get input token counts
+     *
+     * @example
+     * ```ts
+     * const response = await client.responses.inputTokens.count();
+     * ```
+     */
+    count(body = {}, options) {
+        return this._client.post('/responses/input_tokens', { body, ...options });
+    }
+}
+exports.InputTokens = InputTokens;
+//# sourceMappingURL=input-tokens.js.map
+
+/***/ }),
+
 /***/ 96214:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -22980,12 +22991,15 @@ const ResponseStream_1 = __nccwpck_require__(66784);
 const resource_1 = __nccwpck_require__(19318);
 const InputItemsAPI = tslib_1.__importStar(__nccwpck_require__(46867));
 const input_items_1 = __nccwpck_require__(46867);
+const InputTokensAPI = tslib_1.__importStar(__nccwpck_require__(37133));
+const input_tokens_1 = __nccwpck_require__(37133);
 const headers_1 = __nccwpck_require__(63591);
 const path_1 = __nccwpck_require__(10706);
 class Responses extends resource_1.APIResource {
     constructor() {
         super(...arguments);
         this.inputItems = new InputItemsAPI.InputItems(this._client);
+        this.inputTokens = new InputTokensAPI.InputTokens(this._client);
     }
     create(body, options) {
         return this._client.post('/responses', { body, ...options, stream: body.stream ?? false })._thenUnwrap((rsp) => {
@@ -23052,6 +23066,7 @@ class Responses extends resource_1.APIResource {
 }
 exports.Responses = Responses;
 Responses.InputItems = input_items_1.InputItems;
+Responses.InputTokens = input_tokens_1.InputTokens;
 //# sourceMappingURL=responses.js.map
 
 /***/ }),
@@ -23743,7 +23758,7 @@ tslib_1.__exportStar(__nccwpck_require__(11364), exports);
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.VERSION = void 0;
-exports.VERSION = '6.3.0'; // x-release-please-version
+exports.VERSION = '6.9.1'; // x-release-please-version
 //# sourceMappingURL=version.js.map
 
 /***/ }),

Mobile-Expensify

@@ -11,6 +11,7 @@ const TRANSACTION_ID_R98765 = 'TRANSACTION_ID_R98765';
 const receiptR14932 = {
     state: CONST.IOU.RECEIPT_STATE.OPEN,
     source: 'mockData/eReceiptBGs/eReceiptBG_pink.png',
+    filename: 'test.html',
 };
 
 const transactionR14932: Transaction = {
@@ -22,15 +23,14 @@ const transactionR14932: Transaction = {
     status: CONST.TRANSACTION.STATUS.POSTED,
     receipt: receiptR14932,
     merchant: 'Acme',
-    filename: 'test.html',
     created: '2025-02-14',
     inserted: '2025-02-14 08:12:19',
     billable: false,
     managedCard: false,
     reimbursable: true,
     hasEReceipt: true,
     cardID: 0,
-    modifiedAmount: '',
+    modifiedAmount: 0,
     originalAmount: 0,
     comment: {},
     bank: '',
@@ -59,14 +59,13 @@ const transactionR98765: Transaction = {
     hasEReceipt: true,
     managedCard: false,
     billable: false,
-    modifiedAmount: '',
+    modifiedAmount: 0,
     cardID: 0,
     originalAmount: 0,
     comment: {},
     bank: '',
     cardNumber: '',
     category: '',
-    filename: '',
     modifiedCreated: '',
     modifiedCurrency: '',
     modifiedMerchant: '',

__mocks__/reportData/transactions.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027202
-        versionName "9.2.72-2"
+        versionCode 1009027305
+        versionName "9.2.73-5"
         // 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

@@ -50,6 +50,7 @@
         "asar",
         "ASPAC",
         "assetlinks",
+        "accountid",
         "attributes.accountid",
         "attributes.reportid",
         "authorised",

assets/images/clock.svg

@@ -18,7 +18,8 @@ The **navigation tabs** (on the left on web, and at the bottom on mobile) are pr
   - **Reports**
   - **Workspaces**
   - **Account**
-- The **Global Create** button for quick access to actions like creating reports, expenses, invoices, and chats
+- The green **Camera/Receipt** button to easily create expenses 
+- The grey **Global Create** button for additional actions like creating reports, tracking distance, sending invoices, and more.
 
 ---
 

assets/images/simple-illustrations/simple-illustration__clock.svg

@@ -34,36 +34,46 @@ Each workspace has its own rules and settings, even for personal expense trackin
 
 You can add expenses using SmartScan or by creating them manually.
 
-## SmartScan a Receipt
+## How to SmartScan a Receipt
 
 SmartScan reads receipt details like merchant, date, total, and currency automatically.
 
-**SmartScan on web:**
-1. Click the green **Create (+)** button.
-2. Select **Create expense**.
-3. Upload an image of your receipt.
-
-**SmartScan on mobile:**
-1. Tap the green **Create (+)** button.
-2. Select **Create expense**.
-3. Upload or take a photo of your receipt:
-   - **Upload**: Tap the gallery icon and select an image.
-   - **Take a photo**: Ensure receipt details are visible and snap a photo.
-
-**Note:** You can also email receipts to `receipts@expensify.com` from your linked email. SmartScan will extract the details and add the expense to your account. [Add a contact method](https://help.expensify.com/articles/new-expensify/settings/Change-or-add-email-address)
-
-## Manually Enter an Expense
-
-1. Click or tap the green **Create (+)** button.
-2. Select **Create expense**.
-3. Choose a method:
-   - **Manual** – Enter details manually.
-   - **Scan** – Upload a saved image.
-   - **Create multiple** – Add expenses in bulk.
-   - **Distance** – Enter mileage data.
-   - **Per diem** – Add a daily allowance.
-4. Select your **workspace**.
-5. Click **Create expense**.
+**On mobile:**
+1. Tap the green camera button and take a photo of the receipt or upload from gallery.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green receipt button and drag and drop the receipt or click **Choose files** to upload.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Click **Create expense**.
+
+💡 **Note:** 
+Other ways to SmartScan receipts include:
+- Forward your digital receipts to `receipts@expensify.com`.
+- Text a photo of your receipts to 47777 (US numbers only). Just make sure you [add your phone number to Expensify](https://new.expensify.com/settings/profile/contact-methods).
+
+## How to Manually Enter an Expense
+
+**On mobile:**
+1. Tap the green camera button.
+2. Select **Manual**.
+3. Enter the amount and currency, then tap **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green add receipt button.
+2. Select **Manual**.
+3. Enter the amount and currency, then click **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Click **Create expense**.
+
+Learn more about [creating expenses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Create-an-Expense)
 
 View expenses in your Expense chat or the **Reports** page. [Export to CSV](https://help.expensify.com/articles/new-expensify/expenses-and-payments/Search-and-Download-Expenses) for tax or accountant use.