Merge branch 'main' into monil-fixDistanceTaxRateBug

Expensify · Jun 5, 2024 · fad70bf · fad70bf
2 parents d49857f + 66b4072
commit fad70bf
Show file tree

Hide file tree

Showing 113 changed files with 2,726 additions and 1,068 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -352,16 +352,6 @@ jobs:
         env:
           CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
 
-  # Build a version of iOS and Android HybridApp if we are deploying to staging
-  hybridApp:
-    runs-on: ubuntu-latest
-    needs: validateActor
-    if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    steps:
-      - name: 'Deploy HybridApp'
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        uses: Expensify/Mobile-Deploy/.github/workflows/deploy.yml@main
-
   postSlackMessageOnFailure:
     name: Post a Slack message when any platform fails to build or deploy
     runs-on: ubuntu-latest

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047805
-        versionName "1.4.78-5"
+        versionCode 1001047907
+        versionName "1.4.79-7"
         // 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/bed.svg b/assets/images/bed.svg
diff --git a/assets/images/car-with-key.svg b/assets/images/car-with-key.svg
diff --git a/assets/images/plane.svg b/assets/images/plane.svg
diff --git a/assets/images/receipt-slash.svg b/assets/images/receipt-slash.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__subscription-annual.svg b/assets/images/simple-illustrations/simple-illustration__subscription-annual.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__subscription-ppu.svg b/assets/images/simple-illustrations/simple-illustration__subscription-ppu.svg