Skip to content

Commit f518d68

Browse files
authored
Merge branch 'Expensify:main' into decompose/report-screen-6a
2 parents b5220e5 + 1d6d550 commit f518d68

31 files changed

Lines changed: 350 additions & 698 deletions

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009035005
115-
versionName "9.3.50-5"
114+
versionCode 1009035006
115+
versionName "9.3.50-6"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.50.5</string>
47+
<string>9.3.50.6</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.50</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.50.5</string>
16+
<string>9.3.50.6</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.50</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.50.5</string>
16+
<string>9.3.50.6</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.3.50-5",
3+
"version": "9.3.50-6",
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.",
@@ -182,7 +182,7 @@
182182
"react-native-pager-view": "8.0.0",
183183
"react-native-pdf": "7.0.2",
184184
"react-native-permissions": "^5.4.0",
185-
"react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#07d60d78d4772d47afd7a744940fc6b6d1881806",
185+
"react-native-picker-select": "github:Expensify/react-native-picker-select#3e090db",
186186
"react-native-plaid-link-sdk": "12.5.3",
187187
"react-native-qrcode-svg": "6.3.21",
188188
"react-native-reanimated": "4.2.1",

patches/react-native/details.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
### [react-native+0.83.1+011+Add-onPaste-to-TextInput.patch](react-native+0.83.1+011+Add-onPaste-to-TextInput.patch)
7676

7777
- Reasons:
78-
- Adds `onPaste` callback to `TextInput` to support image and file pasting on native
78+
- Adds `onPaste` callback to `TextInput` to support image pasting on native
7979
- Fixes an issue where pasted image displays as binary text on some Android devices where rich clipboard data is stored in binary form
8080
- Fixes an issue where pasting from WPS Office app crashes the app on Android where its content URI is not recognized by Android `ContentResolver`
8181
- Fixes an issue where mentions copied from mWeb and pasted on Android are not displayed.
@@ -174,7 +174,7 @@
174174
```
175175
This patch restores the old InteractionManager behavior. React Native 0.80 deprecated InteractionManager and modified
176176
it to behave like `setImmediate`, more info here - https://github.com/facebook/react-native/blob/d9262c60f4c02d66417008970dc9c34b742aaa75/CHANGELOG.md?plain=1#L597
177-
177+
178178
We need to restore the previous behavior to avoid introducing any bugs in the app.
179179
Bug example - https://github.com/Expensify/App/pull/69535#issuecomment-3443059319
180180
```

0 commit comments

Comments
 (0)