Merge remote-tracking branch 'origin/main' into fix-report-header-gap-2

Author: abzokhattab

.github/workflows/createNewVersion.yml

@@ -129,7 +129,18 @@ jobs:
             ./iOS/SmartScanExtension/Info.plist \
             ./iOS/NotificationServiceExtension/Info.plist
           git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
-          git push origin main
+          if ! git push origin main; then
+            echo "Race condition! Mobile-Expensify main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
+            git fetch origin main --depth=1
+            if ! git rebase origin/main; then
+              echo "::error:: Rebase failed while retrying Mobile-Expensify push"
+              exit 1
+            fi
+            if ! git push origin main; then
+              echo "::error:: Mobile-Expensify change failed to push after rebase"
+              exit 1
+            fi
+          fi
 
       - name: Commit new E/App version
         run: |
@@ -146,7 +157,18 @@ jobs:
         run: |
           git add Mobile-Expensify
           git commit -m "Update Mobile-Expensify submodule version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
-          git push origin main
+          if ! git push origin main; then
+            echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
+            git fetch origin main --depth=1
+            if ! git rebase origin/main; then
+              echo "::error:: Rebase failed while retrying Mobile-Expensify push"
+              exit 1
+            fi
+            if ! git push origin main; then
+              echo "::error:: Mobile-Expensify change failed to push after rebase"
+              exit 1
+            fi
+          fi
 
       - name: Announce failed workflow in Slack
         if: ${{ failure() }}

.github/workflows/deploy.yml

@@ -165,11 +165,13 @@ jobs:
       - name: Submit production build for Google Play review and a slow rollout
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: |
-          # The Play Store is slow to review Android releases. To avoid halting production rollouts, we must wait for the previous release to finish rolling out before uploading a new one.
-          # Skip this release if the current prod release is not fully rolled out.
+          # 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 "Skipping Android release because the current prod release ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }} has not fully rolled out"
-            exit 0
+            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
@@ -599,7 +601,7 @@ jobs:
 
       - name:  🚀 Create release 🚀
         run: |
-          gh release create ${{ needs.prep.outputs.TAG }} ${{ github.ref == 'refs/heads/staging' && '--prerelease' }} \
+          gh release create ${{ needs.prep.outputs.TAG }} ${{ github.ref == 'refs/heads/staging' && '--prerelease' || '' }} \
             --repo ${{ github.repository }} \
             --title ${{ needs.prep.outputs.TAG }} \
             --generate-notes \

.imgbotconfig

@@ -1,6 +1,6 @@
 {
     "ignoredFiles": [
-        "assets/images/themeDependent/empty-state_background-fade-dark.png", // Caused an issue with colour gradients, https://github.com/Expensify/App/issues/30499
+        "assets/images/themeDependent/empty-state_background-fade-dark.png", // Caused an issue with color gradients, https://github.com/Expensify/App/issues/30499
         "assets/images/themeDependent/empty-state_background-fade-light.png"
     ],
     "aggressiveCompression": "false"

Gemfile

@@ -6,7 +6,7 @@ ruby ">= 3.3.4"
 gem "cocoapods", "= 1.15.2"
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 gem 'xcodeproj', '< 1.26.0'
-gem "fastlane", "~> 2", ">= 2.222.0"
+gem "fastlane", "~> 2", ">= 2.227.1"
 gem "xcpretty", "~> 0"
 
 

Gemfile.lock

@@ -81,7 +81,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.3.3)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
@@ -118,8 +118,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.227.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -159,7 +159,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-aws_s3 (2.1.0)
       apktools (~> 0.7)
@@ -197,12 +197,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -218,7 +218,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.5)
@@ -241,9 +241,9 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
+    plist (3.7.2)
     public_suffix (4.0.7)
     rake (13.2.1)
     representable (3.2.0)
@@ -252,7 +252,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.3.9)
-    rouge (2.0.7)
+    rouge (3.28.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -288,8 +288,8 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -303,7 +303,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 6.1.7.5, != 7.1.0)
   cocoapods (= 1.15.2)
-  fastlane (~> 2, >= 2.222.0)
+  fastlane (~> 2, >= 2.227.1)
   fastlane-plugin-aws_s3
   fastlane-plugin-firebase_app_distribution
   xcodeproj (< 1.26.0)

Mobile-Expensify

@@ -458,20 +458,21 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
 ## Getting started with HybridApp
 
 1. If you haven't, please follow [these instructions](https://github.com/Expensify/App?tab=readme-ov-file#getting-started) to setup the NewDot local environment.
-2. Run `git submodule update --init --progress --depth 100` to download the `Mobile-Expensify` sourcecode.
-- If you have access to `Mobile-Expensify` and the command fails, add this to your `~/.gitconfig` file:
+2. In the root directory, run `git submodule init`
+3. Run `git submodule update`
+    - If this takes too long, try `git submodule update --init --progress --depth 100` (Note: this makes it difficult to checkout remote branches in the submodule)
+    - If you have access to `Mobile-Expensify` and the command fails, add this to your `~/.gitconfig` file:
 
     ```
     [url "https://github.com/"]
         insteadOf = ssh://git@github.com/
     ```
-- To prevent `Mobile-Expensify` submodule commit hash changes from appearing in `git status`, configure Git to ignore them by adding this to your local `.git/config`:
+    - To prevent `Mobile-Expensify` submodule commit hash changes from appearing in `git status`, configure Git to ignore them by adding this to your local `.git/config` (This ensures that submodule changes are ignored unless you deliberately update them):
     ```
     [submodule "Mobile-Expensify"]
         ignore = all
     ```
-    This ensures that submodule changes are ignored unless you deliberately update them.
-3. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
+4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
 
 
 > [!Note]  
@@ -560,7 +561,7 @@ If you'd like to add HybridApp-specific patches, use the `--patch-dir` flag:
 
 ### Additional information and troubleshooting
 
-If you seek some addtional information you can always refer to the [extended version](contributingGuides/HYBRID_APP.md) of the docs for HybridApp. You can find there extended explanation of some of the concepts, pro tips, and most common errors.
+If you seek some additional information you can always refer to the [extended version](contributingGuides/HYBRID_APP.md) of the docs for HybridApp. You can find there extended explanation of some of the concepts, pro tips, and most common errors.
 
 ----
 
@@ -939,4 +940,4 @@ Onyx derived values are special Onyx keys which contain values derived from othe
 
 3. **Document derived values**
    - Explain the purpose and dependencies
-   - Document any special cases or performance considerations
+   - Document any special cases or performance considerations

README.md

@@ -0,0 +1,24 @@
+import type {FileToCopy} from '@react-native-documents/picker';
+
+const keepLocalCopy = jest.fn();
+const pick = jest.fn();
+const types = Object.freeze({
+    allFiles: 'public.item',
+    audio: 'public.audio',
+    csv: 'public.comma-separated-values-text',
+    doc: 'com.microsoft.word.doc',
+    docx: 'org.openxmlformats.wordprocessingml.document',
+    images: 'public.image',
+    json: 'public.json',
+    pdf: 'com.adobe.pdf',
+    plainText: 'public.plain-text',
+    ppt: 'com.microsoft.powerpoint.ppt',
+    pptx: 'org.openxmlformats.presentationml.presentation',
+    video: 'public.movie',
+    xls: 'com.microsoft.excel.xls',
+    xlsx: 'org.openxmlformats.spreadsheetml.sheet',
+    zip: 'public.zip-archive',
+});
+
+export type {FileToCopy};
+export {keepLocalCopy, pick, types};

__mocks__/@react-native-documents/picker.ts

@@ -48,7 +48,7 @@ const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callbac
 const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
 
 export {
-    // Overriden modules
+    // Overridden modules
     useIsFocused,
     useTheme,
     useNavigation,

__mocks__/@react-navigation/native/index.ts

@@ -46,7 +46,7 @@ const PinkBill = 'PinkBill';
 const CreditCardsNew = 'CreditCardsNew';
 const CreditCardsNewGreen = 'CreditCardsNewGreen';
 const InvoiceBlue = 'InvoiceBlue';
-const LaptopwithSecondScreenandHourglass = 'LaptopwithSecondScreenandHourglass';
+const LaptopWithSecondScreenAndHourglass = 'LaptopWithSecondScreenAndHourglass';
 const LockOpen = 'LockOpen';
 const Luggage = 'Luggage';
 const MoneyIntoWallet = 'MoneyIntoWallet';
@@ -200,7 +200,7 @@ export {
     CreditCardsNew,
     CreditCardsNewGreen,
     InvoiceBlue,
-    LaptopwithSecondScreenandHourglass,
+    LaptopWithSecondScreenAndHourglass,
     LockOpen,
     Luggage,
     MoneyIntoWallet,