From 762967202d819e547d1d18341ba51768f437340d Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 11:52:13 +0100
Subject: [PATCH 1/9] attempt to fix Android builds with ruby workaround

---
 .github/workflows/platformDeploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 640d1eaa1172..6c4272a3106c 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -84,6 +84,7 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
         env:
+          RUBYOPT: '-rostruct'
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 

From 9988476c4a12b74c4f13f548c267e6a8129fb471 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 12:20:50 +0100
Subject: [PATCH 2/9] try bumping ruby for Android builds

---
 .github/workflows/platformDeploy.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 6c4272a3106c..deb11c178757 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -64,8 +64,14 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
-          ruby-version: '2.7'
-          bundler-cache: true
+          ruby-version: '3.3'
+          bundler-cache: false
+
+      - name: Setup fastlane
+        run: |
+          gem install bundler -v 2.4.22
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
 
       - name: Decrypt keystore
         run: cd android/app && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output my-upload-key.keystore my-upload-key.keystore.gpg
@@ -84,7 +90,6 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
         env:
-          RUBYOPT: '-rostruct'
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 

From ae00836b23178792e6070e9884f1ef65b487a8c3 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 12:39:35 +0100
Subject: [PATCH 3/9] test against test build workflow

---
 .github/workflows/platformDeploy.yml | 10 ++--------
 .github/workflows/testBuild.yml      |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index deb11c178757..640d1eaa1172 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -64,14 +64,8 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
-          ruby-version: '3.3'
-          bundler-cache: false
-
-      - name: Setup fastlane
-        run: |
-          gem install bundler -v 2.4.22
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          ruby-version: '2.7'
+          bundler-cache: true
 
       - name: Decrypt keystore
         run: cd android/app && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output my-upload-key.keystore my-upload-key.keystore.gpg
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 10912aaeb436..5a9b2579a566 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -117,6 +117,7 @@ jobs:
         id: runFastlaneBetaTest
         run: bundle exec fastlane android build_internal
         env:
+          RUBYOPT: '-rostruct'
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash

From f9f1973f4c5e166d549ccc9f4dbeb7afc4870a0d Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 12:55:19 +0100
Subject: [PATCH 4/9] attempt forcing bundler and ruby update

---
 .github/workflows/testBuild.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 5a9b2579a566..e9cfea63c740 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -90,8 +90,15 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
-          ruby-version: '2.7'
-          bundler-cache: true
+          ruby-version: '3.3'
+          bundler-cache: false
+
+      - name: Setup fastlane
+        id: set_up_fastlane
+        run: |
+          gem install bundler -v 2.4.22
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
 
       - name: Decrypt keystore
         run: cd android/app && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output my-upload-key.keystore my-upload-key.keystore.gpg
@@ -117,7 +124,6 @@ jobs:
         id: runFastlaneBetaTest
         run: bundle exec fastlane android build_internal
         env:
-          RUBYOPT: '-rostruct'
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash

From 54a33996a4f2ff4a65a0ed93a1d52708c432ca8e Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 13:10:35 +0100
Subject: [PATCH 5/9] attempt -rostruct fix again

---
 .github/workflows/platformDeploy.yml |  2 ++
 .github/workflows/testBuild.yml      | 12 +++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 640d1eaa1172..2b2667d587e8 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -84,6 +84,7 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
         env:
+          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
@@ -91,6 +92,7 @@ jobs:
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android production
         env:
+          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           VERSION: ${{ env.VERSION_CODE }}
 
       - name: Archive Android sourcemaps
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index e9cfea63c740..ad223e7c32b8 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -90,15 +90,8 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
-          ruby-version: '3.3'
-          bundler-cache: false
-
-      - name: Setup fastlane
-        id: set_up_fastlane
-        run: |
-          gem install bundler -v 2.4.22
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          ruby-version: '2.7'
+          bundler-cache: true
 
       - name: Decrypt keystore
         run: cd android/app && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output my-upload-key.keystore my-upload-key.keystore.gpg
@@ -124,6 +117,7 @@ jobs:
         id: runFastlaneBetaTest
         run: bundle exec fastlane android build_internal
         env:
+          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash

From d22b0a5bef697fa2a020a37df86867345aff453f Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 13:47:23 +0100
Subject: [PATCH 6/9] temporarily add GH action PULL_REQUEST_NUMBER

---
 .github/workflows/testBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index ad223e7c32b8..8ebe8f992af2 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -3,7 +3,7 @@ name: Build and deploy apps for testing
 on:
   workflow_dispatch:
     inputs:
-      PULL_REQUEST_NUMBER:
+      PULL_REQUEST_NUMBER: 45332
         description: Pull Request number for correct placement of apps
         required: true
   pull_request_target:

From 76462ad992258470a23bd235bbb56dcad371c747 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 14:52:39 +0100
Subject: [PATCH 7/9] attempt to hardcode test workflow PR number

---
 .github/workflows/testBuild.yml | 38 +++++++++++++++------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 8ebe8f992af2..3bdc70259993 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -2,10 +2,6 @@ name: Build and deploy apps for testing
 
 on:
   workflow_dispatch:
-    inputs:
-      PULL_REQUEST_NUMBER: 45332
-        description: Pull Request number for correct placement of apps
-        required: true
   pull_request_target:
     types: [opened, synchronize, labeled]
     branches: ['*ci-test/**']
@@ -30,12 +26,12 @@ jobs:
       - id: hasReadyToBuildLabel
         name: Set HAS_READY_TO_BUILD_LABEL flag
         run: |
-          echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view "${{ env.PULL_REQUEST_NUMBER }}" --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT"
+          echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view 45332 --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT"
           if [[ "$HAS_READY_TO_BUILD_LABEL" != 'true' ]]; then
-            echo "The 'Ready to Build' label is not attached to the PR #${{ env.PULL_REQUEST_NUMBER }}"
+            echo "The 'Ready to Build' label is not attached to the PR"
           fi
         env:
-          PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+          PULL_REQUEST_NUMBER: 45332
           GITHUB_TOKEN: ${{ github.token }}
 
   getBranchRef:
@@ -54,7 +50,7 @@ jobs:
         id: getHeadRef
         run: |
           set -e
-          gh pr checkout ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
+          gh pr checkout 45332
           echo "REF=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -65,7 +61,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     runs-on: ubuntu-latest-xl
     env:
-      PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+      PULL_REQUEST_NUMBER: 45332
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -76,7 +72,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
@@ -136,7 +132,7 @@ jobs:
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
-      PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+      PULL_REQUEST_NUMBER: 45332
       DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
     runs-on: macos-13-xlarge
     steps:
@@ -152,7 +148,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
 
       - name: Setup Node
         id: setup-node
@@ -228,7 +224,7 @@ jobs:
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
-      PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+      PULL_REQUEST_NUMBER: 45332
     runs-on: macos-14-large
     steps:
       - name: Checkout
@@ -240,7 +236,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
@@ -273,7 +269,7 @@ jobs:
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
-      PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+      PULL_REQUEST_NUMBER: 45332
     runs-on: ubuntu-latest-xl
     steps:
       - name: Checkout
@@ -285,7 +281,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
@@ -305,7 +301,7 @@ jobs:
         continue-on-error: true
 
       - name: Deploy to S3 for internal testing
-        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://ad-hoc-expensify-cash/web/"$PULL_REQUEST_NUMBER"
+        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://ad-hoc-expensify-cash/web/45332"
 
   postGithubComment:
     runs-on: ubuntu-latest
@@ -313,7 +309,7 @@ jobs:
     needs: [validateActor, getBranchRef, android, iOS, desktop, web]
     if: ${{ always() }}
     env:
-      PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+      PULL_REQUEST_NUMBER: 45332
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -351,13 +347,13 @@ jobs:
         if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
         uses: ./.github/actions/javascript/postTestBuildComment
         with:
-          PR_NUMBER: ${{ env.PULL_REQUEST_NUMBER }}
+          PR_NUMBER: 45332
           GITHUB_TOKEN: ${{ github.token }}
           ANDROID: ${{ needs.android.result }}
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
           ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
-          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
+          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/45332/NewExpensify.dmg
           IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
-          WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
+          WEB_LINK: https://45332.pr-testing.expensify.com
\ No newline at end of file

From b0eb1b8c53b9b0122b41f6f66bf6e8447a718b16 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 16:39:48 +0100
Subject: [PATCH 8/9] attempt a new solution for failing testflight Android
 build

---
 .github/workflows/platformDeploy.yml |  2 --
 .github/workflows/testBuild.yml      | 12 +++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 2b2667d587e8..640d1eaa1172 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -84,7 +84,6 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
         env:
-          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
@@ -92,7 +91,6 @@ jobs:
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android production
         env:
-          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           VERSION: ${{ env.VERSION_CODE }}
 
       - name: Archive Android sourcemaps
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 3bdc70259993..5714444fae64 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -86,8 +86,15 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
-          ruby-version: '2.7'
-          bundler-cache: true
+          ruby-version: '3.3'
+          bundler-cache: false
+
+      - name: Setup fastlane
+        id: set_up_fastlane
+        run: |
+          gem install bundler -v 2.4.22
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
 
       - name: Decrypt keystore
         run: cd android/app && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output my-upload-key.keystore my-upload-key.keystore.gpg
@@ -113,7 +120,6 @@ jobs:
         id: runFastlaneBetaTest
         run: bundle exec fastlane android build_internal
         env:
-          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash

From 8d9457402c1bf621e9984110101d98ac48787f0b Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 12 Jul 2024 16:42:52 +0100
Subject: [PATCH 9/9] update hardcoded PR id for workflow fix testing

---
 .github/workflows/testBuild.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 5714444fae64..0de996b3c2ec 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -26,12 +26,12 @@ jobs:
       - id: hasReadyToBuildLabel
         name: Set HAS_READY_TO_BUILD_LABEL flag
         run: |
-          echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view 45332 --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT"
+          echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view 45347 --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT"
           if [[ "$HAS_READY_TO_BUILD_LABEL" != 'true' ]]; then
             echo "The 'Ready to Build' label is not attached to the PR"
           fi
         env:
-          PULL_REQUEST_NUMBER: 45332
+          PULL_REQUEST_NUMBER: 45347
           GITHUB_TOKEN: ${{ github.token }}
 
   getBranchRef:
@@ -50,7 +50,7 @@ jobs:
         id: getHeadRef
         run: |
           set -e
-          gh pr checkout 45332
+          gh pr checkout 45347
           echo "REF=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -61,7 +61,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     runs-on: ubuntu-latest-xl
     env:
-      PULL_REQUEST_NUMBER: 45332
+      PULL_REQUEST_NUMBER: 45347
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45347" >> .env.adhoc
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
@@ -138,7 +138,7 @@ jobs:
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
-      PULL_REQUEST_NUMBER: 45332
+      PULL_REQUEST_NUMBER: 45347
       DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
     runs-on: macos-13-xlarge
     steps:
@@ -154,7 +154,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45347" >> .env.adhoc
 
       - name: Setup Node
         id: setup-node
@@ -230,7 +230,7 @@ jobs:
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
-      PULL_REQUEST_NUMBER: 45332
+      PULL_REQUEST_NUMBER: 45347
     runs-on: macos-14-large
     steps:
       - name: Checkout
@@ -242,7 +242,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45347" >> .env.adhoc
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
@@ -275,7 +275,7 @@ jobs:
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
-      PULL_REQUEST_NUMBER: 45332
+      PULL_REQUEST_NUMBER: 45347
     runs-on: ubuntu-latest-xl
     steps:
       - name: Checkout
@@ -287,7 +287,7 @@ jobs:
         run: |
           cp .env.staging .env.adhoc
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=45332" >> .env.adhoc
+          echo "PULL_REQUEST_NUMBER=45347" >> .env.adhoc
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
@@ -307,7 +307,7 @@ jobs:
         continue-on-error: true
 
       - name: Deploy to S3 for internal testing
-        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://ad-hoc-expensify-cash/web/45332"
+        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://ad-hoc-expensify-cash/web/45347"
 
   postGithubComment:
     runs-on: ubuntu-latest
@@ -315,7 +315,7 @@ jobs:
     needs: [validateActor, getBranchRef, android, iOS, desktop, web]
     if: ${{ always() }}
     env:
-      PULL_REQUEST_NUMBER: 45332
+      PULL_REQUEST_NUMBER: 45347
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -353,13 +353,13 @@ jobs:
         if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
         uses: ./.github/actions/javascript/postTestBuildComment
         with:
-          PR_NUMBER: 45332
+          PR_NUMBER: 45347
           GITHUB_TOKEN: ${{ github.token }}
           ANDROID: ${{ needs.android.result }}
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
           ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
-          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/45332/NewExpensify.dmg
+          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/45347/NewExpensify.dmg
           IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
-          WEB_LINK: https://45332.pr-testing.expensify.com
\ No newline at end of file
+          WEB_LINK: https://45347.pr-testing.expensify.com
\ No newline at end of file