Merge branch 'main' into rules/category-rules

Expensify · Sep 4, 2024 · 3abcbdb · 3abcbdb
2 parents 1145150 + ec8a5d9
commit 3abcbdb
Show file tree

Hide file tree

Showing 291 changed files with 6,989 additions and 3,349 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -71,7 +71,10 @@ jobs:
         run: echo "PRODUCTION_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
 
       - name: 🚀 Edit the release to be no longer a prerelease to deploy production 🚀
-        run: gh release edit ${{ env.PRODUCTION_VERSION }} --prerelease=false --latest
+        run: |
+          LATEST_RELEASE="$(gh release list --exclude-pre-releases --json tagName,isLatest --jq '.[] | select(.isLatest) | .tagName')"
+          gh api --method POST /repos/Expensify/App/releases/generate-notes -f "tag_name=${{ env.PRODUCTION_VERSION }}" -f "previous_tag_name=$LATEST_RELEASE" >> releaseNotes.md
+          gh release edit ${{ env.PRODUCTION_VERSION }} --prerelease=false --latest --notes-file releaseNotes.md
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    apktools (0.7.4)
+    apktools (0.7.5)
       rubyzip (~> 2.0)
     artifactory (3.0.17)
     atomos (0.1.3)

diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@
 * [Contributing to Expensify](contributingGuides/CONTRIBUTING.md)
 * [Expensify Code of Conduct](CODE_OF_CONDUCT.md)
 * [Contributor License Agreement](contributingGuides/CLA.md)
+* [React StrictMode](contributingGuides/STRICT_MODE.md)
 
 ----
 

diff --git a/__mocks__/react-native-document-picker.ts b/__mocks__/react-native-document-picker.ts
@@ -18,6 +18,7 @@ const reactNativeDocumentPickerMock: ReactNativeDocumentPickerMock = {
         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',

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002601
-        versionName "9.0.26-1"
+        versionCode 1009002900
+        versionName "9.0.29-0"
         // 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"

diff --git a/assets/images/companyCards/emptystate__card-pos.svg b/assets/images/companyCards/emptystate__card-pos.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__magnifyingglass-money.svg b/assets/images/simple-illustrations/simple-illustration__magnifyingglass-money.svg