Skip to content

Commit b32543a

Browse files
committed
Merge branch 'main' into revert-42670-revert-40240-monil-splitBillTaxUpdate
2 parents 92366d8 + 8dbec8d commit b32543a

File tree

118 files changed

+2830
-1140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2830
-1140
lines changed

.github/workflows/platformDeploy.yml

-10
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,6 @@ jobs:
352352
env:
353353
CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
354354

355-
# Build a version of iOS and Android HybridApp if we are deploying to staging
356-
hybridApp:
357-
runs-on: ubuntu-latest
358-
needs: validateActor
359-
if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
360-
steps:
361-
- name: 'Deploy HybridApp'
362-
if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
363-
uses: Expensify/Mobile-Deploy/.github/workflows/deploy.yml@main
364-
365355
postSlackMessageOnFailure:
366356
name: Post a Slack message when any platform fails to build or deploy
367357
runs-on: ubuntu-latest

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ android {
107107
minSdkVersion rootProject.ext.minSdkVersion
108108
targetSdkVersion rootProject.ext.targetSdkVersion
109109
multiDexEnabled rootProject.ext.multiDexEnabled
110-
versionCode 1001047805
111-
versionName "1.4.78-5"
110+
versionCode 1001047908
111+
versionName "1.4.79-8"
112112
// Supported language variants must be declared here to avoid from being removed during the compilation.
113113
// This also helps us to not include unnecessary language variants in the APK.
114114
resConfigs "en", "es"

assets/images/bed.svg

+1
Loading

assets/images/car-with-key.svg

+1
Loading

assets/images/plane.svg

+1
Loading

assets/images/receipt-slash.svg

+12
Loading
Loading
Loading

0 commit comments

Comments
 (0)