Merge branch 'main' of github.com:gijoe0295/App into gijoe/72505

Author: gijoe0295

.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/ISSUE_TEMPLATE/Standard.md

@@ -10,7 +10,7 @@ ___
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
-**If this was caught during regression testing, add the test name, ID and link from TestRail:**
+**If this was caught during regression testing, add the test name, ID and link from BrowserStack:**
 **Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Expensify/Expensify Issue URL:**

.github/actions/composite/getJavaVersion/action.yml

@@ -0,0 +1,15 @@
+name: Get Java version
+description: Reads the Java version from .java-version file
+
+outputs:
+  version:
+    description: The Java version from .java-version file
+    value: ${{ steps.getVersion.outputs.VERSION }}
+
+runs:
+  using: composite
+  steps:
+    - name: Get Java version
+      id: getVersion
+      shell: bash
+      run: echo "VERSION=$(cat .java-version | tr -d '\n')" >> "$GITHUB_OUTPUT"

.github/actions/javascript/getPullRequestIncrementalChanges/index.js

@@ -12746,6 +12746,24 @@ class Git {
             hasChanges: files.length > 0,
         };
     }
+    /**
+     * Check if a file from a Git diff is added.
+     *
+     * @param file - The file to check
+     * @returns true if the file is added, false otherwise
+     */
+    static isAddedDiffFile(file) {
+        const hasAddedLines = file.addedLines.size > 0;
+        const hasModifiedLines = file.modifiedLines.size > 0;
+        const hasRemovedLines = file.removedLines.size > 0;
+        if (!hasAddedLines || hasModifiedLines || hasRemovedLines) {
+            return false;
+        }
+        if (file.hunks.length === 1 && file.hunks.at(0)?.oldStart === 0 && file.hunks.at(0)?.oldCount === 0) {
+            return true;
+        }
+        return false;
+    }
     /**
      * Calculate the line number for a diff line based on the hunk and line type.
      */

.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
 
 /***/ }),

.github/workflows/buildAndroid.yml

@@ -75,12 +75,16 @@ jobs:
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
 
+      - name: Get Java version
+        id: get-java-version
+        uses: ./.github/actions/composite/getJavaVersion
+
       - name: Setup Java
         # v4
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
         with:
           distribution: oracle
-          java-version: 17
+          java-version: ${{ steps.get-java-version.outputs.version }}
 
       - name: Setup Gradle
         # v4

.github/workflows/deploy.yml

@@ -109,12 +109,16 @@ jobs:
             cd Mobile-Expensify
             npm run grunt:build:shared
 
+      - name: Get Java version
+        id: get-java-version
+        uses: ./.github/actions/composite/getJavaVersion
+
       - name: Setup Java
         # v4
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
         with:
-          distribution: 'oracle'
-          java-version: '17'
+          distribution: oracle
+          java-version: ${{ steps.get-java-version.outputs.version }}
 
       - name: Setup Ruby
         # v1.229.0
@@ -554,6 +558,8 @@ jobs:
           else
             npm run build-staging
           fi
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: Build storybook docs
         continue-on-error: true

.github/workflows/prettier.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Verify there's no Prettier diff
         run: |
-          npm run prettier -- --log-level silent
+          npm run prettier -- --log-level error
           if ! git diff --name-only --exit-code; then
             # shellcheck disable=SC2016
             echo 'Error: Prettier diff detected! Please run `npm run prettier` and commit the changes.'

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -148,11 +148,15 @@ jobs:
         with:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid }}
 
+      - name: Get Java version
+        id: get-java-version
+        uses: ./.github/actions/composite/getJavaVersion
+
       - name: Setup Java
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
         with:
           distribution: oracle
-          java-version: 17
+          java-version: ${{ steps.get-java-version.outputs.version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244

.github/workflows/react-compiler-compliance.yml

@@ -28,7 +28,7 @@ jobs:
         # In phase 0 of the React Compiler compliance check rollout,
         # we want to report failures but don't fail the check.
         # See https://github.com/Expensify/App/issues/68765#issuecomment-3487317881
-        run: npm run react-compiler-compliance-check check-changed || true
+        run: npm run react-compiler-compliance-check check-changed -- --filterByDiff --enforceNewComponents
         env:
           CI: true
           GITHUB_TOKEN: ${{ github.token }}