From 2e7d7cf90726246115931425116db709ba344f9c Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Wed, 26 Jun 2024 12:12:26 +0300
Subject: [PATCH 01/21] feat: release-profiler on web

---
 config/webpack/webpack.dev.ts                 |  4 ++++
 .../BaseProfilingToolMenu.tsx                 | 20 +++++++++----------
 .../ProfilingToolMenu/RNFS/index.ts           |  3 +++
 .../ProfilingToolMenu/RNFS/index.web.ts       | 18 +++++++++++++++++
 .../ProfilingToolMenu/Share/index.ts          |  3 +++
 .../ProfilingToolMenu/Share/index.web.ts      |  5 +++++
 src/components/ProfilingToolMenu/index.tsx    | 10 +++++++++-
 7 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 src/components/ProfilingToolMenu/RNFS/index.ts
 create mode 100644 src/components/ProfilingToolMenu/RNFS/index.web.ts
 create mode 100644 src/components/ProfilingToolMenu/Share/index.ts
 create mode 100644 src/components/ProfilingToolMenu/Share/index.web.ts

diff --git a/config/webpack/webpack.dev.ts b/config/webpack/webpack.dev.ts
index 7a196da6b691..1be311d15c37 100644
--- a/config/webpack/webpack.dev.ts
+++ b/config/webpack/webpack.dev.ts
@@ -53,6 +53,10 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
                         cert: path.join(__dirname, 'certificate.pem'),
                     },
                 },
+                headers: {
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    'Document-Policy': 'js-profiling',
+                },
             },
             plugins: [
                 new DefinePlugin({
diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index 5593ad627e92..cabe990a7122 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -1,10 +1,8 @@
 import React, {useCallback, useEffect, useState} from 'react';
 import DeviceInfo from 'react-native-device-info';
-import RNFS from 'react-native-fs';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import {startProfiling, stopProfiling} from 'react-native-release-profiler';
-import Share from 'react-native-share';
 import Button from '@components/Button';
 import Switch from '@components/Switch';
 import TestToolRow from '@components/TestToolRow';
@@ -17,6 +15,8 @@ import Log from '@libs/Log';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import RNFS from './RNFS';
+import Share from './Share';
 import pkg from '../../../package.json';
 
 type BaseProfilingToolMenuOnyxProps = {
@@ -49,7 +49,7 @@ const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
 
 function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
     const styles = useThemeStyles();
-    const [pathIOS, setPathIOS] = useState('');
+    const [filePath, setFilePath] = useState('');
     const [sharePath, setSharePath] = useState('');
     const [totalMemory, setTotalMemory] = useState(0);
     const [usedMemory, setUsedMemory] = useState(0);
@@ -57,8 +57,8 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
 
     // eslint-disable-next-line @lwc/lwc/no-async-await
     const stop = useCallback(async () => {
-        const path = await stopProfiling(getPlatform() === CONST.PLATFORM.IOS);
-        setPathIOS(path);
+        const path = await stopProfiling(getPlatform() === CONST.PLATFORM.IOS || getPlatform() === CONST.PLATFORM.WEB);
+        setFilePath(path);
 
         const amountOfTotalMemory = await DeviceInfo.getTotalMemory();
         const amountOfUsedMemory = await DeviceInfo.getUsedMemory();
@@ -92,7 +92,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
     );
 
     useEffect(() => {
-        if (!pathIOS) {
+        if (!filePath) {
             return;
         }
 
@@ -112,7 +112,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
             }
 
             // Copy the file to a new location with the desired filename
-            await RNFS.copyFile(pathIOS, newFilePath)
+            await RNFS.copyFile(filePath, newFilePath)
                 .then(() => {
                     Log.hmmm('[ProfilingToolMenu] file copied successfully');
                 })
@@ -124,7 +124,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
         };
 
         rename();
-    }, [pathIOS, pathToBeUsed]);
+    }, [filePath, pathToBeUsed]);
 
     const onDownloadProfiling = useCallback(() => {
         // eslint-disable-next-line @lwc/lwc/no-async-await
@@ -158,9 +158,9 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
                     onToggle={onToggleProfiling}
                 />
             </TestToolRow>
-            {!!pathIOS && (
+            {!!filePath && (
                 <>
-                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
+                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${getPlatform() === CONST.PLATFORM.WEB ? filePath : newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>
                         <Button
                             small
diff --git a/src/components/ProfilingToolMenu/RNFS/index.ts b/src/components/ProfilingToolMenu/RNFS/index.ts
new file mode 100644
index 000000000000..374ef87f13a4
--- /dev/null
+++ b/src/components/ProfilingToolMenu/RNFS/index.ts
@@ -0,0 +1,3 @@
+import RNFS from 'react-native-fs';
+
+export default RNFS;
diff --git a/src/components/ProfilingToolMenu/RNFS/index.web.ts b/src/components/ProfilingToolMenu/RNFS/index.web.ts
new file mode 100644
index 000000000000..93d2d84d6fe7
--- /dev/null
+++ b/src/components/ProfilingToolMenu/RNFS/index.web.ts
@@ -0,0 +1,18 @@
+const RNFS = {
+    exists: () => Promise.resolve(false),
+    unlink: () => Promise.resolve(true),
+    copyFile: () => Promise.resolve(true),
+    DocumentDirectoryPath: '',
+    writeFile: (path: string, data: string, encoding: string) => {
+        const dataStr = `data:text/json;charset=${encoding},${encodeURIComponent(JSON.stringify(data))}`;
+        const downloadAnchorNode = document.createElement('a');
+
+        downloadAnchorNode.setAttribute('href', dataStr);
+        downloadAnchorNode.setAttribute('download', path);
+        document.body.appendChild(downloadAnchorNode); // required for Firefox
+        downloadAnchorNode.click();
+        downloadAnchorNode.remove();
+    },
+};
+
+export default RNFS;
diff --git a/src/components/ProfilingToolMenu/Share/index.ts b/src/components/ProfilingToolMenu/Share/index.ts
new file mode 100644
index 000000000000..e08a046855a5
--- /dev/null
+++ b/src/components/ProfilingToolMenu/Share/index.ts
@@ -0,0 +1,3 @@
+import Share from 'react-native-share';
+
+export default Share;
diff --git a/src/components/ProfilingToolMenu/Share/index.web.ts b/src/components/ProfilingToolMenu/Share/index.web.ts
new file mode 100644
index 000000000000..6572b8a14440
--- /dev/null
+++ b/src/components/ProfilingToolMenu/Share/index.web.ts
@@ -0,0 +1,5 @@
+const Share = {
+    open: () => Promise.resolve(),
+};
+
+export default Share;
diff --git a/src/components/ProfilingToolMenu/index.tsx b/src/components/ProfilingToolMenu/index.tsx
index ab12fff27ef8..3a94ed7f2b16 100644
--- a/src/components/ProfilingToolMenu/index.tsx
+++ b/src/components/ProfilingToolMenu/index.tsx
@@ -1,5 +1,13 @@
+import React from 'react';
+import BaseProfilingToolMenu from './BaseProfilingToolMenu';
+
 function ProfilingToolMenu() {
-    return null;
+    return (
+        <BaseProfilingToolMenu
+            pathToBeUsed=""
+            displayPath=""
+        />
+    );
 }
 
 ProfilingToolMenu.displayName = 'ProfilingToolMenu';

From 0bfd1987fc21d2d7f9493974c5f35a21644b1054 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Wed, 26 Jun 2024 15:49:51 +0300
Subject: [PATCH 02/21] fix: use old profiling names

---
 src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index cabe990a7122..bdc52365b579 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -57,7 +57,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
 
     // eslint-disable-next-line @lwc/lwc/no-async-await
     const stop = useCallback(async () => {
-        const path = await stopProfiling(getPlatform() === CONST.PLATFORM.IOS || getPlatform() === CONST.PLATFORM.WEB);
+        const path = await stopProfiling(getPlatform() === CONST.PLATFORM.IOS || getPlatform() === CONST.PLATFORM.WEB, newFileName);
         setFilePath(path);
 
         const amountOfTotalMemory = await DeviceInfo.getTotalMemory();
@@ -160,7 +160,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
             </TestToolRow>
             {!!filePath && (
                 <>
-                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${getPlatform() === CONST.PLATFORM.WEB ? filePath : newFileName}`}</Text>
+                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>
                         <Button
                             small

From 4333ea82cbbc4e1484039fe6d2edab44b381d465 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Mon, 1 Jul 2024 17:51:24 +0200
Subject: [PATCH 03/21] feat: enable profiling for prod desktop

---
 desktop/electron-serve.js | 87 +++++++++++++++++++++++++++++++++++++++
 desktop/main.ts           |  2 +-
 desktop/package-lock.json | 17 --------
 desktop/package.json      |  1 -
 4 files changed, 88 insertions(+), 19 deletions(-)
 create mode 100644 desktop/electron-serve.js

diff --git a/desktop/electron-serve.js b/desktop/electron-serve.js
new file mode 100644
index 000000000000..aea218c51ea6
--- /dev/null
+++ b/desktop/electron-serve.js
@@ -0,0 +1,87 @@
+/* eslint-disable rulesdir/no-negated-variables */
+/* eslint-disable no-param-reassign */
+/* eslint-disable @lwc/lwc/no-async-await */
+
+/**
+ * This file is a modified version of the electron-serve package.
+ * We keep the same interface, but instead of file protocol we use buffer protocol (with support of JS self profiling).
+ */
+const {app, protocol, session} = require('electron');
+const path = require('path');
+const fs = require('fs');
+
+const FILE_NOT_FOUND = -6;
+
+const getPath = async (filePath) => {
+    try {
+        const result = await fs.promises.stat(filePath);
+
+        if (result.isFile()) {
+            return filePath;
+        }
+
+        if (result.isDirectory()) {
+            return getPath(path.join(filePath, 'index.html'));
+        }
+    } catch {
+        return null;
+    }
+};
+
+export default function electronServe(options) {
+    options = {
+        isCorsEnabled: true,
+        scheme: 'app',
+        hostname: '-',
+        file: 'index',
+        ...options,
+    };
+
+    if (!options.directory) {
+        throw new Error('The `directory` option is required');
+    }
+
+    options.directory = path.resolve(app.getAppPath(), options.directory);
+
+    const handler = async (request, callback) => {
+        const filePath = path.join(options.directory, decodeURIComponent(new URL(request.url).pathname));
+        const resolvedPath = (await getPath(filePath)) || path.join(options.directory, `${options.file}.html`);
+
+        try {
+            const data = await fs.promises.readFile(resolvedPath);
+            callback({
+                mimeType: 'text/html',
+                data: Buffer.from(data),
+                headers: {
+                    'Document-Policy': 'js-profiling',
+                },
+            });
+        } catch (error) {
+            callback({error: FILE_NOT_FOUND});
+        }
+    };
+
+    protocol.registerSchemesAsPrivileged([
+        {
+            scheme: options.scheme,
+            privileges: {
+                standard: true,
+                secure: true,
+                allowServiceWorkers: true,
+                supportFetchAPI: true,
+                corsEnabled: options.isCorsEnabled,
+            },
+        },
+    ]);
+
+    app.on('ready', () => {
+        const partitionSession = options.partition ? session.fromPartition(options.partition) : session.defaultSession;
+
+        partitionSession.protocol.registerBufferProtocol(options.scheme, handler);
+    });
+
+    return async (window_, searchParameters) => {
+        const queryString = searchParameters ? `?${new URLSearchParams(searchParameters).toString()}` : '';
+        await window_.loadURL(`${options.scheme}://${options.hostname}${queryString}`);
+    };
+}
diff --git a/desktop/main.ts b/desktop/main.ts
index d8c46bbbc89b..1221b05a8388 100644
--- a/desktop/main.ts
+++ b/desktop/main.ts
@@ -3,7 +3,6 @@ import type {BrowserView, MenuItem, MenuItemConstructorOptions, WebContents, Web
 import contextMenu from 'electron-context-menu';
 import log from 'electron-log';
 import type {ElectronLog} from 'electron-log';
-import serve from 'electron-serve';
 import {autoUpdater} from 'electron-updater';
 import {machineId} from 'node-machine-id';
 import checkForUpdates from '@libs/checkForUpdates';
@@ -14,6 +13,7 @@ import type {TranslationPaths} from '@src/languages/types';
 import type PlatformSpecificUpdater from '@src/setup/platformSetup/types';
 import type {Locale} from '@src/types/onyx';
 import type {CreateDownloadQueueModule, DownloadItem} from './createDownloadQueue';
+import serve from './electron-serve';
 import ELECTRON_EVENTS from './ELECTRON_EVENTS';
 
 const createDownloadQueue = require<CreateDownloadQueueModule>('./createDownloadQueue').default;
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index efa8a25a0614..44017c9fda48 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -9,7 +9,6 @@
       "dependencies": {
         "electron-context-menu": "^2.3.0",
         "electron-log": "^4.4.8",
-        "electron-serve": "^1.3.0",
         "electron-updater": "^6.2.1",
         "node-machine-id": "^1.1.12"
       }
@@ -144,17 +143,6 @@
       "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
       "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
-    "node_modules/electron-serve": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/electron-serve/-/electron-serve-1.3.0.tgz",
-      "integrity": "sha512-OEC/48ZBJxR6XNSZtCl4cKPyQ1lvsu8yp8GdCplMWwGS1eEyMcEmzML5BRs/io/RLDnpgyf+7rSL+X6ICifRIg==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/electron-updater": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
@@ -535,11 +523,6 @@
       "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
       "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
-    "electron-serve": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/electron-serve/-/electron-serve-1.3.0.tgz",
-      "integrity": "sha512-OEC/48ZBJxR6XNSZtCl4cKPyQ1lvsu8yp8GdCplMWwGS1eEyMcEmzML5BRs/io/RLDnpgyf+7rSL+X6ICifRIg=="
-    },
     "electron-updater": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
diff --git a/desktop/package.json b/desktop/package.json
index 4249f3fcfba9..34343ad335d6 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -6,7 +6,6 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-serve": "^1.3.0",
     "electron-updater": "^6.2.1",
     "node-machine-id": "^1.1.12"
   },

From d9d115f34441edae63112c312530a0aafafb4e04 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Tue, 2 Jul 2024 17:25:27 +0200
Subject: [PATCH 04/21] docs: update readme

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 6544e0e95486..e133178b7dff 100644
--- a/README.md
+++ b/README.md
@@ -230,19 +230,20 @@ Within Xcode head to the build phase - `Bundle React Native code and images`.
     ```jsx
     npm i && npm run pod-install
     ```
-7. Depending on the platform you are targeting, run your Android/iOS app in production mode.
-8. Upon completion, the generated source map can be found at:
+4. Depending on the platform you are targeting, run your Android/iOS app in production mode.
+5. Upon completion, the generated source map can be found at:
   Android: `android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map`
   IOS: `main.jsbundle.map`
+  web: `dist/444-{hash}.bundle.js.map`
 
 ### Recording a Trace:
 1. Ensure you have generated the source map as outlined above.
 2. Launch the app in production mode.
-2. Navigate to the feature you wish to profile.
-3. Initiate the profiling session by tapping with four fingers to open the menu and selecting **`Use Profiling`**.
-4. Close the menu and interact with the app.
-5. After completing your interactions, tap with four fingers again and select to stop profiling.
-6. You will be presented with a **`Share`** option to export the trace, which includes a trace file (`Profile<app version>.cpuprofile`) and build info (`AppInfo<app version>.json`).
+3. Navigate to the feature you wish to profile.
+4. Initiate the profiling session by tapping with four fingers (on mobile) or `cmd+d` (on web) to open the menu and selecting **`Use Profiling`**.
+5. Close the menu and interact with the app.
+6. After completing your interactions, tap with four fingers or `cmd+d` again and select to stop profiling.
+7. You will be presented with a **`Share`** option to export the trace, which includes a trace file (`Profile<app version>.cpuprofile`) and build info (`AppInfo<app version>.json`).
 
 Build info:
 ```jsx
@@ -265,6 +266,7 @@ Build info:
 4. Use the following commands to symbolicate the trace for Android and iOS, respectively:
 Android: `npm run symbolicate-release:android`
 IOS: `npm run symbolicate-release:ios`
+web: ???
 5. A new file named `Profile_trace_for_<app version>-converted.json` will appear in your project's root folder.
 6. Open this file in your tool of choice:
     - SpeedScope ([https://www.speedscope.app](https://www.speedscope.app/))

From cd989c285b0f4dab4d40b762cbd27f38a51516d8 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Tue, 2 Jul 2024 17:26:43 +0200
Subject: [PATCH 05/21] chore: temporary commit that shouldn't live in remote
 too long

---
 .env.example                                  |   6 +-
 .env.production                               |   6 +-
 .env.staging                                  |   6 +-
 config/webpack/webpack.common.ts              |  11 +
 package-lock.json                             | 198 +++++++++++++++++-
 package.json                                  |   6 +-
 patches/http-server+14.1.1.patch              |  13 ++
 scripts/combine-web-source-maps.ts            |  40 ++++
 src/CONFIG.ts                                 |   6 +-
 src/CONST.ts                                  |   2 +-
 .../FloatingActionButtonAndPopover.tsx        |   2 +
 web/proxy.ts                                  |  12 ++
 12 files changed, 284 insertions(+), 24 deletions(-)
 create mode 100644 patches/http-server+14.1.1.patch
 create mode 100644 scripts/combine-web-source-maps.ts

diff --git a/.env.example b/.env.example
index 944da2aa9296..ce534f694e0b 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
-NEW_EXPENSIFY_URL=https://new.expensify.com/
-SECURE_EXPENSIFY_URL=https://secure.expensify.com.dev/
-EXPENSIFY_URL=https://www.expensify.com.dev/
+NEW_EXPENSIFY_URL=http://localhost:9000/
+SECURE_EXPENSIFY_URL=http://localhost:9000/
+EXPENSIFY_URL=http://localhost:9000/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=ac6d22b891daae55283a
diff --git a/.env.production b/.env.production
index 5e676134d681..9b9d91b50ee8 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
-NEW_EXPENSIFY_URL=https://new.expensify.com/
-SECURE_EXPENSIFY_URL=https://secure.expensify.com/
-EXPENSIFY_URL=https://www.expensify.com/
+NEW_EXPENSIFY_URL=http://localhost:9000/
+SECURE_EXPENSIFY_URL=http://localhost:9000/
+EXPENSIFY_URL=http://localhost:9000/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
diff --git a/.env.staging b/.env.staging
index 17d82ac2d136..8cd23786c79c 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,6 +1,6 @@
-NEW_EXPENSIFY_URL=https://staging.new.expensify.com/
-SECURE_EXPENSIFY_URL=https://secure.expensify.com/
-EXPENSIFY_URL=https://www.expensify.com/
+NEW_EXPENSIFY_URL=http://localhost:9000/
+SECURE_EXPENSIFY_URL=http://localhost:9000/
+EXPENSIFY_URL=http://localhost:9000/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
diff --git a/config/webpack/webpack.common.ts b/config/webpack/webpack.common.ts
index 33fd9131eca0..5cee41f21aba 100644
--- a/config/webpack/webpack.common.ts
+++ b/config/webpack/webpack.common.ts
@@ -274,6 +274,17 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
     },
 
     optimization: {
+        /*minimize: true,
+        minimizer: [
+            new TerserPlugin({
+                terserOptions: {
+                    sourceMap: {
+                        filename: 'out.js',
+                        url: 'out.js.map',
+                    },
+                },
+            }),
+        ],*/
         runtimeChunk: 'single',
         splitChunks: {
             cacheGroups: {
diff --git a/package-lock.json b/package-lock.json
index 2ced5738cca8..3fd20575a2d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -205,6 +205,7 @@
         "babel-plugin-transform-class-properties": "^6.24.1",
         "babel-plugin-transform-remove-console": "^6.9.4",
         "clean-webpack-plugin": "^4.0.0",
+        "concat-with-sourcemaps": "^1.1.0",
         "concurrently": "^8.2.2",
         "copy-webpack-plugin": "^10.1.0",
         "css-loader": "^6.7.2",
@@ -225,6 +226,7 @@
         "eslint-plugin-testing-library": "^6.2.2",
         "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
         "html-webpack-plugin": "^5.5.0",
+        "http-server": "^14.1.1",
         "jest": "29.4.1",
         "jest-circus": "29.4.1",
         "jest-cli": "29.4.1",
@@ -246,6 +248,7 @@
         "shellcheck": "^1.1.0",
         "storybook": "^8.1.10",
         "style-loader": "^2.0.0",
+        "terser-webpack-plugin": "^5.3.10",
         "time-analytics-webpack-plugin": "^0.1.17",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
@@ -20521,6 +20524,18 @@
       ],
       "license": "MIT"
     },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "dev": true,
@@ -22026,6 +22041,15 @@
       "version": "0.0.1",
       "license": "MIT"
     },
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
     "node_modules/concurrently": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz",
@@ -22494,6 +22518,15 @@
       "version": "1.0.2",
       "license": "MIT"
     },
+    "node_modules/corser": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
+      "integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/cosmiconfig": {
       "version": "7.1.0",
       "dev": true,
@@ -27812,6 +27845,17 @@
         "wbuf": "^1.1.0"
       }
     },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/html-entities": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
@@ -28015,6 +28059,121 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/http-server": {
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
+      "integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
+      "dev": true,
+      "dependencies": {
+        "basic-auth": "^2.0.1",
+        "chalk": "^4.1.2",
+        "corser": "^2.0.1",
+        "he": "^1.2.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy": "^1.18.1",
+        "mime": "^1.6.0",
+        "minimist": "^1.2.6",
+        "opener": "^1.5.1",
+        "portfinder": "^1.0.28",
+        "secure-compare": "3.0.1",
+        "union": "~0.5.0",
+        "url-join": "^4.0.1"
+      },
+      "bin": {
+        "http-server": "bin/http-server"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/http-server/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/http-server/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/http-server/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/http-server/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/http-server/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http-server/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/http-server/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http-server/node_modules/url-join": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
+      "dev": true
+    },
     "node_modules/http2-wrapper": {
       "version": "1.0.3",
       "dev": true,
@@ -30256,16 +30415,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": {
       "version": "3.0.0",
       "license": "MIT",
@@ -39067,6 +39216,12 @@
       "version": "0.4.1",
       "license": "MIT"
     },
+    "node_modules/secure-compare": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
+      "integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==",
+      "dev": true
+    },
     "node_modules/seedrandom": {
       "version": "3.0.5",
       "dev": true,
@@ -41823,6 +41978,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/union": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
+      "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
+      "dev": true,
+      "dependencies": {
+        "qs": "^6.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "license": "MIT",
@@ -43282,6 +43449,17 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/whatwg-fetch": {
       "version": "3.6.2",
       "license": "MIT"
diff --git a/package.json b/package.json
index 81e963e12671..32572ededb46 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,8 @@
     "setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1",
     "e2e-test-runner-build": "ncc build tests/e2e/testRunner.ts -o tests/e2e/dist/",
     "react-compiler-healthcheck": "react-compiler-healthcheck --verbose",
-    "generate-search-parser": "peggy --format es -o src/libs/SearchParser/searchParser.js src/libs/SearchParser/searchParser.peggy "
+    "generate-search-parser": "peggy --format es -o src/libs/SearchParser/searchParser.js src/libs/SearchParser/searchParser.peggy ",
+    "web:prod": "http-server ./dist --cors"
   },
   "dependencies": {
     "@babel/plugin-proposal-private-methods": "^7.18.6",
@@ -260,6 +261,7 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "clean-webpack-plugin": "^4.0.0",
+    "concat-with-sourcemaps": "^1.1.0",
     "concurrently": "^8.2.2",
     "copy-webpack-plugin": "^10.1.0",
     "css-loader": "^6.7.2",
@@ -280,6 +282,7 @@
     "eslint-plugin-testing-library": "^6.2.2",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "html-webpack-plugin": "^5.5.0",
+    "http-server": "^14.1.1",
     "jest": "29.4.1",
     "jest-circus": "29.4.1",
     "jest-cli": "29.4.1",
@@ -301,6 +304,7 @@
     "shellcheck": "^1.1.0",
     "storybook": "^8.1.10",
     "style-loader": "^2.0.0",
+    "terser-webpack-plugin": "^5.3.10",
     "time-analytics-webpack-plugin": "^0.1.17",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
diff --git a/patches/http-server+14.1.1.patch b/patches/http-server+14.1.1.patch
new file mode 100644
index 000000000000..4f294f930630
--- /dev/null
+++ b/patches/http-server+14.1.1.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/http-server/lib/http-server.js b/node_modules/http-server/lib/http-server.js
+index dfe4c47..b1c3089 100644
+--- a/node_modules/http-server/lib/http-server.js
++++ b/node_modules/http-server/lib/http-server.js
+@@ -98,6 +98,8 @@ function HttpServer(options) {
+     });
+   }
+ 
++  this.headers['Document-Policy'] = 'js-profiling';
++
+   if (options.cors) {
+     this.headers['Access-Control-Allow-Origin'] = '*';
+     this.headers['Access-Control-Allow-Headers'] = 'Origin, X-Requested-With, Content-Type, Accept, Range';
diff --git a/scripts/combine-web-source-maps.ts b/scripts/combine-web-source-maps.ts
new file mode 100644
index 000000000000..d312e4aa6ed2
--- /dev/null
+++ b/scripts/combine-web-source-maps.ts
@@ -0,0 +1,40 @@
+import Concat from 'concat-with-sourcemaps';
+import * as fs from 'fs';
+import * as path from 'path';
+
+const distFolder = path.join(__dirname, '../dist');
+
+type FileMap = {
+    file: string;
+    map: string;
+};
+
+const files: FileMap[] = fs
+    .readdirSync(distFolder)
+    .filter((file) => file.endsWith('.map'))
+    .map((mapFile) => {
+        const jsFile = mapFile.replace('.js.map', '.js');
+        if (fs.existsSync(path.join(distFolder, jsFile))) {
+            return {file: path.join(distFolder, jsFile), map: path.join(distFolder, mapFile)};
+        }
+        return null;
+    })
+    .filter((file): file is FileMap => file !== null);
+
+if (files.length === 0) {
+    console.error('No matching .js and .map files found.');
+    process.exit(1);
+}
+
+const concat = new Concat(true, 'combined.js', '\n');
+
+files.forEach(({file, map}) => {
+    const content = fs.readFileSync(file, 'utf-8');
+    const mapContent = fs.readFileSync(map, 'utf-8');
+    concat.add(file, content, mapContent);
+});
+
+fs.writeFileSync(path.join(distFolder, 'combined.js'), concat.content);
+fs.writeFileSync(path.join(distFolder, 'combined.js.map'), concat.sourceMap ?? '');
+
+console.log('Combined files created successfully.');
diff --git a/src/CONFIG.ts b/src/CONFIG.ts
index 8800cc907588..b1e5460686e1 100644
--- a/src/CONFIG.ts
+++ b/src/CONFIG.ts
@@ -11,9 +11,9 @@ const get = (config: NativeConfig, key: string, defaultValue: string): string =>
 
 // Set default values to contributor friendly values to make development work out of the box without an .env file
 const ENVIRONMENT = get(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV);
-const newExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'NEW_EXPENSIFY_URL', 'https://new.expensify.com/'));
-const expensifyURL = Url.addTrailingForwardSlash(get(Config, 'EXPENSIFY_URL', 'https://www.expensify.com/'));
-const stagingExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'STAGING_EXPENSIFY_URL', 'https://staging.expensify.com/'));
+const newExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'NEW_EXPENSIFY_URL', 'http://localhost:9000/'));
+const expensifyURL = Url.addTrailingForwardSlash(get(Config, 'EXPENSIFY_URL', 'http://localhost:9000/'));
+const stagingExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'STAGING_EXPENSIFY_URL', 'http://localhost:9000/'));
 const stagingSecureExpensifyUrl = Url.addTrailingForwardSlash(get(Config, 'STAGING_SECURE_EXPENSIFY_URL', 'https://staging-secure.expensify.com/'));
 const ngrokURL = Url.addTrailingForwardSlash(get(Config, 'NGROK_URL', ''));
 const secureNgrokURL = Url.addTrailingForwardSlash(get(Config, 'SECURE_NGROK_URL', ''));
diff --git a/src/CONST.ts b/src/CONST.ts
index 9dd67b77e218..12bda0dd7ecf 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -23,7 +23,7 @@ const EMPTY_OBJECT = Object.freeze({});
 
 const CLOUDFRONT_DOMAIN = 'cloudfront.net';
 const CLOUDFRONT_URL = `https://d2k5nsl2zxldvw.${CLOUDFRONT_DOMAIN}`;
-const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'https://new.expensify.com');
+const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'http://localhost:9000/');
 const USE_EXPENSIFY_URL = 'https://use.expensify.com';
 const PLATFORM_OS_MACOS = 'Mac OS';
 const PLATFORM_IOS = 'iOS';
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index cde3750fc37f..47434a1e43fb 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -342,6 +342,8 @@ function FloatingActionButtonAndPopover(
     }));
 
     const toggleCreateMenu = () => {
+        const now = new Date().getTime();
+        while (new Date().getTime() - now < 500) {}
         if (isCreateMenuActive) {
             hideCreateMenu();
         } else {
diff --git a/web/proxy.ts b/web/proxy.ts
index 6660db3f5e87..a72c428afe75 100644
--- a/web/proxy.ts
+++ b/web/proxy.ts
@@ -27,6 +27,18 @@ const server = http.createServer((request: IncomingMessage, response: ServerResp
     let hostname = host;
     let requestPath = request.url;
 
+    // Add CORS headers
+    response.setHeader('Access-Control-Allow-Origin', '*');
+    response.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+    response.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-Requested-With');
+
+    // Handle preflight requests
+    if (request.method === 'OPTIONS') {
+        response.writeHead(200);
+        response.end();
+        return;
+    }
+
     /**
      * When a request is matching a proxy config path we might direct it to a different host (e.g. staging)
      * For requests matching proxy config patterns we replace the mapping url (prefix) with the actual path.

From eeb33c68e9e7ca1c549a356c047e305f44d77f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Thu, 4 Jul 2024 12:21:04 +0200
Subject: [PATCH 06/21] fix combine script

---
 package-lock.json                  | 131 ++++++++++++++++++++++++-----
 package.json                       |   2 +
 scripts/combine-web-source-maps.ts |  40 ---------
 scripts/combine-web-sourcemaps.js  |  56 ++++++++++++
 4 files changed, 166 insertions(+), 63 deletions(-)
 delete mode 100644 scripts/combine-web-source-maps.ts
 create mode 100755 scripts/combine-web-sourcemaps.js

diff --git a/package-lock.json b/package-lock.json
index 3fd20575a2d4..62fcbffb5564 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -246,6 +246,7 @@
         "reassure": "^0.10.1",
         "setimmediate": "^1.0.5",
         "shellcheck": "^1.1.0",
+        "source-map": "^0.7.4",
         "storybook": "^8.1.10",
         "style-loader": "^2.0.0",
         "terser-webpack-plugin": "^5.3.10",
@@ -12839,7 +12840,6 @@
     "node_modules/@storybook/cli/node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "dev": true,
       "engines": {
         "node": ">=14.16"
@@ -12848,8 +12848,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@storybook/cli/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/cli/node_modules/supports-color": {
-      "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
@@ -13252,7 +13258,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
@@ -13262,7 +13267,12 @@
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      }
+      },
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
     },
     "node_modules/@storybook/codemod/node_modules/supports-color": {
       "version": "7.2.0",
@@ -14672,6 +14682,14 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/csf-tools/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/csf/node_modules/type-fest": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -21658,6 +21676,14 @@
         "node": ">= 10.0"
       }
     },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "license": "MIT",
@@ -22050,6 +22076,15 @@
         "source-map": "^0.6.1"
       }
     },
+    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/concurrently": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz",
@@ -22927,6 +22962,14 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/css-what": {
       "version": "6.1.0",
       "license": "BSD-2-Clause",
@@ -24448,6 +24491,15 @@
         "source-map": "~0.6.1"
       }
     },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/eslint": {
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
@@ -27502,6 +27554,14 @@
         "uglify-js": "^3.1.4"
       }
     },
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "license": "MIT",
@@ -27789,14 +27849,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/hermes-profile-transformer/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
       "license": "MIT",
@@ -29658,6 +29710,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/istanbul-reports": {
       "version": "3.1.5",
       "license": "BSD-3-Clause",
@@ -30938,6 +30998,14 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/jest-runner/node_modules/source-map-support": {
       "version": "0.5.13",
       "license": "MIT",
@@ -37290,14 +37358,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/react-native-release-profiler/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/react-native-render-html": {
       "version": "6.3.1",
       "license": "BSD-2-Clause",
@@ -38556,6 +38616,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/recast/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/rechoir": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
@@ -40030,10 +40098,11 @@
       "license": "MIT"
     },
     "node_modules/source-map": {
-      "version": "0.6.1",
-      "license": "BSD-3-Clause",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
     "node_modules/source-map-generator": {
@@ -40072,6 +40141,14 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-url": {
       "version": "0.4.1",
       "license": "MIT",
@@ -43375,6 +43452,14 @@
         "source-map": "~0.6.1"
       }
     },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack-virtual-modules": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
diff --git a/package.json b/package.json
index 32572ededb46..2cc2ea7db3ad 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "symbolicate-release:ios": "scripts/release-profile.ts --platform=ios",
     "symbolicate-release:android": "scripts/release-profile.ts --platform=android",
     "symbolicate-profile": "scripts/symbolicate-profile.ts",
+    "combine-web-sourcemaps": "scripts/combine-web-sourcemaps.ts",
     "test:e2e": "ts-node tests/e2e/testRunner.ts --config ./config.local.ts",
     "test:e2e:dev": "ts-node tests/e2e/testRunner.ts --config ./config.dev.ts",
     "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
@@ -302,6 +303,7 @@
     "reassure": "^0.10.1",
     "setimmediate": "^1.0.5",
     "shellcheck": "^1.1.0",
+    "source-map": "^0.7.4",
     "storybook": "^8.1.10",
     "style-loader": "^2.0.0",
     "terser-webpack-plugin": "^5.3.10",
diff --git a/scripts/combine-web-source-maps.ts b/scripts/combine-web-source-maps.ts
deleted file mode 100644
index d312e4aa6ed2..000000000000
--- a/scripts/combine-web-source-maps.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import Concat from 'concat-with-sourcemaps';
-import * as fs from 'fs';
-import * as path from 'path';
-
-const distFolder = path.join(__dirname, '../dist');
-
-type FileMap = {
-    file: string;
-    map: string;
-};
-
-const files: FileMap[] = fs
-    .readdirSync(distFolder)
-    .filter((file) => file.endsWith('.map'))
-    .map((mapFile) => {
-        const jsFile = mapFile.replace('.js.map', '.js');
-        if (fs.existsSync(path.join(distFolder, jsFile))) {
-            return {file: path.join(distFolder, jsFile), map: path.join(distFolder, mapFile)};
-        }
-        return null;
-    })
-    .filter((file): file is FileMap => file !== null);
-
-if (files.length === 0) {
-    console.error('No matching .js and .map files found.');
-    process.exit(1);
-}
-
-const concat = new Concat(true, 'combined.js', '\n');
-
-files.forEach(({file, map}) => {
-    const content = fs.readFileSync(file, 'utf-8');
-    const mapContent = fs.readFileSync(map, 'utf-8');
-    concat.add(file, content, mapContent);
-});
-
-fs.writeFileSync(path.join(distFolder, 'combined.js'), concat.content);
-fs.writeFileSync(path.join(distFolder, 'combined.js.map'), concat.sourceMap ?? '');
-
-console.log('Combined files created successfully.');
diff --git a/scripts/combine-web-sourcemaps.js b/scripts/combine-web-sourcemaps.js
new file mode 100755
index 000000000000..323d33cb14a2
--- /dev/null
+++ b/scripts/combine-web-sourcemaps.js
@@ -0,0 +1,56 @@
+// TODO: convert this to a typescript script
+
+const fs = require('fs');
+const path = require('path');
+const { SourceMapConsumer, SourceMapGenerator } = require('source-map');
+
+const distDir = path.resolve(__dirname, '..', 'dist');
+const outputFile = path.join(distDir, 'merged-source-map.js.map');
+
+async function mergeSourceMaps() {
+  // Read all .map files in the dist directory
+  const sourceMapFiles = fs.readdirSync(distDir)
+    .filter(file => file.endsWith('.map'))
+    .map(file => path.join(distDir, file));
+
+  const mergedGenerator = new SourceMapGenerator();
+
+  for (const file of sourceMapFiles) {
+    const sourceMapContent = JSON.parse(fs.readFileSync(file, 'utf8'));
+    const consumer = await new SourceMapConsumer(sourceMapContent);
+
+    consumer.eachMapping(mapping => {
+      if (mapping.source) {
+        mergedGenerator.addMapping({
+          generated: {
+            line: mapping.generatedLine,
+            column: mapping.generatedColumn
+          },
+          original: {
+            line: mapping.originalLine,
+            column: mapping.originalColumn
+          },
+          source: mapping.source,
+          name: mapping.name
+        });
+      }
+    });
+
+    // Add the sources content
+    consumer.sources.forEach((sourceFile) => {
+      const content = consumer.sourceContentFor(sourceFile);
+      if (content) {
+        mergedGenerator.setSourceContent(sourceFile, content);
+      }
+    });
+
+    consumer.destroy();
+  }
+
+  // Write the merged source map to a file
+  fs.writeFileSync(outputFile, mergedGenerator.toString());
+
+  console.log(`Merged source map written to ${outputFile}`);
+}
+
+mergeSourceMaps().catch(console.error);
\ No newline at end of file

From 90c76fe4ca733b849273ca6bbcbd0782d105d3bc Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 4 Jul 2024 13:58:21 +0200
Subject: [PATCH 07/21] chore: code cleanup

---
 README.md                         |  4 +--
 config/webpack/webpack.common.ts  | 11 ------
 package-lock.json                 | 20 -----------
 package.json                      |  5 ++-
 scripts/combine-web-sourcemaps.js | 56 -----------------------------
 scripts/combine-web-sourcemaps.ts | 59 +++++++++++++++++++++++++++++++
 scripts/release-profile.ts        |  2 ++
 7 files changed, 65 insertions(+), 92 deletions(-)
 delete mode 100755 scripts/combine-web-sourcemaps.js
 create mode 100755 scripts/combine-web-sourcemaps.ts

diff --git a/README.md b/README.md
index e133178b7dff..c10c954a1864 100644
--- a/README.md
+++ b/README.md
@@ -234,7 +234,7 @@ Within Xcode head to the build phase - `Bundle React Native code and images`.
 5. Upon completion, the generated source map can be found at:
   Android: `android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map`
   IOS: `main.jsbundle.map`
-  web: `dist/444-{hash}.bundle.js.map`
+  web: `dist/merged-source-map.js.map`
 
 ### Recording a Trace:
 1. Ensure you have generated the source map as outlined above.
@@ -266,7 +266,7 @@ Build info:
 4. Use the following commands to symbolicate the trace for Android and iOS, respectively:
 Android: `npm run symbolicate-release:android`
 IOS: `npm run symbolicate-release:ios`
-web: ???
+web: `npm run symbolicate-release:web`
 5. A new file named `Profile_trace_for_<app version>-converted.json` will appear in your project's root folder.
 6. Open this file in your tool of choice:
     - SpeedScope ([https://www.speedscope.app](https://www.speedscope.app/))
diff --git a/config/webpack/webpack.common.ts b/config/webpack/webpack.common.ts
index 5cee41f21aba..33fd9131eca0 100644
--- a/config/webpack/webpack.common.ts
+++ b/config/webpack/webpack.common.ts
@@ -274,17 +274,6 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
     },
 
     optimization: {
-        /*minimize: true,
-        minimizer: [
-            new TerserPlugin({
-                terserOptions: {
-                    sourceMap: {
-                        filename: 'out.js',
-                        url: 'out.js.map',
-                    },
-                },
-            }),
-        ],*/
         runtimeChunk: 'single',
         splitChunks: {
             cacheGroups: {
diff --git a/package-lock.json b/package-lock.json
index 62fcbffb5564..99f7df2c14c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -205,7 +205,6 @@
         "babel-plugin-transform-class-properties": "^6.24.1",
         "babel-plugin-transform-remove-console": "^6.9.4",
         "clean-webpack-plugin": "^4.0.0",
-        "concat-with-sourcemaps": "^1.1.0",
         "concurrently": "^8.2.2",
         "copy-webpack-plugin": "^10.1.0",
         "css-loader": "^6.7.2",
@@ -249,7 +248,6 @@
         "source-map": "^0.7.4",
         "storybook": "^8.1.10",
         "style-loader": "^2.0.0",
-        "terser-webpack-plugin": "^5.3.10",
         "time-analytics-webpack-plugin": "^0.1.17",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
@@ -22067,24 +22065,6 @@
       "version": "0.0.1",
       "license": "MIT"
     },
-    "node_modules/concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/concurrently": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz",
diff --git a/package.json b/package.json
index 2cc2ea7db3ad..d5695bc37263 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "web": "scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
     "web-proxy": "ts-node web/proxy.ts",
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.ts",
-    "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production",
+    "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production && ts-node scripts/combine-web-sourcemaps.ts",
     "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging",
     "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc",
     "desktop": "scripts/set-pusher-suffix.sh && ts-node desktop/start.ts",
@@ -53,6 +53,7 @@
     "symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
     "symbolicate-release:ios": "scripts/release-profile.ts --platform=ios",
     "symbolicate-release:android": "scripts/release-profile.ts --platform=android",
+    "symbolicate-release:web": "scripts/release-profile.ts --platform=web",
     "symbolicate-profile": "scripts/symbolicate-profile.ts",
     "combine-web-sourcemaps": "scripts/combine-web-sourcemaps.ts",
     "test:e2e": "ts-node tests/e2e/testRunner.ts --config ./config.local.ts",
@@ -262,7 +263,6 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "clean-webpack-plugin": "^4.0.0",
-    "concat-with-sourcemaps": "^1.1.0",
     "concurrently": "^8.2.2",
     "copy-webpack-plugin": "^10.1.0",
     "css-loader": "^6.7.2",
@@ -306,7 +306,6 @@
     "source-map": "^0.7.4",
     "storybook": "^8.1.10",
     "style-loader": "^2.0.0",
-    "terser-webpack-plugin": "^5.3.10",
     "time-analytics-webpack-plugin": "^0.1.17",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
diff --git a/scripts/combine-web-sourcemaps.js b/scripts/combine-web-sourcemaps.js
deleted file mode 100755
index 323d33cb14a2..000000000000
--- a/scripts/combine-web-sourcemaps.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// TODO: convert this to a typescript script
-
-const fs = require('fs');
-const path = require('path');
-const { SourceMapConsumer, SourceMapGenerator } = require('source-map');
-
-const distDir = path.resolve(__dirname, '..', 'dist');
-const outputFile = path.join(distDir, 'merged-source-map.js.map');
-
-async function mergeSourceMaps() {
-  // Read all .map files in the dist directory
-  const sourceMapFiles = fs.readdirSync(distDir)
-    .filter(file => file.endsWith('.map'))
-    .map(file => path.join(distDir, file));
-
-  const mergedGenerator = new SourceMapGenerator();
-
-  for (const file of sourceMapFiles) {
-    const sourceMapContent = JSON.parse(fs.readFileSync(file, 'utf8'));
-    const consumer = await new SourceMapConsumer(sourceMapContent);
-
-    consumer.eachMapping(mapping => {
-      if (mapping.source) {
-        mergedGenerator.addMapping({
-          generated: {
-            line: mapping.generatedLine,
-            column: mapping.generatedColumn
-          },
-          original: {
-            line: mapping.originalLine,
-            column: mapping.originalColumn
-          },
-          source: mapping.source,
-          name: mapping.name
-        });
-      }
-    });
-
-    // Add the sources content
-    consumer.sources.forEach((sourceFile) => {
-      const content = consumer.sourceContentFor(sourceFile);
-      if (content) {
-        mergedGenerator.setSourceContent(sourceFile, content);
-      }
-    });
-
-    consumer.destroy();
-  }
-
-  // Write the merged source map to a file
-  fs.writeFileSync(outputFile, mergedGenerator.toString());
-
-  console.log(`Merged source map written to ${outputFile}`);
-}
-
-mergeSourceMaps().catch(console.error);
\ No newline at end of file
diff --git a/scripts/combine-web-sourcemaps.ts b/scripts/combine-web-sourcemaps.ts
new file mode 100755
index 000000000000..a07ba2208988
--- /dev/null
+++ b/scripts/combine-web-sourcemaps.ts
@@ -0,0 +1,59 @@
+/* eslint-disable @typescript-eslint/await-thenable */
+import fs from 'fs';
+import path from 'path';
+import type {RawSourceMap} from 'source-map';
+import {SourceMapConsumer, SourceMapGenerator} from 'source-map';
+
+const distDir = path.resolve(__dirname, '..', 'dist');
+const outputFile = path.join(distDir, 'merged-source-map.js.map');
+
+async function mergeSourceMaps() {
+    // Read all .map files in the dist directory
+    const sourceMapFiles = fs
+        .readdirSync(distDir)
+        .filter((file) => file.endsWith('.map'))
+        .map((file) => path.join(distDir, file));
+
+    const mergedGenerator = new SourceMapGenerator();
+
+    for (const file of sourceMapFiles) {
+        const sourceMapContent = JSON.parse(fs.readFileSync(file, 'utf8')) as RawSourceMap;
+        const consumer = await new SourceMapConsumer(sourceMapContent);
+
+        consumer.eachMapping((mapping) => {
+            if (!mapping.source) {
+                return;
+            }
+
+            mergedGenerator.addMapping({
+                generated: {
+                    line: mapping.generatedLine,
+                    column: mapping.generatedColumn,
+                },
+                original: {
+                    line: mapping.originalLine,
+                    column: mapping.originalColumn,
+                },
+                source: mapping.source,
+                name: mapping.name,
+            });
+        });
+
+        // Add the sources content
+        consumer.sources.forEach((sourceFile: string) => {
+            const content = consumer.sourceContentFor(sourceFile);
+            if (content) {
+                mergedGenerator.setSourceContent(sourceFile, content);
+            }
+        });
+
+        consumer.destroy();
+    }
+
+    // Write the merged source map to a file
+    fs.writeFileSync(outputFile, mergedGenerator.toString());
+
+    console.log(`Merged source map written to ${outputFile}`);
+}
+
+mergeSourceMaps().catch(console.error);
diff --git a/scripts/release-profile.ts b/scripts/release-profile.ts
index cfc7e2cb8838..2e7b60ca656b 100755
--- a/scripts/release-profile.ts
+++ b/scripts/release-profile.ts
@@ -19,6 +19,8 @@ if (argsMap.platform === 'ios') {
     sourcemapPath = 'main.jsbundle.map';
 } else if (argsMap.platform === 'android') {
     sourcemapPath = 'android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map';
+} else if (argsMap.platform === 'web') {
+    sourcemapPath = 'dist/merged-source-map.js.map';
 } else {
     console.error('Please specify the platform using --platform=ios or --platform=android');
     process.exit(1);

From 125e8e8b77018f58676ecd4cab4f2bb986dfa45f Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 4 Jul 2024 14:16:36 +0200
Subject: [PATCH 08/21] fix: changes after rebase

---
 package-lock.json | 82 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 99f7df2c14c4..0afcd9b7ed0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10172,6 +10172,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/addon-docs/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/addon-essentials": {
       "version": "8.1.10",
       "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.1.10.tgz",
@@ -10699,6 +10708,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/addon-essentials/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/addon-essentials/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11437,6 +11455,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/blocks/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/blocks/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12017,6 +12044,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/builder-manager/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/builder-manager/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12849,6 +12885,7 @@
     "node_modules/@storybook/cli/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13256,6 +13293,7 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/codemod/node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
@@ -13265,12 +13303,16 @@
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      },
+      }
+    },
+    "node_modules/@storybook/codemod/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
+      }
     },
     "node_modules/@storybook/codemod/node_modules/supports-color": {
       "version": "7.2.0",
@@ -14370,6 +14412,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@storybook/core-server/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/core-server/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14629,6 +14680,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/csf-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/csf-tools": {
       "version": "8.0.6",
       "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-8.0.6.tgz",
@@ -14684,6 +14744,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15892,6 +15953,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/react/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/react/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -16494,6 +16564,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@storybook/telemetry/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@storybook/telemetry/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -27538,6 +27617,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }

From 236228e88023b83f31eb8484ec2dfc18ae8f55ed Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 4 Jul 2024 14:34:29 +0200
Subject: [PATCH 09/21] chore: changes after self review

---
 .env.example                                         |  6 +++---
 .env.production                                      |  6 +++---
 .env.staging                                         |  6 +++---
 patches/react-native-release-profiler+0.2.0.patch    | 12 ++++++++++++
 scripts/release-profile.ts                           |  2 +-
 src/CONFIG.ts                                        |  6 +++---
 src/CONST.ts                                         |  2 +-
 .../SidebarScreen/FloatingActionButtonAndPopover.tsx |  2 --
 8 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 patches/react-native-release-profiler+0.2.0.patch

diff --git a/.env.example b/.env.example
index ce534f694e0b..944da2aa9296 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
-NEW_EXPENSIFY_URL=http://localhost:9000/
-SECURE_EXPENSIFY_URL=http://localhost:9000/
-EXPENSIFY_URL=http://localhost:9000/
+NEW_EXPENSIFY_URL=https://new.expensify.com/
+SECURE_EXPENSIFY_URL=https://secure.expensify.com.dev/
+EXPENSIFY_URL=https://www.expensify.com.dev/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=ac6d22b891daae55283a
diff --git a/.env.production b/.env.production
index 9b9d91b50ee8..5e676134d681 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
-NEW_EXPENSIFY_URL=http://localhost:9000/
-SECURE_EXPENSIFY_URL=http://localhost:9000/
-EXPENSIFY_URL=http://localhost:9000/
+NEW_EXPENSIFY_URL=https://new.expensify.com/
+SECURE_EXPENSIFY_URL=https://secure.expensify.com/
+EXPENSIFY_URL=https://www.expensify.com/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
diff --git a/.env.staging b/.env.staging
index 8cd23786c79c..17d82ac2d136 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,6 +1,6 @@
-NEW_EXPENSIFY_URL=http://localhost:9000/
-SECURE_EXPENSIFY_URL=http://localhost:9000/
-EXPENSIFY_URL=http://localhost:9000/
+NEW_EXPENSIFY_URL=https://staging.new.expensify.com/
+SECURE_EXPENSIFY_URL=https://secure.expensify.com/
+EXPENSIFY_URL=https://www.expensify.com/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
diff --git a/patches/react-native-release-profiler+0.2.0.patch b/patches/react-native-release-profiler+0.2.0.patch
new file mode 100644
index 000000000000..d0f53aa1b394
--- /dev/null
+++ b/patches/react-native-release-profiler+0.2.0.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-release-profiler/src/index.tsx b/node_modules/react-native-release-profiler/src/index.tsx
+index 9484c92..1b9f115 100644
+--- a/node_modules/react-native-release-profiler/src/index.tsx
++++ b/node_modules/react-native-release-profiler/src/index.tsx
+@@ -21,6 +21,6 @@ export function startProfiling(): Boolean {
+   return ReleaseProfiler.startProfiling();
+ }
+ 
+-export function stopProfiling(saveToDownloads = false): Promise<string> {
++export function stopProfiling(saveToDownloads = false, _fileName = ""): Promise<string> {
+   return ReleaseProfiler.stopProfiling(saveToDownloads);
+ }
diff --git a/scripts/release-profile.ts b/scripts/release-profile.ts
index 2e7b60ca656b..a83fb55fa5ff 100755
--- a/scripts/release-profile.ts
+++ b/scripts/release-profile.ts
@@ -37,7 +37,7 @@ if (cpuProfiles.length === 0) {
 } else {
     // Construct the command
     const cpuprofileName = cpuProfiles[0];
-    const command = `npx react-native-release-profiler --local ${cpuprofileName} --sourcemap-path ${sourcemapPath}`;
+    const command = `npx react-native-release-profiler --local "${cpuprofileName}" --sourcemap-path "${sourcemapPath}"`;
 
     console.log(`Executing: ${command}`);
 
diff --git a/src/CONFIG.ts b/src/CONFIG.ts
index b1e5460686e1..8800cc907588 100644
--- a/src/CONFIG.ts
+++ b/src/CONFIG.ts
@@ -11,9 +11,9 @@ const get = (config: NativeConfig, key: string, defaultValue: string): string =>
 
 // Set default values to contributor friendly values to make development work out of the box without an .env file
 const ENVIRONMENT = get(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV);
-const newExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'NEW_EXPENSIFY_URL', 'http://localhost:9000/'));
-const expensifyURL = Url.addTrailingForwardSlash(get(Config, 'EXPENSIFY_URL', 'http://localhost:9000/'));
-const stagingExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'STAGING_EXPENSIFY_URL', 'http://localhost:9000/'));
+const newExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'NEW_EXPENSIFY_URL', 'https://new.expensify.com/'));
+const expensifyURL = Url.addTrailingForwardSlash(get(Config, 'EXPENSIFY_URL', 'https://www.expensify.com/'));
+const stagingExpensifyURL = Url.addTrailingForwardSlash(get(Config, 'STAGING_EXPENSIFY_URL', 'https://staging.expensify.com/'));
 const stagingSecureExpensifyUrl = Url.addTrailingForwardSlash(get(Config, 'STAGING_SECURE_EXPENSIFY_URL', 'https://staging-secure.expensify.com/'));
 const ngrokURL = Url.addTrailingForwardSlash(get(Config, 'NGROK_URL', ''));
 const secureNgrokURL = Url.addTrailingForwardSlash(get(Config, 'SECURE_NGROK_URL', ''));
diff --git a/src/CONST.ts b/src/CONST.ts
index 12bda0dd7ecf..9dd67b77e218 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -23,7 +23,7 @@ const EMPTY_OBJECT = Object.freeze({});
 
 const CLOUDFRONT_DOMAIN = 'cloudfront.net';
 const CLOUDFRONT_URL = `https://d2k5nsl2zxldvw.${CLOUDFRONT_DOMAIN}`;
-const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'http://localhost:9000/');
+const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'https://new.expensify.com');
 const USE_EXPENSIFY_URL = 'https://use.expensify.com';
 const PLATFORM_OS_MACOS = 'Mac OS';
 const PLATFORM_IOS = 'iOS';
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 47434a1e43fb..cde3750fc37f 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -342,8 +342,6 @@ function FloatingActionButtonAndPopover(
     }));
 
     const toggleCreateMenu = () => {
-        const now = new Date().getTime();
-        while (new Date().getTime() - now < 500) {}
         if (isCreateMenuActive) {
             hideCreateMenu();
         } else {

From 39dbe50e0bc8c317a4799bf2191e463e20e27fbe Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 4 Jul 2024 14:46:48 +0200
Subject: [PATCH 10/21] fix: another attempt to fix CI

---
 patches/react-native-release-profiler+0.2.0.patch      | 10 ++++++++++
 .../ProfilingToolMenu/BaseProfilingToolMenu.tsx        |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/patches/react-native-release-profiler+0.2.0.patch b/patches/react-native-release-profiler+0.2.0.patch
index d0f53aa1b394..b1b31d3f0fc9 100644
--- a/patches/react-native-release-profiler+0.2.0.patch
+++ b/patches/react-native-release-profiler+0.2.0.patch
@@ -1,3 +1,13 @@
+diff --git a/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts b/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts
+index 32abf21..39b2de3 100644
+--- a/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts
++++ b/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts
+@@ -1,3 +1,3 @@
+ export declare function startProfiling(): Boolean;
+-export declare function stopProfiling(saveToDownloads?: boolean): Promise<string>;
++export declare function stopProfiling(saveToDownloads?: boolean, fileName?: string): Promise<string>;
+ //# sourceMappingURL=index.d.ts.map
+\ No newline at end of file
 diff --git a/node_modules/react-native-release-profiler/src/index.tsx b/node_modules/react-native-release-profiler/src/index.tsx
 index 9484c92..1b9f115 100644
 --- a/node_modules/react-native-release-profiler/src/index.tsx
diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index bdc52365b579..50ac681fde3c 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -15,9 +15,9 @@ import Log from '@libs/Log';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import pkg from '../../../package.json';
 import RNFS from './RNFS';
 import Share from './Share';
-import pkg from '../../../package.json';
 
 type BaseProfilingToolMenuOnyxProps = {
     isProfilingInProgress: OnyxEntry<boolean>;

From 5db459c5cfbc37878070adf46dfdf9f882aefb29 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 4 Jul 2024 15:37:32 +0200
Subject: [PATCH 11/21] chore: migrate electron-serve to ts

---
 .../{electron-serve.js => electron-serve.ts}  | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)
 rename desktop/{electron-serve.js => electron-serve.ts} (59%)

diff --git a/desktop/electron-serve.js b/desktop/electron-serve.ts
similarity index 59%
rename from desktop/electron-serve.js
rename to desktop/electron-serve.ts
index aea218c51ea6..4fdad3e0d376 100644
--- a/desktop/electron-serve.js
+++ b/desktop/electron-serve.ts
@@ -1,18 +1,27 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
 /* eslint-disable rulesdir/no-negated-variables */
+
 /* eslint-disable no-param-reassign */
+
 /* eslint-disable @lwc/lwc/no-async-await */
 
 /**
  * This file is a modified version of the electron-serve package.
  * We keep the same interface, but instead of file protocol we use buffer protocol (with support of JS self profiling).
  */
-const {app, protocol, session} = require('electron');
-const path = require('path');
-const fs = require('fs');
+import type {BrowserWindow, Protocol} from 'electron';
+import {app, protocol, session} from 'electron';
+import fs from 'fs';
+import path from 'path';
+
+type RegisterBufferProtocol = Protocol['registerBufferProtocol'];
+type HandlerType = Parameters<RegisterBufferProtocol>[1];
+type Optional<T> = T | null | undefined;
 
 const FILE_NOT_FOUND = -6;
 
-const getPath = async (filePath) => {
+const getPath = async (filePath: string): Promise<Optional<string>> => {
     try {
         const result = await fs.promises.stat(filePath);
 
@@ -21,6 +30,7 @@ const getPath = async (filePath) => {
         }
 
         if (result.isDirectory()) {
+            // eslint-disable-next-line @typescript-eslint/return-await
             return getPath(path.join(filePath, 'index.html'));
         }
     } catch {
@@ -28,8 +38,17 @@ const getPath = async (filePath) => {
     }
 };
 
-export default function electronServe(options) {
-    options = {
+type ServeOptions = {
+    directory: string;
+    isCorsEnabled?: boolean;
+    scheme?: string;
+    hostname?: string;
+    file?: string;
+    partition?: string;
+};
+
+export default function electronServe(options: ServeOptions) {
+    const mandatoryOptions = {
         isCorsEnabled: true,
         scheme: 'app',
         hostname: '-',
@@ -43,9 +62,9 @@ export default function electronServe(options) {
 
     options.directory = path.resolve(app.getAppPath(), options.directory);
 
-    const handler = async (request, callback) => {
+    const handler: HandlerType = async (request, callback) => {
         const filePath = path.join(options.directory, decodeURIComponent(new URL(request.url).pathname));
-        const resolvedPath = (await getPath(filePath)) || path.join(options.directory, `${options.file}.html`);
+        const resolvedPath = (await getPath(filePath)) ?? path.join(options.directory, `${options.file}.html`);
 
         try {
             const data = await fs.promises.readFile(resolvedPath);
@@ -53,6 +72,7 @@ export default function electronServe(options) {
                 mimeType: 'text/html',
                 data: Buffer.from(data),
                 headers: {
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
                     'Document-Policy': 'js-profiling',
                 },
             });
@@ -63,7 +83,7 @@ export default function electronServe(options) {
 
     protocol.registerSchemesAsPrivileged([
         {
-            scheme: options.scheme,
+            scheme: mandatoryOptions.scheme,
             privileges: {
                 standard: true,
                 secure: true,
@@ -75,12 +95,13 @@ export default function electronServe(options) {
     ]);
 
     app.on('ready', () => {
-        const partitionSession = options.partition ? session.fromPartition(options.partition) : session.defaultSession;
+        const partitionSession = mandatoryOptions.partition ? session.fromPartition(mandatoryOptions.partition) : session.defaultSession;
 
-        partitionSession.protocol.registerBufferProtocol(options.scheme, handler);
+        partitionSession.protocol.registerBufferProtocol(mandatoryOptions.scheme, handler);
     });
 
-    return async (window_, searchParameters) => {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    return async (window_: BrowserWindow, searchParameters?: URLSearchParams) => {
         const queryString = searchParameters ? `?${new URLSearchParams(searchParameters).toString()}` : '';
         await window_.loadURL(`${options.scheme}://${options.hostname}${queryString}`);
     };

From 50369ea935aaa915d88f2374aadc140673b140a6 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 4 Jul 2024 16:30:03 +0200
Subject: [PATCH 12/21] fix: make serve actually working

---
 desktop/electron-serve.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/desktop/electron-serve.ts b/desktop/electron-serve.ts
index 4fdad3e0d376..42dec3e83615 100644
--- a/desktop/electron-serve.ts
+++ b/desktop/electron-serve.ts
@@ -2,8 +2,6 @@
 
 /* eslint-disable rulesdir/no-negated-variables */
 
-/* eslint-disable no-param-reassign */
-
 /* eslint-disable @lwc/lwc/no-async-await */
 
 /**
@@ -56,15 +54,15 @@ export default function electronServe(options: ServeOptions) {
         ...options,
     };
 
-    if (!options.directory) {
+    if (!mandatoryOptions.directory) {
         throw new Error('The `directory` option is required');
     }
 
-    options.directory = path.resolve(app.getAppPath(), options.directory);
+    mandatoryOptions.directory = path.resolve(app.getAppPath(), mandatoryOptions.directory);
 
     const handler: HandlerType = async (request, callback) => {
-        const filePath = path.join(options.directory, decodeURIComponent(new URL(request.url).pathname));
-        const resolvedPath = (await getPath(filePath)) ?? path.join(options.directory, `${options.file}.html`);
+        const filePath = path.join(mandatoryOptions.directory, decodeURIComponent(new URL(request.url).pathname));
+        const resolvedPath = (await getPath(filePath)) ?? path.join(mandatoryOptions.directory, `${mandatoryOptions.file}.html`);
 
         try {
             const data = await fs.promises.readFile(resolvedPath);
@@ -89,7 +87,7 @@ export default function electronServe(options: ServeOptions) {
                 secure: true,
                 allowServiceWorkers: true,
                 supportFetchAPI: true,
-                corsEnabled: options.isCorsEnabled,
+                corsEnabled: mandatoryOptions.isCorsEnabled,
             },
         },
     ]);
@@ -103,6 +101,6 @@ export default function electronServe(options: ServeOptions) {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     return async (window_: BrowserWindow, searchParameters?: URLSearchParams) => {
         const queryString = searchParameters ? `?${new URLSearchParams(searchParameters).toString()}` : '';
-        await window_.loadURL(`${options.scheme}://${options.hostname}${queryString}`);
+        await window_.loadURL(`${mandatoryOptions.scheme}://${mandatoryOptions.hostname}${queryString}`);
     };
 }

From 45b3a71295f71f5ce6eb0c1d3f56bd6d03c9b545 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Fri, 5 Jul 2024 14:09:19 +0200
Subject: [PATCH 13/21] feat: upload source maps

---
 .github/workflows/platformDeploy.yml | 12 ++++++++++++
 package.json                         |  4 ++--
 scripts/build-desktop.sh             |  4 ++++
 scripts/combine-web-sourcemaps.ts    |  5 ++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index ba776f257a3c..e1ffa0006089 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -179,6 +179,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
+      - name: Archive desktop sourcemaps
+        uses: actions/upload-artifact@v3
+        with:
+          name: desktop-sourcemap-${{ github.ref_name }}
+          path: desktop/dist/www/merged-source-map.js.map
+
   iOS:
     name: Build and deploy iOS
     needs: validateActor
@@ -348,6 +354,12 @@ jobs:
         env:
           S3_URL: s3://${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && '' || 'staging-' }}expensify-cash
 
+      - name: Archive web sourcemaps
+        uses: actions/upload-artifact@v3
+        with:
+          name: web-sourcemap-${{ github.ref_name }}
+          path: dist/merged-source-map.js.map
+
       - name: Purge Cloudflare cache
         run: /home/runner/.local/bin/cli4 --verbose --delete hosts=["${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && '' || 'staging.' }}new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
         env:
diff --git a/package.json b/package.json
index d5695bc37263..8fdf22df7cb4 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "web-proxy": "ts-node web/proxy.ts",
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.ts",
     "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production && ts-node scripts/combine-web-sourcemaps.ts",
-    "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging",
-    "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc",
+    "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging && ts-node scripts/combine-web-sourcemaps.ts",
+    "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc && ts-node scripts/combine-web-sourcemaps.ts",
     "desktop": "scripts/set-pusher-suffix.sh && ts-node desktop/start.ts",
     "desktop-build": "scripts/build-desktop.sh production",
     "desktop-build-staging": "scripts/build-desktop.sh staging",
diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
index 791f59d73330..55cb416c1112 100755
--- a/scripts/build-desktop.sh
+++ b/scripts/build-desktop.sh
@@ -32,6 +32,10 @@ info " • ENV file: $ENV_FILE"
 info ""
 npx webpack --config config/webpack/webpack.desktop.ts --env file=$ENV_FILE
 
+title "Combining web sourcemaps"
+info ""
+ts-node scripts/combine-web-sourcemaps.ts --path="desktop/dist/www"
+
 title "Building Desktop App Archive Using Electron"
 info ""
 shift 1
diff --git a/scripts/combine-web-sourcemaps.ts b/scripts/combine-web-sourcemaps.ts
index a07ba2208988..4a5972ed79c5 100755
--- a/scripts/combine-web-sourcemaps.ts
+++ b/scripts/combine-web-sourcemaps.ts
@@ -3,8 +3,11 @@ import fs from 'fs';
 import path from 'path';
 import type {RawSourceMap} from 'source-map';
 import {SourceMapConsumer, SourceMapGenerator} from 'source-map';
+import parseCommandLineArguments from './utils/parseCommandLineArguments';
 
-const distDir = path.resolve(__dirname, '..', 'dist');
+const argsMap = parseCommandLineArguments();
+
+const distDir = path.resolve(__dirname, '..', argsMap.path ?? 'dist');
 const outputFile = path.join(distDir, 'merged-source-map.js.map');
 
 async function mergeSourceMaps() {

From d5993fe39b952a874b446b099a0e1fdc69678518 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Fri, 5 Jul 2024 16:16:59 +0200
Subject: [PATCH 14/21] fix: remove patch

---
 .../react-native-release-profiler+0.2.0.patch | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 patches/react-native-release-profiler+0.2.0.patch

diff --git a/patches/react-native-release-profiler+0.2.0.patch b/patches/react-native-release-profiler+0.2.0.patch
deleted file mode 100644
index b1b31d3f0fc9..000000000000
--- a/patches/react-native-release-profiler+0.2.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts b/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts
-index 32abf21..39b2de3 100644
---- a/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts
-+++ b/node_modules/react-native-release-profiler/lib/typescript/src/index.d.ts
-@@ -1,3 +1,3 @@
- export declare function startProfiling(): Boolean;
--export declare function stopProfiling(saveToDownloads?: boolean): Promise<string>;
-+export declare function stopProfiling(saveToDownloads?: boolean, fileName?: string): Promise<string>;
- //# sourceMappingURL=index.d.ts.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-release-profiler/src/index.tsx b/node_modules/react-native-release-profiler/src/index.tsx
-index 9484c92..1b9f115 100644
---- a/node_modules/react-native-release-profiler/src/index.tsx
-+++ b/node_modules/react-native-release-profiler/src/index.tsx
-@@ -21,6 +21,6 @@ export function startProfiling(): Boolean {
-   return ReleaseProfiler.startProfiling();
- }
- 
--export function stopProfiling(saveToDownloads = false): Promise<string> {
-+export function stopProfiling(saveToDownloads = false, _fileName = ""): Promise<string> {
-   return ReleaseProfiler.stopProfiling(saveToDownloads);
- }

From 8c627aeeabc7234818568281b7a0cec8b1d5eba3 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Fri, 5 Jul 2024 18:15:17 +0200
Subject: [PATCH 15/21] fix: unit tests

---
 .../assertions/platformDeployAssertions.ts          | 13 +++++++++++++
 workflow_tests/mocks/platformDeployMocks.ts         |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts
index af80e9f2beb3..cf0b78ca7f4a 100644
--- a/workflow_tests/assertions/platformDeployAssertions.ts
+++ b/workflow_tests/assertions/platformDeployAssertions.ts
@@ -133,6 +133,14 @@ function assertDesktopJobExecuted(workflowResult: Step[], didExecute = true, isP
         );
     }
 
+    steps.push(
+        createStepAssertion('Archive desktop sourcemaps', true, null, 'DESKTOP', 'Archiving desktop sourcemaps', [
+            // Note 1.2.3 comes from the ref name that we are on, which is the version we are deploying
+            {key: 'name', value: 'desktop-sourcemap-1.2.3'},
+            {key: 'path', value: 'desktop/dist/www/merged-source-map.js.map'},
+        ]),
+    );
+
     steps.forEach((expectedStep) => {
         if (didExecute) {
             expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
@@ -241,6 +249,11 @@ function assertWebJobExecuted(workflowResult: Step[], didExecute = true) {
         createStepAssertion('Build web', true, null, 'WEB', 'Building web'),
         createStepAssertion('Build storybook docs', true, null, 'WEB', 'Build storybook docs'),
         createStepAssertion('Deploy to S3', true, null, 'WEB', 'Deploying to S3'),
+        createStepAssertion('Archive web sourcemaps', true, null, 'WEB', 'Archive web sourcemaps', null, [
+            // Note 1.2.3 comes from the ref name that we are on, which is the version we are deploying
+            {key: 'name', value: 'desktop-sourcemap-1.2.3'},
+            {key: 'path', value: 'desktop/dist/www/merged-source-map.js.map'},
+        ]),
         createStepAssertion('Purge Cloudflare cache', true, null, 'WEB', 'Purging Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
     );
 
diff --git a/workflow_tests/mocks/platformDeployMocks.ts b/workflow_tests/mocks/platformDeployMocks.ts
index 8889e9dc27db..aec3f465f885 100644
--- a/workflow_tests/mocks/platformDeployMocks.ts
+++ b/workflow_tests/mocks/platformDeployMocks.ts
@@ -96,6 +96,7 @@ const PLATFORM_DEPLOY__DESKTOP__UPLOAD_WORKFLOW__STEP_MOCK = createMockStep('Upl
 const PLATFORM_DEPLOY__DESKTOP__UPLOAD_GH_RELEASE__STEP_MOCK = createMockStep('Upload desktop build to GitHub Release', 'Uploading desktop build to GitHub Release', 'DESKTOP', null, [
     'GITHUB_TOKEN',
 ]);
+const PLATFORM_DEPLOY__DESKTOP__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive desktop sourcemaps', 'Archiving desktop sourcemaps', 'DESKTOP', ['name', 'path']);
 const PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS = [
     PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK,
     PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK,
@@ -103,6 +104,7 @@ const PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS = [
     PLATFORM_DEPLOY__DESKTOP__BUILD__STEP_MOCK,
     PLATFORM_DEPLOY__DESKTOP__UPLOAD_WORKFLOW__STEP_MOCK,
     PLATFORM_DEPLOY__DESKTOP__UPLOAD_GH_RELEASE__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__ARCHIVE_SOURCEMAPS__STEP_MOCK,
 ];
 
 // ios
@@ -181,6 +183,7 @@ const PLATFORM_DEPLOY__WEB__BUILD__STEP_MOCK = createMockStep('Build web', 'Buil
 const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS__STEP_MOCK = createMockStep('Build storybook docs', 'Build storybook docs', 'WEB');
 const PLATFORM_DEPLOY__WEB__DEPLOY_S3__STEP_MOCK = createMockStep('Deploy to S3', 'Deploying to S3', 'WEB');
 const PLATFORM_DEPLOY__WEB__PURGE_CLOUDFLARE_CACHE__STEP_MOCK = createMockStep('Purge Cloudflare cache', 'Purging Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive web sourcemaps', 'Archiving web sourcemaps', 'WEB', ['name', 'path']);
 const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
     PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK,
@@ -189,6 +192,7 @@ const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
     PLATFORM_DEPLOY__WEB__BUILD__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__DEPLOY_S3__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__ARCHIVE_SOURCEMAPS__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__PURGE_CLOUDFLARE_CACHE__STEP_MOCK,
 ];
 

From abeb684fb703e01948339b8f7f37894ac03ecc2d Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Mon, 8 Jul 2024 11:06:20 +0200
Subject: [PATCH 16/21] fix: partially workflow test fixes

---
 workflow_tests/assertions/platformDeployAssertions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts
index cf0b78ca7f4a..f16964de265f 100644
--- a/workflow_tests/assertions/platformDeployAssertions.ts
+++ b/workflow_tests/assertions/platformDeployAssertions.ts
@@ -249,10 +249,10 @@ function assertWebJobExecuted(workflowResult: Step[], didExecute = true) {
         createStepAssertion('Build web', true, null, 'WEB', 'Building web'),
         createStepAssertion('Build storybook docs', true, null, 'WEB', 'Build storybook docs'),
         createStepAssertion('Deploy to S3', true, null, 'WEB', 'Deploying to S3'),
-        createStepAssertion('Archive web sourcemaps', true, null, 'WEB', 'Archive web sourcemaps', null, [
+        createStepAssertion('Archive web sourcemaps', true, null, 'WEB', 'Archiving web sourcemaps', null, [
             // Note 1.2.3 comes from the ref name that we are on, which is the version we are deploying
-            {key: 'name', value: 'desktop-sourcemap-1.2.3'},
-            {key: 'path', value: 'desktop/dist/www/merged-source-map.js.map'},
+            {key: 'name', value: 'web-sourcemap-1.2.3'},
+            {key: 'path', value: 'dist/merged-source-map.js.map'},
         ]),
         createStepAssertion('Purge Cloudflare cache', true, null, 'WEB', 'Purging Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
     );

From 92add2f39cf09ac44c4d22313a1fb330c6d64f27 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 11 Jul 2024 14:35:55 +0200
Subject: [PATCH 17/21] feat: add share button on web for logs trace

---
 .../BaseClientSideLoggingToolMenu.tsx         |  8 ++++-
 .../ClientSideLoggingToolMenu/index.tsx       | 30 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
index 7c4c669e2154..379668e4850b 100644
--- a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
+++ b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
@@ -21,9 +21,14 @@ type BaseClientSideLoggingToolMenuOnyxProps = {
     shouldStoreLogs: OnyxEntry<boolean>;
 };
 
+type File = {
+    path: string;
+    newFileName: string;
+    size: number;
+};
 type BaseClientSideLoggingToolProps = {
     /** Locally created file */
-    file?: {path: string; newFileName: string; size: number};
+    file?: File;
     /** Action to run when pressing Share button */
     onShareLogs?: () => void;
     /** Action to run when disabling the switch */
@@ -96,3 +101,4 @@ export default withOnyx<BaseClientSideLoggingToolProps, BaseClientSideLoggingToo
         key: ONYXKEYS.SHOULD_STORE_LOGS,
     },
 })(BaseClientSideLoggingToolMenu);
+export type {File};
diff --git a/src/components/ClientSideLoggingToolMenu/index.tsx b/src/components/ClientSideLoggingToolMenu/index.tsx
index 182c3bf99b74..4e9164f68fcf 100644
--- a/src/components/ClientSideLoggingToolMenu/index.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.tsx
@@ -1,14 +1,38 @@
-import React from 'react';
+import React, {useState} from 'react';
 import type {Log} from '@libs/Console';
 import localFileDownload from '@libs/localFileDownload';
+import type {File} from './BaseClientSideLoggingToolMenu';
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {
+    const [localLogs, setLocalLogs] = useState<Log[]>([]);
+    const [file, setFile] = useState<File | undefined>(undefined);
     const downloadFile = (logs: Log[]) => {
-        localFileDownload('logs', JSON.stringify(logs, null, 2));
+        const data = JSON.stringify(logs, null, 2);
+        setFile({
+            path: './logs',
+            newFileName: 'logs',
+            size: data.length,
+        });
+        setLocalLogs(logs);
+        localFileDownload('logs', data);
+    };
+    const hideShareButton = () => {
+        setFile(undefined);
+    };
+    const shareLogs = () => {
+        downloadFile(localLogs);
     };
 
-    return <BaseClientSideLoggingToolMenu onDisableLogging={downloadFile} />;
+    return (
+        <BaseClientSideLoggingToolMenu
+            file={file}
+            onDisableLogging={downloadFile}
+            onEnableLogging={hideShareButton}
+            onShareLogs={shareLogs}
+            displayPath={file?.path}
+        />
+    );
 }
 
 ClientSideLoggingToolMenu.displayName = 'ClientSideLoggingToolMenu';

From 1674da7492a6c3e243a2a30117343356f9a15748 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Mon, 15 Jul 2024 17:55:02 +0200
Subject: [PATCH 18/21] fix: disable share button

---
 src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index 50ac681fde3c..19ee1d875be2 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -158,7 +158,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
                     onToggle={onToggleProfiling}
                 />
             </TestToolRow>
-            {!!filePath && (
+            {(!!filePath && getPlatform() !== CONST.PLATFORM.WEB) && (
                 <>
                     <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>

From c6765ba8e156d121545fd72bce707c56f563a283 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Mon, 15 Jul 2024 18:24:02 +0200
Subject: [PATCH 19/21] fix: prettier

---
 src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index 19ee1d875be2..96697bdb794e 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -158,7 +158,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
                     onToggle={onToggleProfiling}
                 />
             </TestToolRow>
-            {(!!filePath && getPlatform() !== CONST.PLATFORM.WEB) && (
+            {!!filePath && getPlatform() !== CONST.PLATFORM.WEB && (
                 <>
                     <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>

From 67a0ab598fc060006703ea1a41919082baab0058 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Tue, 16 Jul 2024 12:46:39 +0200
Subject: [PATCH 20/21] fix: changes after code review

---
 src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx | 6 ++++--
 src/components/ProfilingToolMenu/index.android.tsx         | 1 +
 src/components/ProfilingToolMenu/index.ios.tsx             | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index 96697bdb794e..12282bf64445 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -28,6 +28,8 @@ type BaseProfilingToolMenuProps = {
     pathToBeUsed: string;
     /** Path used to display location of saved file */
     displayPath: string;
+    /** Whether to show the share button */
+    showShareButton?: boolean;
 } & BaseProfilingToolMenuOnyxProps;
 
 function formatBytes(bytes: number, decimals = 2) {
@@ -47,7 +49,7 @@ function formatBytes(bytes: number, decimals = 2) {
 // WARNING: When changing this name make sure that the "scripts/symbolicate-profile.ts" script is still working!
 const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
 
-function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
+function BaseProfilingToolMenu({isProfilingInProgress = false, showShareButton = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
     const styles = useThemeStyles();
     const [filePath, setFilePath] = useState('');
     const [sharePath, setSharePath] = useState('');
@@ -158,7 +160,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
                     onToggle={onToggleProfiling}
                 />
             </TestToolRow>
-            {!!filePath && getPlatform() !== CONST.PLATFORM.WEB && (
+            {!!filePath && showShareButton && (
                 <>
                     <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>
diff --git a/src/components/ProfilingToolMenu/index.android.tsx b/src/components/ProfilingToolMenu/index.android.tsx
index 7ca3cc24c9a1..33c7354f199e 100644
--- a/src/components/ProfilingToolMenu/index.android.tsx
+++ b/src/components/ProfilingToolMenu/index.android.tsx
@@ -8,6 +8,7 @@ function ProfilingToolMenu() {
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DownloadDirectoryPath}
             displayPath={`${CONST.DOWNLOADS_PATH}`}
+            showShareButton
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.ios.tsx b/src/components/ProfilingToolMenu/index.ios.tsx
index 45400b6a6959..03298eccf034 100644
--- a/src/components/ProfilingToolMenu/index.ios.tsx
+++ b/src/components/ProfilingToolMenu/index.ios.tsx
@@ -12,6 +12,7 @@ function ProfilingToolMenu() {
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DocumentDirectoryPath}
             displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getDownloadFolderPathSuffixForIOS(environment)}`}
+            showShareButton
         />
     );
 }

From 6f7f25971dbc878d310694b9219b68e51a05cfbe Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Mon, 22 Jul 2024 18:28:53 +0200
Subject: [PATCH 21/21] fix: re-generate package-lock.json

---
 package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-lock.json b/package-lock.json
index 0afcd9b7ed0c..5673bb1407c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27961,6 +27961,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },