Merge branch 'main' into jules-addMobilePRsToChecklist

* main:
  Update Mobile-Expensify submodule version to 9.1.92-3
  Update version to 9.1.92-3
  Update Mobile-Expensify submodule version to 9.1.92-2
  Update version to 9.1.92-2
  Only upload builds to applause for main staging release
  ping deployers in slack when a CP request failed due to conflicts
  Update comment
  Temporary disable merge action
  update dependency
  remove slack announcement
  fix lint
  User owes /bin/zsh.00 appears in search after deleting expense

# Conflicts:
#	Mobile-Expensify

Author: Julesssss

.github/workflows/cherryPick.yml

@@ -240,9 +240,30 @@ jobs:
             --label "Engineering,Hourly,${{ inputs.TARGET == 'staging' && 'CP Staging' || 'CP Production' }}" \
             --base "${{ inputs.TARGET }}"
           sleep 5
+
+          # Save the Cherry-pick PR URL for Slack notification
+          PR_URL="$(gh pr view --json url --jq .url)"
+          echo "PR_URL=$PR_URL" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
 
+      - name: Announce CP conflict in #deployer
+        if: steps.cherryPick.outputs.HAS_CONFLICTS == 'true'
+        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
+        with:
+          status: custom
+          custom_payload: |
+            {
+              "channel": "#deployer",
+              "attachments": [{
+                "color": "#DB4545",
+                "text": "🚨 Cherry-pick to ${{ inputs.TARGET }} has conflicts and requires manual resolution.\nOriginal PR: ${{ inputs.PULL_REQUEST_URL }}\nConflict PR: ${{ steps.createPullRequest.outputs.PR_URL }}"
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
       - name: Add assignees to conflict PRs
         if: steps.cherryPick.outputs.HAS_CONFLICTS == 'true'
         run: |

.github/workflows/deploy.yml

@@ -231,7 +231,7 @@ jobs:
           unzip -p Expensify.apks universal.apk > Expensify.apk
 
       - name: Upload Android build to Applause
-        if: ${{ fromJSON(env.IS_APP_REPO) && (github.ref == 'refs/heads/staging' || fromJSON(needs.prep.outputs.IS_CHERRY_PICK)) }}
+        if: ${{ fromJSON(env.IS_APP_REPO) && github.ref == 'refs/heads/staging' && !fromJSON(needs.prep.outputs.IS_CHERRY_PICK) }}
         run: |
           APPLAUSE_VERSION=$(echo '${{ needs.prep.outputs.APP_VERSION }}' | tr '-' '.')
           curl -F "file=@Expensify.apk" \
@@ -466,7 +466,7 @@ jobs:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 
       - name: Upload iOS build to Applause
-        if: ${{ fromJSON(env.IS_APP_REPO) && fromJSON(env.SHOULD_BUILD_APP) }}
+        if: ${{ fromJSON(env.IS_APP_REPO) && github.ref == 'refs/heads/staging' && !fromJSON(needs.prep.outputs.IS_CHERRY_PICK) }}
         run: |
           APPLAUSE_VERSION=$(echo '${{ needs.prep.outputs.APP_VERSION }}' | tr '-' '.')
           curl -F "file=@${{ env.ipaPath }}" \

.github/workflows/preDeploy.yml

@@ -27,12 +27,6 @@ jobs:
     steps:
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
 
-      - name: Announce failed workflow in Slack
-        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
-        uses: ./.github/actions/composite/announceFailedWorkflowInSlack
-        with:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
       - name: Exit failed workflow
         if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
         run: |

android/app/build.gradle

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009019201
-        versionName "9.1.92-1"
+        versionCode 1009019203
+        versionName "9.1.92-3"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

ios/NewExpensify/Info.plist

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.92.1</string>
+	<string>9.1.92.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.92</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.92.1</string>
+	<string>9.1.92.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.92</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.92.1</string>
+	<string>9.1.92.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.92-1",
+  "version": "9.1.92-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package.json

@@ -50,6 +50,7 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
     const [reportAttributes] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {canBeMissing: true});
     const prevReportAttributesLocale = usePrevious(reportAttributes?.locale);
     const [reports, {sourceValue: changedReports}] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true});
+    const prevReports = usePrevious(reports);
     const [, {sourceValue: changedReportActions}] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {canBeMissing: true});
     const personalDetails = usePersonalDetails();
     const prevPersonalDetails = usePrevious(personalDetails);
@@ -88,14 +89,17 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
     }, [prevReportAttributesLocale, loadOptions, reportAttributes?.locale]);
 
     const changedReportsEntries = useMemo(() => {
-        const result: OnyxCollection<OnyxEntry<Report>> = {};
+        const result: OnyxCollection<OnyxEntry<Report> | null> = {};
 
         Object.keys(changedReports ?? {}).forEach((key) => {
-            const report = reports?.[key];
+            let report: Report | null = reports?.[key] ?? null;
             result[key] = report;
+            if (reports?.[key] === undefined && prevReports?.[key]) {
+                report = null;
+            }
         });
         return result;
-    }, [changedReports, reports]);
+    }, [changedReports, reports, prevReports]);
 
     /**
      * This effect is responsible for updating the options only for changed reports