From 6979c15a50ccafa3658102ddd361e26511b96fed Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:18:37 +0100
Subject: [PATCH 1/6] Fix - App freezes when clicking checkbox in subtag list

---
 src/components/SelectionListWithModal/index.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/SelectionListWithModal/index.tsx b/src/components/SelectionListWithModal/index.tsx
index ca34e579a431..a0e30a5ff10f 100644
--- a/src/components/SelectionListWithModal/index.tsx
+++ b/src/components/SelectionListWithModal/index.tsx
@@ -23,13 +23,14 @@ function SelectionListWithModal<TItem extends ListItem>(
     const [isModalVisible, setIsModalVisible] = useState(false);
     const [longPressedItem, setLongPressedItem] = useState<TItem | null>(null);
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout https://github.com/Expensify/App/issues/48675
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const {selectionMode} = useMobileSelectionMode(true);
 
     useEffect(() => {
         // We can access 0 index safely as we are not displaying multiple sections in table view
         const selectedItems = sections[0].data.filter((item) => item.isSelected);
-        if (!shouldUseNarrowLayout) {
+        if (!isSmallScreenWidth) {
             if (selectedItems.length === 0) {
                 turnOffMobileSelectionMode();
             }
@@ -38,11 +39,11 @@ function SelectionListWithModal<TItem extends ListItem>(
         if (selectedItems.length > 0 && !selectionMode?.isEnabled) {
             turnOnMobileSelectionMode();
         }
-    }, [sections, selectionMode, shouldUseNarrowLayout]);
+    }, [sections, selectionMode, isSmallScreenWidth]);
 
     const handleLongPressRow = (item: TItem) => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        if (!turnOnSelectionModeOnLongPress || !shouldUseNarrowLayout || item?.isDisabled || item?.isDisabledCheckbox) {
+        if (!turnOnSelectionModeOnLongPress || !isSmallScreenWidth || item?.isDisabled || item?.isDisabledCheckbox) {
             return;
         }
         setLongPressedItem(item);

From 60f9fcc978c6af2726c19ba84bd74b3fa0fc1e29 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 6 Sep 2024 17:28:10 +0100
Subject: [PATCH 2/6] Fix - Report fields - No checkbox next to list value on
 web layout

---
 .../reportFields/ReportFieldsListValuesPage.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
index bf5599b6283f..f267f5cc7380 100644
--- a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -59,7 +59,8 @@ function ReportFieldsListValuesPage({
 }: ReportFieldsListValuesPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout https://github.com/Expensify/App/issues/48724
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
     const {selectionMode} = useMobileSelectionMode();
 
@@ -67,7 +68,7 @@ function ReportFieldsListValuesPage({
     const [deleteValuesConfirmModalVisible, setDeleteValuesConfirmModalVisible] = useState(false);
     const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
 
-    const canSelectMultiple = !hasAccountingConnections && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true);
+    const canSelectMultiple = !hasAccountingConnections && (isSmallScreenWidth ? selectionMode?.isEnabled : true);
 
     const [listValues, disabledListValues] = useMemo(() => {
         let reportFieldValues: string[];
@@ -177,7 +178,7 @@ function ReportFieldsListValuesPage({
 
     const getHeaderButtons = () => {
         const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>>> = [];
-        if (shouldUseNarrowLayout ? selectionMode?.isEnabled : selectedValuesArray.length > 0) {
+        if (isSmallScreenWidth ? selectionMode?.isEnabled : selectedValuesArray.length > 0) {
             if (selectedValuesArray.length > 0) {
                 options.push({
                     icon: Expensicons.Trashcan,
@@ -259,7 +260,7 @@ function ReportFieldsListValuesPage({
                     customText={translate('workspace.common.selected', {selectedNumber: selectedValuesArray.length})}
                     options={options}
                     isSplitButton={false}
-                    style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                    style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
                     isDisabled={!selectedValuesArray.length}
                 />
             );
@@ -267,7 +268,7 @@ function ReportFieldsListValuesPage({
 
         return (
             <Button
-                style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
                 medium
                 success
                 icon={Expensicons.Plus}
@@ -277,7 +278,7 @@ function ReportFieldsListValuesPage({
         );
     };
 
-    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
+    const selectionModeHeader = selectionMode?.isEnabled && isSmallScreenWidth;
 
     return (
         <AccessOrNotFoundWrapper
@@ -302,9 +303,9 @@ function ReportFieldsListValuesPage({
                         Navigation.goBack();
                     }}
                 >
-                    {!shouldUseNarrowLayout && !hasAccountingConnections && getHeaderButtons()}
+                    {!isSmallScreenWidth && !hasAccountingConnections && getHeaderButtons()}
                 </HeaderWithBackButton>
-                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{!hasAccountingConnections && getHeaderButtons()}</View>}
+                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{!hasAccountingConnections && getHeaderButtons()}</View>}
                 <View style={[styles.ph5, styles.pv4]}>
                     <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{translate('workspace.reportFields.listInputSubtitle')}</Text>
                 </View>

From 71489bb6b6db582de152d236989c888b6e68f1db Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 6 Sep 2024 18:53:51 +0100
Subject: [PATCH 3/6] Clarify comments

---
 src/components/SelectionListWithModal/index.tsx                 | 1 +
 src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/SelectionListWithModal/index.tsx b/src/components/SelectionListWithModal/index.tsx
index a0e30a5ff10f..5d3fcce6f4e1 100644
--- a/src/components/SelectionListWithModal/index.tsx
+++ b/src/components/SelectionListWithModal/index.tsx
@@ -24,6 +24,7 @@ function SelectionListWithModal<TItem extends ListItem>(
     const [longPressedItem, setLongPressedItem] = useState<TItem | null>(null);
     const {translate} = useLocalize();
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout https://github.com/Expensify/App/issues/48675
+    // Because there is a race condition somewhere in the app that causes shouldUseNarrowLayout to change indefinitely in this component
     const {isSmallScreenWidth} = useResponsiveLayout();
     const {selectionMode} = useMobileSelectionMode(true);
 
diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
index f267f5cc7380..3fb2dc1df9a7 100644
--- a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -59,7 +59,7 @@ function ReportFieldsListValuesPage({
 }: ReportFieldsListValuesPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout https://github.com/Expensify/App/issues/48724
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use selection mode on small screens only https://github.com/Expensify/App/issues/48724
     const {isSmallScreenWidth} = useResponsiveLayout();
     const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
     const {selectionMode} = useMobileSelectionMode();

From 6bd40e0284b59a95e96b3e017864281353f7082a Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:29:09 +0100
Subject: [PATCH 4/6] Clarify comments

---
 src/components/SelectionListWithModal/index.tsx               | 4 ++--
 .../workspace/reportFields/ReportFieldsListValuesPage.tsx     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/SelectionListWithModal/index.tsx b/src/components/SelectionListWithModal/index.tsx
index 5d3fcce6f4e1..2d218bc815fe 100644
--- a/src/components/SelectionListWithModal/index.tsx
+++ b/src/components/SelectionListWithModal/index.tsx
@@ -23,8 +23,8 @@ function SelectionListWithModal<TItem extends ListItem>(
     const [isModalVisible, setIsModalVisible] = useState(false);
     const [longPressedItem, setLongPressedItem] = useState<TItem | null>(null);
     const {translate} = useLocalize();
-    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout https://github.com/Expensify/App/issues/48675
-    // Because there is a race condition somewhere in the app that causes shouldUseNarrowLayout to change indefinitely in this component
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout here because there is a race condition that causes shouldUseNarrowLayout to change indefinitely in this component
+    // See https://github.com/Expensify/App/issues/48675 for more details
     const {isSmallScreenWidth} = useResponsiveLayout();
     const {selectionMode} = useMobileSelectionMode(true);
 
diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
index 3fb2dc1df9a7..8cbb9cd177e3 100644
--- a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -59,7 +59,8 @@ function ReportFieldsListValuesPage({
 }: ReportFieldsListValuesPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use selection mode on small screens only https://github.com/Expensify/App/issues/48724
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout here to use the mobile selection mode on small screens only
+    // See https://github.com/Expensify/App/issues/48724 for more details
     const {isSmallScreenWidth} = useResponsiveLayout();
     const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
     const {selectionMode} = useMobileSelectionMode();

From cce4b4def81ef1597b9f897603334a47a5091e01 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:20:22 +0100
Subject: [PATCH 5/6] Rename web and desktop sourcemaps artifacts before upload
 in order to have unique ReleaseAsset.name

---
 .github/workflows/deploy.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6c03ab14d830..e5d1826c2bbd 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -490,16 +490,21 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
+      - name: Rename web and desktop sourcemaps artifacts before upload in order to have unique ReleaseAsset.name
+        run: |
+          mv ./desktop-sourcemaps/merged-source-map.js.map ./desktop-sourcemaps/desktop-merged-source-map.js.map
+          mv ./web-sourcemaps/merged-source-map.js.map ./web-sourcemaps/web-merged-source-map.js.map
+
       - name: Upload artifacts to GitHub Release
         run: |
           gh release upload ${{ env.STAGING_VERSION }} \
             ./android-sourcemaps/index.android.bundle.map#android-sourcemap-${{ env.STAGING_VERSION }} \
             ./android-build/app-production-release.aab \
-            ./desktop-sourcemaps/merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
+            ./desktop-sourcemaps/desktop-merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
             ./desktop-build/NewExpensify.dmg \
             ./ios-sourcemaps/main.jsbundle.map#ios-sourcemap-${{ env.STAGING_VERSION }} \
             ./ios-build/New\ Expensify.ipa \
-            ./web-sourcemaps/merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
+            ./web-sourcemaps/web-merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
             ./web-build-tar-gz/webBuild.tar.gz \
             ./web-build-zip/webBuild.zip
         env:
@@ -528,18 +533,26 @@ jobs:
     if: ${{ github.ref == 'refs/heads/production' && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
     needs: [checkDeploymentSuccess]
     steps:
-      - uses: actions/checkout@v4
-        name: Checkout
+      - name: Checkout production branch
+        uses: actions/checkout@v4
 
       - name: Get current app version
         run: echo "PRODUCTION_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
 
+      - name: Download all workflow run artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Rename web and desktop sourcemaps artifacts before upload in order to have unique ReleaseAsset.name
+        run: |
+          mv ./desktop-sourcemaps/merged-source-map.js.map ./desktop-sourcemaps/desktop-merged-source-map.js.map
+          mv ./web-sourcemaps/merged-source-map.js.map ./web-sourcemaps/web-merged-source-map.js.map
+
       - name: Upload artifacts to GitHub Release
         run: |
           gh release upload ${{ env.STAGING_VERSION }} \
-            ./desktop-sourcemaps/merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
+            ./desktop-sourcemaps/desktop-merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
             ./desktop-build/NewExpensify.dmg \
-            ./web-sourcemaps/merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
+            ./web-sourcemaps/web-merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
             ./web-build-tar-gz/webBuild.tar.gz \
             ./web-build-zip/webBuild.zip
         env:

From 26b28ec31d7fce7a3fc6b7863f2c36bfab4f98ba Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:21:22 +0100
Subject: [PATCH 6/6] Revert "Rename web and desktop sourcemaps artifacts
 before upload in order to have unique ReleaseAsset.name"

This reverts commit cce4b4def81ef1597b9f897603334a47a5091e01.
---
 .github/workflows/deploy.yml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e5d1826c2bbd..6c03ab14d830 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -490,21 +490,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Rename web and desktop sourcemaps artifacts before upload in order to have unique ReleaseAsset.name
-        run: |
-          mv ./desktop-sourcemaps/merged-source-map.js.map ./desktop-sourcemaps/desktop-merged-source-map.js.map
-          mv ./web-sourcemaps/merged-source-map.js.map ./web-sourcemaps/web-merged-source-map.js.map
-
       - name: Upload artifacts to GitHub Release
         run: |
           gh release upload ${{ env.STAGING_VERSION }} \
             ./android-sourcemaps/index.android.bundle.map#android-sourcemap-${{ env.STAGING_VERSION }} \
             ./android-build/app-production-release.aab \
-            ./desktop-sourcemaps/desktop-merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
+            ./desktop-sourcemaps/merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
             ./desktop-build/NewExpensify.dmg \
             ./ios-sourcemaps/main.jsbundle.map#ios-sourcemap-${{ env.STAGING_VERSION }} \
             ./ios-build/New\ Expensify.ipa \
-            ./web-sourcemaps/web-merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
+            ./web-sourcemaps/merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
             ./web-build-tar-gz/webBuild.tar.gz \
             ./web-build-zip/webBuild.zip
         env:
@@ -533,26 +528,18 @@ jobs:
     if: ${{ github.ref == 'refs/heads/production' && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
     needs: [checkDeploymentSuccess]
     steps:
-      - name: Checkout production branch
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+        name: Checkout
 
       - name: Get current app version
         run: echo "PRODUCTION_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
 
-      - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Rename web and desktop sourcemaps artifacts before upload in order to have unique ReleaseAsset.name
-        run: |
-          mv ./desktop-sourcemaps/merged-source-map.js.map ./desktop-sourcemaps/desktop-merged-source-map.js.map
-          mv ./web-sourcemaps/merged-source-map.js.map ./web-sourcemaps/web-merged-source-map.js.map
-
       - name: Upload artifacts to GitHub Release
         run: |
           gh release upload ${{ env.STAGING_VERSION }} \
-            ./desktop-sourcemaps/desktop-merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
+            ./desktop-sourcemaps/merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
             ./desktop-build/NewExpensify.dmg \
-            ./web-sourcemaps/web-merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
+            ./web-sourcemaps/merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
             ./web-build-tar-gz/webBuild.tar.gz \
             ./web-build-zip/webBuild.zip
         env: