From 8a27a7d5a142064d404c00a55e19f7d91ae87d4e Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 23 Apr 2024 17:12:25 +0530
Subject: [PATCH 01/15] Save logs data in downloads and show meaningful path

---
 .../BaseClientSideLoggingToolMenu.tsx         |  6 +++--
 .../index.android.tsx                         |  1 +
 .../ClientSideLoggingToolMenu/index.ios.tsx   |  1 +
 ...x.native.tsx => BaseProfilingToolMenu.tsx} | 26 ++++++++++++-------
 .../ProfilingToolMenu/index.android.tsx       | 16 ++++++++++++
 .../ProfilingToolMenu/index.ios.tsx           | 16 ++++++++++++
 6 files changed, 54 insertions(+), 12 deletions(-)
 rename src/components/ProfilingToolMenu/{index.native.tsx => BaseProfilingToolMenu.tsx} (87%)
 create mode 100644 src/components/ProfilingToolMenu/index.android.tsx
 create mode 100644 src/components/ProfilingToolMenu/index.ios.tsx

diff --git a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
index fcad770908a6..e69da3ba1200 100644
--- a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
+++ b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
@@ -30,9 +30,11 @@ type BaseClientSideLoggingToolProps = {
     onDisableLogging: (logs: Log[]) => void;
     /** Action to run when enabling logging */
     onEnableLogging?: () => void;
+    /** Path used to display location of saved file */
+    displayPath: string;
 } & BaseClientSideLoggingToolMenuOnyxProps;
 
-function BaseClientSideLoggingToolMenu({shouldStoreLogs, capturedLogs, file, onShareLogs, onDisableLogging, onEnableLogging}: BaseClientSideLoggingToolProps) {
+function BaseClientSideLoggingToolMenu({shouldStoreLogs, capturedLogs, file, onShareLogs, onDisableLogging, onEnableLogging, displayPath}: BaseClientSideLoggingToolProps) {
     const {translate} = useLocalize();
 
     const onToggle = () => {
@@ -70,7 +72,7 @@ function BaseClientSideLoggingToolMenu({shouldStoreLogs, capturedLogs, file, onS
             </TestToolRow>
             {!!file && (
                 <>
-                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${file.path}`}</Text>
+                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${file.newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.debugConsole.logs')}>
                         <Button
                             small
diff --git a/src/components/ClientSideLoggingToolMenu/index.android.tsx b/src/components/ClientSideLoggingToolMenu/index.android.tsx
index 0be6e96fcafe..b9b138aa861a 100644
--- a/src/components/ClientSideLoggingToolMenu/index.android.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.android.tsx
@@ -38,6 +38,7 @@ function ClientSideLoggingToolMenu() {
             onEnableLogging={() => setFile(undefined)}
             onDisableLogging={createAndSaveFile}
             onShareLogs={shareLogs}
+            displayPath="/Downloads"
         />
     );
 }
diff --git a/src/components/ClientSideLoggingToolMenu/index.ios.tsx b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
index cc596e54a973..6a34e329cc5b 100644
--- a/src/components/ClientSideLoggingToolMenu/index.ios.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
@@ -28,6 +28,7 @@ function ClientSideLoggingToolMenu() {
             onEnableLogging={() => setFile(undefined)}
             onDisableLogging={createFile}
             onShareLogs={shareLogs}
+            displayPath="/New Expensify"
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.native.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
similarity index 87%
rename from src/components/ProfilingToolMenu/index.native.tsx
rename to src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index a202a39032ba..c6dd151dab18 100644
--- a/src/components/ProfilingToolMenu/index.native.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -19,11 +19,16 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import pkg from '../../../package.json';
 
-type ProfilingToolMenuOnyxProps = {
+type BaseProfilingToolMenuOnyxProps = {
     isProfilingInProgress: OnyxEntry<boolean>;
 };
 
-type ProfilingToolMenuProps = ProfilingToolMenuOnyxProps;
+type BaseProfilingToolMenuProps = {
+    /** Path used to save the file */
+    pathToBeUsed: string;
+    /** Path used to display location of saved file */
+    displayPath: string;
+} & BaseProfilingToolMenuOnyxProps;
 
 function formatBytes(bytes: number, decimals = 2) {
     if (!+bytes) {
@@ -39,7 +44,7 @@ function formatBytes(bytes: number, decimals = 2) {
     return `${parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`;
 }
 
-function ProfilingToolMenu({isProfilingInProgress = false}: ProfilingToolMenuProps) {
+function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
     const styles = useThemeStyles();
     const [pathIOS, setPathIOS] = useState('');
     const [sharePath, setSharePath] = useState('');
@@ -83,6 +88,8 @@ function ProfilingToolMenu({isProfilingInProgress = false}: ProfilingToolMenuPro
         [totalMemory, usedMemory],
     );
 
+    const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
+
     useEffect(() => {
         if (!pathIOS) {
             return;
@@ -90,8 +97,7 @@ function ProfilingToolMenu({isProfilingInProgress = false}: ProfilingToolMenuPro
 
         // eslint-disable-next-line @lwc/lwc/no-async-await
         const rename = async () => {
-            const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
-            const newFilePath = `${RNFS.DocumentDirectoryPath}/${newFileName}`;
+            const newFilePath = `${pathToBeUsed}/${newFileName}`;
 
             try {
                 const fileExists = await RNFS.exists(newFilePath);
@@ -117,7 +123,7 @@ function ProfilingToolMenu({isProfilingInProgress = false}: ProfilingToolMenuPro
         };
 
         rename();
-    }, [pathIOS]);
+    }, [pathIOS, newFileName, pathToBeUsed]);
 
     const onDownloadProfiling = useCallback(() => {
         // eslint-disable-next-line @lwc/lwc/no-async-await
@@ -153,7 +159,7 @@ function ProfilingToolMenu({isProfilingInProgress = false}: ProfilingToolMenuPro
             </TestToolRow>
             {!!pathIOS && (
                 <>
-                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${pathIOS}`}</Text>
+                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>
                         <Button
                             small
@@ -167,10 +173,10 @@ function ProfilingToolMenu({isProfilingInProgress = false}: ProfilingToolMenuPro
     );
 }
 
-ProfilingToolMenu.displayName = 'ProfilingToolMenu';
+BaseProfilingToolMenu.displayName = 'BaseProfilingToolMenu';
 
-export default withOnyx<ProfilingToolMenuProps, ProfilingToolMenuOnyxProps>({
+export default withOnyx<BaseProfilingToolMenuProps, BaseProfilingToolMenuOnyxProps>({
     isProfilingInProgress: {
         key: ONYXKEYS.APP_PROFILING_IN_PROGRESS,
     },
-})(ProfilingToolMenu);
+})(BaseProfilingToolMenu);
diff --git a/src/components/ProfilingToolMenu/index.android.tsx b/src/components/ProfilingToolMenu/index.android.tsx
new file mode 100644
index 000000000000..714056644127
--- /dev/null
+++ b/src/components/ProfilingToolMenu/index.android.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import RNFS from 'react-native-fs';
+import BaseProfilingToolMenu from './BaseProfilingToolMenu';
+
+function ProfilingToolMenu() {
+    return (
+        <BaseProfilingToolMenu
+            pathToBeUsed={RNFS.DownloadDirectoryPath}
+            displayPath="/Downloads"
+        />
+    );
+}
+
+ProfilingToolMenu.displayName = 'ProfilingToolMenu';
+
+export default ProfilingToolMenu;
diff --git a/src/components/ProfilingToolMenu/index.ios.tsx b/src/components/ProfilingToolMenu/index.ios.tsx
new file mode 100644
index 000000000000..959059afccdb
--- /dev/null
+++ b/src/components/ProfilingToolMenu/index.ios.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import RNFS from 'react-native-fs';
+import BaseProfilingToolMenu from './BaseProfilingToolMenu';
+
+function ProfilingToolMenu() {
+    return (
+        <BaseProfilingToolMenu
+            pathToBeUsed={RNFS.DocumentDirectoryPath}
+            displayPath="/New Expensify"
+        />
+    );
+}
+
+ProfilingToolMenu.displayName = 'ProfilingToolMenu';
+
+export default ProfilingToolMenu;

From 82788e4a30deac585a6a5aa10f7429e052dfbcdf Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 23 Apr 2024 17:28:34 +0530
Subject: [PATCH 02/15] Type fixes

---
 .../ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
index e69da3ba1200..471a1d60fd66 100644
--- a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
+++ b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
@@ -31,7 +31,7 @@ type BaseClientSideLoggingToolProps = {
     /** Action to run when enabling logging */
     onEnableLogging?: () => void;
     /** Path used to display location of saved file */
-    displayPath: string;
+    displayPath?: string;
 } & BaseClientSideLoggingToolMenuOnyxProps;
 
 function BaseClientSideLoggingToolMenu({shouldStoreLogs, capturedLogs, file, onShareLogs, onDisableLogging, onEnableLogging, displayPath}: BaseClientSideLoggingToolProps) {

From d1bdd49f363e89ad08ef1cfa286a3fa3752b8263 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Mon, 29 Apr 2024 01:39:49 +0530
Subject: [PATCH 03/15] Update

---
 src/CONST.ts                                                | 3 +++
 .../BaseClientSideLoggingToolMenu.tsx                       | 2 +-
 src/components/ClientSideLoggingToolMenu/index.android.tsx  | 3 ++-
 src/components/ClientSideLoggingToolMenu/index.ios.tsx      | 3 ++-
 src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx  | 6 +++---
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 66b51184852f..5843ced693c0 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4713,6 +4713,9 @@ const CONST = {
 
     MAX_TAX_RATE_INTEGER_PLACES: 4,
     MAX_TAX_RATE_DECIMAL_PLACES: 4,
+
+    DOWNLOADS_PATH: '/Downloads',
+    NEW_EXPENSIFY_PATH: '/New Expensify',
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;
diff --git a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
index 471a1d60fd66..7c4c669e2154 100644
--- a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
+++ b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
@@ -72,7 +72,7 @@ function BaseClientSideLoggingToolMenu({shouldStoreLogs, capturedLogs, file, onS
             </TestToolRow>
             {!!file && (
                 <>
-                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${file.newFileName}`}</Text>
+                    <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.debugConsole.logs')}>
                         <Button
                             small
diff --git a/src/components/ClientSideLoggingToolMenu/index.android.tsx b/src/components/ClientSideLoggingToolMenu/index.android.tsx
index b9b138aa861a..14e7df99fcd2 100644
--- a/src/components/ClientSideLoggingToolMenu/index.android.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.android.tsx
@@ -3,6 +3,7 @@ import RNFetchBlob from 'react-native-blob-util';
 import Share from 'react-native-share';
 import type {Log} from '@libs/Console';
 import localFileCreate from '@libs/localFileCreate';
+import CONST from "@src/CONST";
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {
@@ -38,7 +39,7 @@ function ClientSideLoggingToolMenu() {
             onEnableLogging={() => setFile(undefined)}
             onDisableLogging={createAndSaveFile}
             onShareLogs={shareLogs}
-            displayPath="/Downloads"
+            displayPath={`${CONST.DOWNLOADS_PATH}/${file?.newFileName ?? ''}`}
         />
     );
 }
diff --git a/src/components/ClientSideLoggingToolMenu/index.ios.tsx b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
index 6a34e329cc5b..15269e835795 100644
--- a/src/components/ClientSideLoggingToolMenu/index.ios.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
@@ -2,6 +2,7 @@ import React, {useState} from 'react';
 import Share from 'react-native-share';
 import type {Log} from '@libs/Console';
 import localFileCreate from '@libs/localFileCreate';
+import CONST from "@src/CONST";
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {
@@ -28,7 +29,7 @@ function ClientSideLoggingToolMenu() {
             onEnableLogging={() => setFile(undefined)}
             onDisableLogging={createFile}
             onShareLogs={shareLogs}
-            displayPath="/New Expensify"
+            displayPath={`${CONST.NEW_EXPENSIFY_PATH}/${file?.newFileName ?? ''}`}
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index c6dd151dab18..ff34db881a35 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -44,6 +44,8 @@ function formatBytes(bytes: number, decimals = 2) {
     return `${parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`;
 }
 
+const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
+
 function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
     const styles = useThemeStyles();
     const [pathIOS, setPathIOS] = useState('');
@@ -88,8 +90,6 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
         [totalMemory, usedMemory],
     );
 
-    const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
-
     useEffect(() => {
         if (!pathIOS) {
             return;
@@ -123,7 +123,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
         };
 
         rename();
-    }, [pathIOS, newFileName, pathToBeUsed]);
+    }, [pathIOS, pathToBeUsed]);
 
     const onDownloadProfiling = useCallback(() => {
         // eslint-disable-next-line @lwc/lwc/no-async-await

From 86b983657b5cf403a83dab83c01ae2dcae9c98b5 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Mon, 29 Apr 2024 02:12:58 +0530
Subject: [PATCH 04/15] Update

---
 src/components/ClientSideLoggingToolMenu/index.android.tsx | 2 +-
 src/components/ClientSideLoggingToolMenu/index.ios.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ClientSideLoggingToolMenu/index.android.tsx b/src/components/ClientSideLoggingToolMenu/index.android.tsx
index 14e7df99fcd2..aa1bc215b719 100644
--- a/src/components/ClientSideLoggingToolMenu/index.android.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.android.tsx
@@ -3,7 +3,7 @@ import RNFetchBlob from 'react-native-blob-util';
 import Share from 'react-native-share';
 import type {Log} from '@libs/Console';
 import localFileCreate from '@libs/localFileCreate';
-import CONST from "@src/CONST";
+import CONST from '@src/CONST';
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {
diff --git a/src/components/ClientSideLoggingToolMenu/index.ios.tsx b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
index 15269e835795..a4467616f9ff 100644
--- a/src/components/ClientSideLoggingToolMenu/index.ios.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
@@ -2,7 +2,7 @@ import React, {useState} from 'react';
 import Share from 'react-native-share';
 import type {Log} from '@libs/Console';
 import localFileCreate from '@libs/localFileCreate';
-import CONST from "@src/CONST";
+import CONST from '@src/CONST';
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {

From c7c14f4a7b0e220fa6179e165751e688ff8d8bc7 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:05:02 +0530
Subject: [PATCH 05/15] Update

---
 src/components/ClientSideLoggingToolMenu/index.ios.tsx | 5 ++++-
 src/components/ProfilingToolMenu/index.android.tsx     | 3 ++-
 src/components/ProfilingToolMenu/index.ios.tsx         | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/ClientSideLoggingToolMenu/index.ios.tsx b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
index a4467616f9ff..ef0590edabbb 100644
--- a/src/components/ClientSideLoggingToolMenu/index.ios.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
@@ -1,12 +1,15 @@
 import React, {useState} from 'react';
 import Share from 'react-native-share';
+import useEnvironment from '@hooks/useEnvironment';
 import type {Log} from '@libs/Console';
+import getFolderPathSuffix from '@libs/getFolderPathSuffix';
 import localFileCreate from '@libs/localFileCreate';
 import CONST from '@src/CONST';
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {
     const [file, setFile] = useState<{path: string; newFileName: string; size: number}>();
+    const {environment} = useEnvironment();
 
     const createFile = (logs: Log[]) => {
         localFileCreate('logs', JSON.stringify(logs, null, 2)).then((localFile) => {
@@ -29,7 +32,7 @@ function ClientSideLoggingToolMenu() {
             onEnableLogging={() => setFile(undefined)}
             onDisableLogging={createFile}
             onShareLogs={shareLogs}
-            displayPath={`${CONST.NEW_EXPENSIFY_PATH}/${file?.newFileName ?? ''}`}
+            displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getFolderPathSuffix(environment)}/${file?.newFileName ?? ''}`}
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.android.tsx b/src/components/ProfilingToolMenu/index.android.tsx
index 714056644127..7ca3cc24c9a1 100644
--- a/src/components/ProfilingToolMenu/index.android.tsx
+++ b/src/components/ProfilingToolMenu/index.android.tsx
@@ -1,12 +1,13 @@
 import React from 'react';
 import RNFS from 'react-native-fs';
+import CONST from '@src/CONST';
 import BaseProfilingToolMenu from './BaseProfilingToolMenu';
 
 function ProfilingToolMenu() {
     return (
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DownloadDirectoryPath}
-            displayPath="/Downloads"
+            displayPath={`${CONST.DOWNLOADS_PATH}`}
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.ios.tsx b/src/components/ProfilingToolMenu/index.ios.tsx
index 959059afccdb..c257267a0dcd 100644
--- a/src/components/ProfilingToolMenu/index.ios.tsx
+++ b/src/components/ProfilingToolMenu/index.ios.tsx
@@ -1,12 +1,17 @@
 import React from 'react';
 import RNFS from 'react-native-fs';
+import useEnvironment from '@hooks/useEnvironment';
+import getFolderPathSuffix from '@libs/getFolderPathSuffix';
+import CONST from '@src/CONST';
 import BaseProfilingToolMenu from './BaseProfilingToolMenu';
 
 function ProfilingToolMenu() {
+    const {environment} = useEnvironment();
+
     return (
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DocumentDirectoryPath}
-            displayPath="/New Expensify"
+            displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getFolderPathSuffix(environment)}`}
         />
     );
 }

From dac895c0ff04139b5732e3881c3c0344d1bf1447 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:26:23 +0530
Subject: [PATCH 06/15] Update

---
 src/libs/getFolderPathSuffix.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/libs/getFolderPathSuffix.ts

diff --git a/src/libs/getFolderPathSuffix.ts b/src/libs/getFolderPathSuffix.ts
new file mode 100644
index 000000000000..1e0b8ddfd09b
--- /dev/null
+++ b/src/libs/getFolderPathSuffix.ts
@@ -0,0 +1,24 @@
+import CONST from '@src/CONST';
+
+function getFolderPathSuffix(environment) {
+    let folderSuffix = '';
+
+    switch (environment) {
+        case CONST.ENVIRONMENT.PRODUCTION:
+            folderSuffix = '';
+            break;
+        case CONST.ENVIRONMENT.ADHOC:
+            folderSuffix = ' Adhoc';
+            break;
+        case CONST.ENVIRONMENT.DEV:
+            folderSuffix = ' Dev';
+            break;
+        default:
+            folderSuffix = '';
+            break;
+    }
+
+    return folderSuffix;
+}
+
+export default getFolderPathSuffix;

From 3c6c01d384bdbe14b78fbef6864498fbc7c9a076 Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:28:38 +0530
Subject: [PATCH 07/15] Change Adhoc to AdHoc

---
 src/libs/getFolderPathSuffix.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/getFolderPathSuffix.ts b/src/libs/getFolderPathSuffix.ts
index 1e0b8ddfd09b..4a95d73c29a8 100644
--- a/src/libs/getFolderPathSuffix.ts
+++ b/src/libs/getFolderPathSuffix.ts
@@ -8,7 +8,7 @@ function getFolderPathSuffix(environment) {
             folderSuffix = '';
             break;
         case CONST.ENVIRONMENT.ADHOC:
-            folderSuffix = ' Adhoc';
+            folderSuffix = ' AdHoc';
             break;
         case CONST.ENVIRONMENT.DEV:
             folderSuffix = ' Dev';

From b5e54f917eafd6322521eace7a44ccead441984f Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:34:32 +0530
Subject: [PATCH 08/15] Update

---
 src/libs/getFolderPathSuffix.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/getFolderPathSuffix.ts b/src/libs/getFolderPathSuffix.ts
index 1e0b8ddfd09b..11183da15ab7 100644
--- a/src/libs/getFolderPathSuffix.ts
+++ b/src/libs/getFolderPathSuffix.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 
-function getFolderPathSuffix(environment) {
+function getFolderPathSuffix(environment: string) {
     let folderSuffix = '';
 
     switch (environment) {

From 1a6ac07e74ddbc22f1b9fa3e7face5f59c150ac2 Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:35:27 +0530
Subject: [PATCH 09/15] Fix typecheck

---
 src/libs/getFolderPathSuffix.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/getFolderPathSuffix.ts b/src/libs/getFolderPathSuffix.ts
index 4a95d73c29a8..d73320a7e288 100644
--- a/src/libs/getFolderPathSuffix.ts
+++ b/src/libs/getFolderPathSuffix.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 
-function getFolderPathSuffix(environment) {
+function getFolderPathSuffix(environment: string) {
     let folderSuffix = '';
 
     switch (environment) {

From f3b9bf47f7b5aef5487181f274466fcf79be1f3a Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 2 May 2024 15:41:46 +0530
Subject: [PATCH 10/15] Update src/libs/getFolderPathSuffix.ts

Co-authored-by: Ishpaul Singh <104348397+ishpaul777@users.noreply.github.com>
---
 src/libs/getFolderPathSuffix.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/getFolderPathSuffix.ts b/src/libs/getFolderPathSuffix.ts
index d73320a7e288..b606fbb2ec3d 100644
--- a/src/libs/getFolderPathSuffix.ts
+++ b/src/libs/getFolderPathSuffix.ts
@@ -1,6 +1,6 @@
 import CONST from '@src/CONST';
 
-function getFolderPathSuffix(environment: string) {
+function getDownloadFolderPathSuffixForIOS(environment: string) {
     let folderSuffix = '';
 
     switch (environment) {

From 14fddd0fa25623fd38653ac8710d18df55299b87 Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 2 May 2024 19:27:42 +0530
Subject: [PATCH 11/15] Rename getFolderPathSuffix.ts to
 getDownloadFolderPathSuffixForIOS.ts

---
 ...etFolderPathSuffix.ts => getDownloadFolderPathSuffixForIOS.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/libs/{getFolderPathSuffix.ts => getDownloadFolderPathSuffixForIOS.ts} (100%)

diff --git a/src/libs/getFolderPathSuffix.ts b/src/libs/getDownloadFolderPathSuffixForIOS.ts
similarity index 100%
rename from src/libs/getFolderPathSuffix.ts
rename to src/libs/getDownloadFolderPathSuffixForIOS.ts

From 27d45bbd53a2d17124ef76245fa8bc13253eb458 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 2 May 2024 19:31:34 +0530
Subject: [PATCH 12/15] Update

---
 package-lock.json                                      | 2 +-
 src/components/ClientSideLoggingToolMenu/index.ios.tsx | 4 ++--
 src/components/ProfilingToolMenu/index.ios.tsx         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5962d3b29504..e57869f5c63b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,7 @@
         "react-native-linear-gradient": "^2.8.1",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "^2.0.35",
+        "react-native-onyx": "2.0.35",
         "react-native-pager-view": "6.2.3",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.0",
diff --git a/src/components/ClientSideLoggingToolMenu/index.ios.tsx b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
index ef0590edabbb..78ffccf612a2 100644
--- a/src/components/ClientSideLoggingToolMenu/index.ios.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.ios.tsx
@@ -2,7 +2,7 @@ import React, {useState} from 'react';
 import Share from 'react-native-share';
 import useEnvironment from '@hooks/useEnvironment';
 import type {Log} from '@libs/Console';
-import getFolderPathSuffix from '@libs/getFolderPathSuffix';
+import getDownloadFolderPathSuffixForIOS from '@libs/getDownloadFolderPathSuffixForIOS';
 import localFileCreate from '@libs/localFileCreate';
 import CONST from '@src/CONST';
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
@@ -32,7 +32,7 @@ function ClientSideLoggingToolMenu() {
             onEnableLogging={() => setFile(undefined)}
             onDisableLogging={createFile}
             onShareLogs={shareLogs}
-            displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getFolderPathSuffix(environment)}/${file?.newFileName ?? ''}`}
+            displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getDownloadFolderPathSuffixForIOS(environment)}/${file?.newFileName ?? ''}`}
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.ios.tsx b/src/components/ProfilingToolMenu/index.ios.tsx
index c257267a0dcd..45400b6a6959 100644
--- a/src/components/ProfilingToolMenu/index.ios.tsx
+++ b/src/components/ProfilingToolMenu/index.ios.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import RNFS from 'react-native-fs';
 import useEnvironment from '@hooks/useEnvironment';
-import getFolderPathSuffix from '@libs/getFolderPathSuffix';
+import getDownloadFolderPathSuffixForIOS from '@libs/getDownloadFolderPathSuffixForIOS';
 import CONST from '@src/CONST';
 import BaseProfilingToolMenu from './BaseProfilingToolMenu';
 
@@ -11,7 +11,7 @@ function ProfilingToolMenu() {
     return (
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DocumentDirectoryPath}
-            displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getFolderPathSuffix(environment)}`}
+            displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getDownloadFolderPathSuffixForIOS(environment)}`}
         />
     );
 }

From ace5f4efcfdc9beabfc62e9a985c7faa629432b0 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 2 May 2024 19:47:03 +0530
Subject: [PATCH 13/15] Update

---
 src/CONST.ts                                  | 2 ++
 src/libs/getDownloadFolderPathSuffixForIOS.ts | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index ef4f55aca8be..66a19909d423 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1302,6 +1302,8 @@ const CONST = {
         STAGING: 'staging',
         PRODUCTION: 'production',
         ADHOC: 'adhoc',
+        DEV_SUFFIX: ' Dev',
+        ADHOC_SUFFIX: ' AdHoc',
     },
 
     // Used to delay the initial fetching of reportActions when the app first inits or reconnects (e.g. returning
diff --git a/src/libs/getDownloadFolderPathSuffixForIOS.ts b/src/libs/getDownloadFolderPathSuffixForIOS.ts
index aee6bca249b0..b3ceee078513 100644
--- a/src/libs/getDownloadFolderPathSuffixForIOS.ts
+++ b/src/libs/getDownloadFolderPathSuffixForIOS.ts
@@ -8,10 +8,10 @@ function getDownloadFolderPathSuffixForIOS(environment: string) {
             folderSuffix = '';
             break;
         case CONST.ENVIRONMENT.ADHOC:
-            folderSuffix = ' AdHoc';
+            folderSuffix = CONST.ENVIRONMENT.ADHOC_SUFFIX;
             break;
         case CONST.ENVIRONMENT.DEV:
-            folderSuffix = ' Dev';
+            folderSuffix = CONST.ENVIRONMENT.DEV_SUFFIX;
             break;
         default:
             folderSuffix = '';

From a04a574f3ff4450fa795e36c80c906c05af2d6e5 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 2 May 2024 19:53:13 +0530
Subject: [PATCH 14/15] Update constants

---
 src/CONST.ts                                  | 7 +++++--
 src/libs/getDownloadFolderPathSuffixForIOS.ts | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 66a19909d423..53327af7be44 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1302,8 +1302,6 @@ const CONST = {
         STAGING: 'staging',
         PRODUCTION: 'production',
         ADHOC: 'adhoc',
-        DEV_SUFFIX: ' Dev',
-        ADHOC_SUFFIX: ' AdHoc',
     },
 
     // Used to delay the initial fetching of reportActions when the app first inits or reconnects (e.g. returning
@@ -4700,6 +4698,11 @@ const CONST = {
     DOWNLOADS_PATH: '/Downloads',
     NEW_EXPENSIFY_PATH: '/New Expensify',
 
+    ENVIRONMENT_SUFFIX: {
+        DEV: ' Dev',
+        ADHOC: ' AdHoc',
+    },
+
     SEARCH_TRANSACTION_TYPE: {
         CASH: 'cash',
         CARD: 'card',
diff --git a/src/libs/getDownloadFolderPathSuffixForIOS.ts b/src/libs/getDownloadFolderPathSuffixForIOS.ts
index b3ceee078513..3355357bca90 100644
--- a/src/libs/getDownloadFolderPathSuffixForIOS.ts
+++ b/src/libs/getDownloadFolderPathSuffixForIOS.ts
@@ -8,10 +8,10 @@ function getDownloadFolderPathSuffixForIOS(environment: string) {
             folderSuffix = '';
             break;
         case CONST.ENVIRONMENT.ADHOC:
-            folderSuffix = CONST.ENVIRONMENT.ADHOC_SUFFIX;
+            folderSuffix = CONST.ENVIRONMENT_SUFFIX.ADHOC;
             break;
         case CONST.ENVIRONMENT.DEV:
-            folderSuffix = CONST.ENVIRONMENT.DEV_SUFFIX;
+            folderSuffix = CONST.ENVIRONMENT_SUFFIX.DEV;
             break;
         default:
             folderSuffix = '';

From 2cbb037dc18c1d2e275d5ddf4fc10824031b6435 Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Fri, 3 May 2024 14:15:24 +0530
Subject: [PATCH 15/15] Update package-lock.json

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

diff --git a/package-lock.json b/package-lock.json
index e57869f5c63b..5962d3b29504 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,7 @@
         "react-native-linear-gradient": "^2.8.1",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "2.0.35",
+        "react-native-onyx": "^2.0.35",
         "react-native-pager-view": "6.2.3",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.0",