Skip to content

Commit ad23da8

Browse files
ryntghryntgh
committed
Merge branch 'main' into issue-75838
2 parents 27b7840 + fe9e5cb commit ad23da8

220 files changed

Lines changed: 4604 additions & 2837 deletions

File tree

Some content is hidden

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

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ GITHUB_TOKEN=YOUR_TOKEN
4242
OPENAI_API_KEY=YOUR_TOKEN
4343

4444
SENTRY_AUTH_TOKEN=SENTRY_AUTH_TOKEN
45+
SENTRY_ALLOW_FAILURE=true

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ jobs:
167167
ANDROID_BUILD_TYPE: ${{ vars.ANDROID_BUILD_TYPE }}
168168
GITHUB_ACTOR: ${{ github.actor }}
169169
GITHUB_TOKEN: ${{ github.token }}
170+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
170171

171172
- name: Upload Android app to Google Play
172173
if: ${{ fromJSON(env.SHOULD_BUILD_APP) }}
@@ -382,6 +383,7 @@ jobs:
382383
APPLE_SHARE_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_NAME }}
383384
APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE: ${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}
384385
APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME }}
386+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
385387

386388
- name: Upload release build to TestFlight
387389
if: ${{ fromJSON(env.SHOULD_BUILD_APP) }}

‎.github/workflows/testBuild.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ jobs:
284284
ANDROID_UPLOAD_KEY_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
285285
GITHUB_ACTOR: ${{ github.actor }}
286286
GITHUB_TOKEN: ${{ github.token }}
287+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
287288
run: bundle exec fastlane android build_adhoc_hybrid
288289

289290
- name: Configure AWS Credentials

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.4
1+
20.19.5

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009026700
118-
versionName "9.2.67-0"
117+
versionCode 1009027000
118+
versionName "9.2.70-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

‎android/sentry.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
defaults.org=expensify
2+
defaults.project=app
3+
defaults.url=https://sentry.io

‎assets/images/product-illustrations/big-vault.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎assets/images/product-illustrations/broken-humpty-dumpty.svg‎

Lines changed: 1 addition & 195 deletions
Loading

‎assets/images/product-illustrations/dj-booth-reference-hands.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)