Skip to content

Commit c26d43b

Browse files
committed
Merge branch 'main' of https://github.com/TaduJR/App into refactor-decompose-popover-menu
# Conflicts: # Mobile-Expensify # android/app/build.gradle # ios/NewExpensify/Info.plist # ios/NotificationServiceExtension/Info.plist # ios/ShareViewController/Info.plist # package-lock.json # package.json # tests/unit/inlineEditing/editableCellHooks.test.ts
2 parents 5e3c327 + d6e4b6f commit c26d43b

232 files changed

Lines changed: 6362 additions & 3008 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/buildAndroid.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ jobs:
123123
distribution: oracle
124124
java-version: ${{ steps.get-java-version.outputs.version }}
125125

126+
# v6.1.0
126127
- name: Setup Gradle
127-
# v4
128-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
128+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e
129129

130130
- name: Setup 1Password CLI and certificates
131131
uses: Expensify/GitHub-Actions/setup-certificate-1p@main

.github/workflows/publishReactNativeAndroidArtifacts.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ jobs:
160160
distribution: oracle
161161
java-version: ${{ steps.get-java-version.outputs.version }}
162162

163+
# v6.1.0
163164
- name: Setup Gradle
164-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
165+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e
165166

166167
- name: Determine new patched RN version
167168
id: getNewPatchedVersion

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 1009037500
115-
versionName "9.3.75-0"
114+
versionCode 1009037506
115+
versionName "9.3.75-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"
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

config/eslint/eslint.config.mjs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,6 @@ const config = defineConfig([
402402
selector: 'CallExpression[callee.object.name="React"][callee.property.name="forwardRef"]',
403403
message: 'forwardRef is deprecated. Please use ref as a prop instead. See: contributingGuides/STYLE.md#forwarding-refs',
404404
},
405-
{
406-
selector: 'CallExpression[callee.name="getUrlWithBackToParam"]',
407-
message:
408-
'Usage of getUrlWithBackToParam function is prohibited. This is legacy code and no new occurrences should be added. Please look into the `How to remove backTo from URL` section in contributingGuides/NAVIGATION.md. and use alternative routing methods instead.',
409-
},
410405
{
411406
selector: 'ImportNamespaceSpecifier[parent.source.value=/^@libs/]',
412407
message: 'Namespace imports from @libs are not allowed. Use named imports instead. Example: import { method } from "@libs/module"',

config/eslint/eslint.seatbelt.tsv

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"../../src/Expensify.tsx" "react-hooks/set-state-in-effect" 1
1919
"../../src/GlobalModals.tsx" "no-restricted-syntax" 2
2020
"../../src/ONYXKEYS.ts" "no-restricted-syntax" 2
21+
"../../src/ROUTES.ts" "@typescript-eslint/no-deprecated/getUrlWithBackToParam" 176
2122
"../../src/components/AccountingConnectionConfirmationModal.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
2223
"../../src/components/ActionSheetAwareScrollView/useActionSheetAwareScrollViewRef.ts" "react-hooks/immutability" 1
2324
"../../src/components/ActionSheetAwareScrollView/useActionSheetKeyboardSpacing.ts" "@typescript-eslint/no-deprecated/useScrollViewOffset" 1
@@ -170,8 +171,8 @@
170171
"../../src/components/Search/SearchSingleSelectionPicker.tsx" "react-hooks/set-state-in-effect" 1
171172
"../../src/components/Search/index.tsx" "no-restricted-imports" 1
172173
"../../src/components/Search/index.tsx" "react-hooks/preserve-manual-memoization" 2
173-
"../../src/components/Search/index.tsx" "react-hooks/refs" 30
174-
"../../src/components/Search/index.tsx" "react-hooks/set-state-in-effect" 2
174+
"../../src/components/Search/index.tsx" "react-hooks/refs" 5
175+
"../../src/components/Search/index.tsx" "react-hooks/set-state-in-effect" 1
175176
"../../src/components/SidePanel/SidePanelOverlay.tsx" "no-restricted-syntax" 1
176177
"../../src/components/SignInButtons/IconButton.tsx" "no-restricted-syntax" 1
177178
"../../src/components/SingleOptionSelector.tsx" "no-restricted-syntax" 1
@@ -225,6 +226,7 @@
225226
"../../src/hooks/useNewTransactions.ts" "react-hooks/refs" 2
226227
"../../src/hooks/useOutstandingBalanceGuard.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
227228
"../../src/hooks/usePaymentOptions.ts" "react-hooks/refs" 1
229+
"../../src/hooks/usePersonalDetailSearchSelector/index.native.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
228230
"../../src/hooks/usePrevious.ts" "react-hooks/refs" 1
229231
"../../src/hooks/useProactiveAppReview.ts" "react-hooks/purity" 1
230232
"../../src/hooks/useRestoreInputFocus/index.android.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
@@ -234,7 +236,7 @@
234236
"../../src/hooks/useSearchBulkActions.ts" "react-hooks/preserve-manual-memoization" 2
235237
"../../src/hooks/useSearchBulkActions.ts" "react-hooks/refs" 1
236238
"../../src/hooks/useSearchHighlightAndScroll.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
237-
"../../src/hooks/useSearchSelector.native.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
239+
"../../src/hooks/useSearchSelector/index.native.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
238240
"../../src/hooks/useSelectionModeReportActions.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
239241
"../../src/hooks/useSidebarOrderedReports.tsx" "react-hooks/purity" 1
240242
"../../src/hooks/useSidebarOrderedReports.tsx" "react-hooks/refs" 5

cspell.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,10 @@
930930
"Kolkata",
931931
"lintrk",
932932
"Fbclid",
933-
"Gclid"
933+
"Gclid",
934+
"autocorrection",
935+
"BambooHr",
936+
"HiBob"
934937
],
935938
"ignorePaths": [
936939
".gitignore",

docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ To manage how reports are exported from Expensify to NetSuite:
7676
- **Invoice Item** – Select or create the item line for invoices
7777
- **Export Foreign Currency Amount** – Enable to export original currency values
7878
- **Export to Next Open Period** – Enable to skip closed periods and use the next available NetSuite period
79-
- **Export Expensify Travel Payable To** – If Expensify Travel's Central invoicing feature is enabled, configure where travel card expenses are exported:
79+
- **Export Expensify Travel Payable To** – If Expensify Travel's Travel invoicing feature is enabled, configure where travel card expenses are exported:
8080
- **Travel payable account** – Select the payable account for Expensify Travel expenses
8181

8282
3. Click the **three-dot icon** > **Sync Now** to apply changes

0 commit comments

Comments
 (0)