Skip to content

Commit 7f1eaa2

Browse files
committed
Merge branch 'main' into feat/migrate-issue-new-card-confirm-page-to-use-navigation
2 parents cbf1688 + 825ddb2 commit 7f1eaa2

312 files changed

Lines changed: 5331 additions & 2667 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.

.claude/agents/code-inline-reviewer.md

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -198,39 +198,6 @@ memo(ReportActionItem, (prevProps, nextProps) =>
198198
)
199199
```
200200

201-
---
202-
203-
### [PERF-6] Use specific properties as hook dependencies
204-
205-
- **Search patterns**: `useEffect`, `useMemo`, `useCallback` dependency arrays
206-
207-
- **Condition**: In `useEffect`, `useMemo`, and `useCallback`, specify individual object properties as dependencies instead of passing entire objects.
208-
- **Reasoning**: Passing entire objects as dependencies causes hooks to re-execute whenever any property changes, even unrelated ones. Specifying individual properties creates more granular dependency tracking, reducing unnecessary hook executions and improving performance predictability.
209-
210-
Good:
211-
212-
```tsx
213-
const {amountColumnSize, dateColumnSize, taxAmountColumnSize} = useMemo(() => {
214-
return {
215-
amountColumnSize: transactionItem.isAmountColumnWide ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL,
216-
taxAmountColumnSize: transactionItem.isTaxAmountColumnWide ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL,
217-
dateColumnSize: transactionItem.shouldShowYear ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL,
218-
};
219-
}, [transactionItem.isAmountColumnWide, transactionItem.isTaxAmountColumnWide, transactionItem.shouldShowYear]);
220-
```
221-
222-
Bad:
223-
224-
```tsx
225-
const {amountColumnSize, dateColumnSize, taxAmountColumnSize} = useMemo(() => {
226-
return {
227-
amountColumnSize: transactionItem.isAmountColumnWide ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL,
228-
taxAmountColumnSize: transactionItem.isTaxAmountColumnWide ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL,
229-
dateColumnSize: transactionItem.shouldShowYear ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL,
230-
};
231-
}, [transactionItem]);
232-
```
233-
234201
## Instructions
235202

236203
1. **First, get the list of changed files and their diffs:**

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 1009026500
118-
versionName "9.2.65-0"
117+
versionCode 1009026601
118+
versionName "9.2.66-1"
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"

eslint.config.mjs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,17 @@ const config = defineConfig([
272272
'rulesdir/prefer-underscore-method': 'off',
273273
'rulesdir/prefer-import-module-contents': 'off',
274274
'rulesdir/no-beta-handler': 'error',
275+
'rulesdir/prefer-narrow-hook-dependencies': [
276+
'error',
277+
{
278+
stableObjectPatterns: [
279+
// cSpell:ignore tyles
280+
'[Ss]tyles?$', // Excludes 'style', 'styles', 'themeStyles', etc.
281+
'^theme', // Excludes 'theme', 'themeStyles', 'themeIllustrations', etc.
282+
'[Ii]cons?$', // Excludes 'icon', 'icons', 'expensifyIcons', etc.
283+
],
284+
},
285+
],
275286

276287
// React and React Native specific rules
277288
'react-native-a11y/has-accessibility-hint': ['off'],

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.2.65</string>
26+
<string>9.2.66</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.2.65.0</string>
47+
<string>9.2.66.1</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.2.65</string>
14+
<string>9.2.66</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.65.0</string>
16+
<string>9.2.66.1</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.2.65</string>
14+
<string>9.2.66</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.65.0</string>
16+
<string>9.2.66.1</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.2.65-0",
3+
"version": "9.2.66-1",
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.",
@@ -311,7 +311,7 @@
311311
"electron-builder": "26.0.19",
312312
"eslint": "^9.36.0",
313313
"eslint-config-airbnb-typescript": "^18.0.0",
314-
"eslint-config-expensify": "2.0.99",
314+
"eslint-config-expensify": "2.0.100",
315315
"eslint-config-prettier": "^9.1.0",
316316
"eslint-plugin-jest": "^29.0.1",
317317
"eslint-plugin-jsdoc": "^60.7.0",

src/CONST/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ const CONST = {
16491649
TRIE_INITIALIZATION: 'trie_initialization',
16501650
COMMENT_LENGTH_DEBOUNCE_TIME: 1500,
16511651
SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300,
1652-
MENTION_SUGGESTION_DEBOUNCE_TIME: 100,
1652+
SUGGESTION_DEBOUNCE_TIME: 100,
16531653
RESIZE_DEBOUNCE_TIME: 100,
16541654
UNREAD_UPDATE_DEBOUNCE_TIME: 300,
16551655
SEARCH_FILTER_OPTIONS: 'search_filter_options',
@@ -6634,6 +6634,7 @@ const CONST = {
66346634
HOLD: 'hold',
66356635
UNHOLD: 'unhold',
66366636
DELETE: 'delete',
6637+
REJECT: 'reject',
66376638
CHANGE_REPORT: 'changeReport',
66386639
},
66396640
TRANSACTION_TYPE: {
@@ -7223,6 +7224,7 @@ const CONST = {
72237224
HAS_PHONE_NUMBER_ERROR: 'hasPhoneNumberError',
72247225
HAS_CARD_CONNECTION_ERROR: 'hasCardConnectionError',
72257226
HAS_UBER_CREDENTIALS_ERROR: 'hasUberCredentialsError',
7227+
HAS_PARTIALLY_SETUP_BANK_ACCOUNT_INFO: 'hasPartiallySetupBankAccountInfo',
72267228
},
72277229

72287230
DEBUG: {

0 commit comments

Comments
 (0)