Merge branch 'main' into @chrispader/migrate-attachment-modals-to-modal-screens

Author: chrispader

.github/ISSUE_TEMPLATE/NewPatchTemplate.md

@@ -0,0 +1,39 @@
+---
+name: Patch Tracking
+about: Template for tracking patches applied to third-party libraries
+---
+
+If you haven't already, check out our [contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md) and [patch guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/PATCHES.md) for information on how to manage patches.
+___
+
+## Patch Information
+
+**Library Name:** <!-- e.g., react-native-pdf -->
+**Library Version:** <!-- e.g., 6.7.3 -->
+**Patch Number:** <!-- e.g., 001 -->
+**Patch Description:** <!-- e.g., update-podspec-to-support-new-arch -->
+**Full Patch Filename:** <!-- e.g., react-native-pdf+6.7.3+001+update-podspec-to-support-new-arch.patch -->
+
+## Patch Details
+
+### Reason for Patch
+<!-- Explain why this patch is necessary. What issue does it solve? -->
+
+### Changes Made
+<!-- Briefly describe the changes made in the patch -->
+
+### Upstream Status
+**Upstream PR/Issue:** <!-- Link to the PR or issue in the upstream repository, if one exists -->
+
+## Related Information
+
+**PR Introducing Patch:** <!-- Link to the PR that introduced this patch -->
+
+## Additional Notes
+<!-- Any other relevant information about this patch -->
+
+## Checklist
+- [ ] Patch file is correctly named and placed in the appropriate directory
+- [ ] Patch is documented in the corresponding `details.md` file
+- [ ] This issue is linked in the `details.md` file
+- [ ] Upstream PR/issue has been created (if applicable)

.github/workflows/deploy.yml

@@ -180,20 +180,15 @@ jobs:
           GOOGLE_KEY_FILE: ./android-fastlane-json-key.json
           PACKAGE_NAME: org.me.mobiexpensifyg
 
+      # Complete the previous version rollout if the current rollout percentage is not -1 (no rollout in progress) or 1 (fully rolled out)
+      - name: Submit previous production build to 100%
+        if: ${{ github.ref == 'refs/heads/production' && !contains(fromJSON('["1", "-1"]'), steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE) }}
+        run: bundle exec fastlane android complete_hybrid_rollout
+        continue-on-error: true
+
       - name: Submit production build for Google Play review and a slow rollout
         if: ${{ github.ref == 'refs/heads/production' }}
-        run: |
-          # Complete the previous version rollout if the current rollout percentage is not -1 (no rollout in progress) or 1 (fully rolled out)
-          echo "Current rollout percentage: ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }}"
-          if [[ ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }} != '-1' && ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }} != '1' ]]; then
-            echo "Completing the previous version rollout"
-              bundle exec fastlane android complete_hybrid_rollout
-          else
-              echo "Skipping the completion of the previous version rollout"
-          fi
-
-          # Submit the new version for review and slow rollout when it's approved
-          bundle exec fastlane android upload_google_play_production_hybrid_rollout
+        run: bundle exec fastlane android upload_google_play_production_hybrid_rollout
         env:
           VERSION: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }}
 
@@ -433,14 +428,14 @@ jobs:
         if: ${{ fromJSON(env.IS_APP_REPO) && fromJSON(env.SHOULD_BUILD_APP) }}
         run: bundle exec fastlane ios upload_dsyms_hybrid
 
-      - name: Submit production build for App Store review and a slow rollout
+      - name: Submit previous production build to 100%
         if: ${{ github.ref == 'refs/heads/production' }}
-        run: |
-          # Complete the previous version rollout
-          bundle exec fastlane ios complete_hybrid_rollout
+        run: bundle exec fastlane ios complete_hybrid_rollout
+        continue-on-error: true
 
-          # Submit the new version for review and phased rollout when it's approved
-          bundle exec fastlane ios submit_hybrid_for_rollout
+      - name: Submit production build for App Store review and a slow rollout
+        if: ${{ github.ref == 'refs/heads/production' }}
+        run: bundle exec fastlane ios submit_hybrid_for_rollout
         env:
           VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }}
           APPLE_ID: ${{ vars.APPLE_ID }}

.github/workflows/deployExpensifyHelp.yml

@@ -81,8 +81,3 @@ jobs:
         with:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
           body: ${{ format('A preview of your ExpensifyHelp changes have been deployed to {0} ⚡️', steps.deploy.outputs.alias) }}
-
-      - name: Reindex google search
-        if: ${{ github.event_name == 'push' }}
-        run : |
-          curl "https://www.google.com/ping?sitemap=https://help.expensify.com/sitemap.xml"

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017006
-        versionName "9.1.70-6"
+        versionCode 1009017108
+        versionName "9.1.71-8"
         // 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"