Skip to content

Commit 6ebd7f7

Browse files
committed
Merge branch 'main' into fix/65479
2 parents d48d5bd + b73ebe2 commit 6ebd7f7

118 files changed

Lines changed: 1055 additions & 746 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.

.github/workflows/deploy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,9 @@ jobs:
233233
- name: Upload Android build to Applause
234234
if: ${{ fromJSON(env.IS_APP_REPO) && (github.ref == 'refs/heads/staging' || fromJSON(needs.prep.outputs.IS_CHERRY_PICK)) }}
235235
run: |
236+
APPLAUSE_VERSION=$(echo '${{ needs.prep.outputs.APP_VERSION }}' | tr '-' '.')
236237
curl -F "file=@Expensify.apk" \
237-
"https://api.applause.com/v2/builds?name=Expensify_${{ needs.prep.outputs.TAG }}&productId=36008" \
238+
"https://api.applause.com/v2/builds?name=Expensify_$APPLAUSE_VERSION&productId=36008" \
238239
-H "X-Api-Key: ${{ steps.load-credentials.outputs.APPLAUSE_API_KEY }}"
239240
240241
- name: Upload Android APK build artifact
@@ -467,8 +468,9 @@ jobs:
467468
- name: Upload iOS build to Applause
468469
if: ${{ fromJSON(env.IS_APP_REPO) && fromJSON(env.SHOULD_BUILD_APP) }}
469470
run: |
471+
APPLAUSE_VERSION=$(echo '${{ needs.prep.outputs.APP_VERSION }}' | tr '-' '.')
470472
curl -F "file=@${{ env.ipaPath }}" \
471-
"https://api.applause.com/v2/builds?name=Expensify_${{ needs.prep.outputs.TAG }}&productId=36005" \
473+
"https://api.applause.com/v2/builds?name=Expensify_$APPLAUSE_VERSION&productId=36005" \
472474
-H "X-Api-Key: ${{ steps.load-credentials.outputs.APPLAUSE_API_KEY }}"
473475
474476
- name: Upload iOS build artifact

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 1009018604
118-
versionName "9.1.86-4"
117+
versionCode 1009018703
118+
versionName "9.1.87-3"
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"

ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.1.86</string>
26+
<string>9.1.87</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.86.4</string>
47+
<string>9.1.87.3</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.86</string>
14+
<string>9.1.87</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.86.4</string>
16+
<string>9.1.87.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.86</string>
14+
<string>9.1.87</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.86.4</string>
16+
<string>9.1.87.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 16 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.86-4",
3+
"version": "9.1.87-3",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -179,15 +179,15 @@
179179
"react-native-modal": "^13.0.0",
180180
"react-native-nitro-modules": "0.26.2",
181181
"react-native-nitro-sqlite": "9.1.10",
182-
"react-native-onyx": "^2.0.123",
182+
"react-native-onyx": "2.0.127",
183183
"react-native-pager-view": "6.5.3",
184184
"react-native-pdf": "6.7.3",
185185
"react-native-performance": "^5.1.4",
186186
"react-native-permissions": "^5.4.0",
187187
"react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#07d60d78d4772d47afd7a744940fc6b6d1881806",
188188
"react-native-plaid-link-sdk": "11.11.0",
189189
"react-native-qrcode-svg": "6.3.14",
190-
"react-native-reanimated": "3.17.1",
190+
"react-native-reanimated": "3.19.0",
191191
"react-native-release-profiler": "^0.2.1",
192192
"react-native-render-html": "6.3.1",
193193
"react-native-safe-area-context": "5.4.0",
@@ -318,8 +318,8 @@
318318
"eslint-plugin-storybook": "^0.12.0",
319319
"eslint-plugin-testing-library": "^6.2.2",
320320
"eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
321-
"googleapis": "^144.0.0",
322321
"glob": "^10.3.0",
322+
"googleapis": "^144.0.0",
323323
"html-webpack-plugin": "^5.5.0",
324324
"http-server": "^14.1.1",
325325
"jest": "29.4.1",

patches/react-native-reanimated+3.17.1+004+fix-transform-animation-gitter.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

patches/react-native-reanimated+3.17.1+005+fix-cancelAnimation-on-web.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)