Skip to content

Commit 6860bfa

Browse files
authored
Merge branch 'Expensify:main' into krishna2323/issue/65972
2 parents 59cc5f0 + 17ac11a commit 6860bfa

88 files changed

Lines changed: 1222 additions & 947 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.

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 1009018502
118-
versionName "9.1.85-2"
117+
versionCode 1009018505
118+
versionName "9.1.85-5"
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: 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.1.85.2</string>
47+
<string>9.1.85.5</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.1.85</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.85.2</string>
16+
<string>9.1.85.5</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.1.85</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.85.2</string>
16+
<string>9.1.85.5</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 6 additions & 6 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.1.85-2",
3+
"version": "9.1.85-5",
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.",
@@ -129,7 +129,7 @@
129129
"date-fns-tz": "^3.2.0",
130130
"dom-serializer": "^0.2.2",
131131
"domhandler": "^4.3.0",
132-
"expensify-common": "^2.0.142",
132+
"expensify-common": "2.0.147",
133133
"expo": "53.0.7",
134134
"expo-asset": "^11.1.2",
135135
"expo-av": "^15.1.5",

patches/react-native/details.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,10 @@
176176
- Upstream PR/issue: https://github.com/facebook/react-native/pull/52530
177177
- E/App issue: https://github.com/Expensify/App/issues/65268
178178
- PR introducing patch: [#65925](https://github.com/Expensify/App/pull/65925)
179+
180+
### [react-native+0.79.2+025+fix-textinput-oncontentsizechange-dispatched-only-once-ios.patch](react-native+0.79.2+025+fix-textinput-oncontentsizechange-dispatched-only-once-ios.patch)
181+
182+
- Reason: This patch updates RCTTextInputComponentView.mm to fix an issue where the TextInput onContentSizeChange event is dispatched only once on iOS instead of being triggered for subsequent content size changes.
183+
- Upstream PR/issue: https://github.com/facebook/react-native/pull/50782
184+
- E/App issue: https://github.com/Expensify/App/issues/64900
185+
- PR introducing patch: [#65804](https://github.com/Expensify/App/pull/65804)
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
2+
index fef9c63..1859b31 100644
3+
--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
4+
+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
5+
@@ -70,6 +70,7 @@ @implementation RCTTextInputComponentView {
6+
NSDictionary<NSAttributedStringKey, id> *_originalTypingAttributes;
7+
8+
BOOL _hasInputAccessoryView;
9+
+ CGSize _previousContentSize;
10+
}
11+
12+
#pragma mark - UIView overrides
13+
@@ -86,6 +87,7 @@ - (instancetype)initWithFrame:(CGRect)frame
14+
_comingFromJS = NO;
15+
_didMoveToWindow = NO;
16+
_originalTypingAttributes = [_backedTextInputView.typingAttributes copy];
17+
+ _previousContentSize = CGSizeZero;
18+
19+
[self addSubview:_backedTextInputView];
20+
[self initializeReturnKeyType];
21+
@@ -326,7 +328,6 @@ - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &
22+
- (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
23+
oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics
24+
{
25+
- CGSize previousContentSize = _backedTextInputView.contentSize;
26+
27+
[super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
28+
29+
@@ -335,7 +336,8 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
30+
_backedTextInputView.textContainerInset =
31+
RCTUIEdgeInsetsFromEdgeInsets(layoutMetrics.contentInsets - layoutMetrics.borderWidth);
32+
33+
- if (!CGSizeEqualToSize(previousContentSize, _backedTextInputView.contentSize) && _eventEmitter) {
34+
+ if (!CGSizeEqualToSize(_previousContentSize, _backedTextInputView.contentSize) && _eventEmitter) {
35+
+ _previousContentSize = _backedTextInputView.contentSize;
36+
static_cast<const TextInputEventEmitter &>(*_eventEmitter).onContentSizeChange([self _textInputMetrics]);
37+
}
38+
}

src/CONST/index.ts

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ const CONST = {
236236
ANIMATION_THUMBS_UP_DELAY: 200,
237237
ANIMATION_PAID_BUTTON_HIDE_DELAY: 300,
238238
BACKGROUND_IMAGE_TRANSITION_DURATION: 1000,
239-
IMAGE_SVG_TRANSITION_DURATION: 200,
240239
SCREEN_TRANSITION_END_TIMEOUT: 1000,
241240
LIMIT_TIMEOUT: 2147483647,
242241
ARROW_HIDE_DELAY: 3000,
@@ -5205,7 +5204,7 @@ const CONST = {
52055204
* The maximum count of items per page for SelectionList.
52065205
* When paginate, it multiplies by page number.
52075206
*/
5208-
MAX_SELECTION_LIST_PAGE_LENGTH: 50,
5207+
MAX_SELECTION_LIST_PAGE_LENGTH: 500,
52095208

52105209
/**
52115210
* Bank account names
@@ -6422,20 +6421,6 @@ const CONST = {
64226421
ONYXKEYS.PERSONAL_DETAILS_LIST,
64236422
ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS,
64246423
],
6425-
SEARCH_LIST: {
6426-
EXPENSES: 'expenses',
6427-
REPORTS: 'reports',
6428-
CHATS: 'chats',
6429-
SUBMIT: 'submit',
6430-
APPROVE: 'approve',
6431-
PAY: 'pay',
6432-
EXPORT: 'export',
6433-
STATEMENTS: 'statements',
6434-
UNAPPROVED_CASH: 'unapprovedCash',
6435-
UNAPPROVED_COMPANY_CARDS: 'unapprovedCompanyCards',
6436-
UNAPPROVED_CASH_ONLY: 'unapprovedCashOnly',
6437-
UNAPPROVED_COMPANY_CARDS_ONLY: 'unapprovedCompanyCardsOnly',
6438-
},
64396424
SEARCH_KEYS: {
64406425
EXPENSES: 'expenses',
64416426
REPORTS: 'reports',

0 commit comments

Comments
 (0)