Skip to content

Commit a0d5534

Browse files
committed
Merge remote-tracking branch 'origin/main' into claude-migrateGroupMembersTable
Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com> # Conflicts: # src/pages/DynamicReportParticipantsPage.tsx
2 parents fc3a953 + 8f9ac4c commit a0d5534

100 files changed

Lines changed: 945 additions & 752 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
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009042607
115-
versionName "9.4.26-7"
114+
versionCode 1009042701
115+
versionName "9.4.27-1"
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"

android/app/src/main/java/com/expensify/chat/MainApplication.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.multidex.MultiDexApplication
1414
import com.expensify.chat.bootsplash.BootSplashPackage
1515
import com.expensify.chat.navbar.NavBarManagerPackage
1616
import com.expensify.chat.shortcutManagerModule.ShortcutManagerPackage
17-
import com.margelo.nitro.nitrofetch.AutoPrefetcher
1817
import com.facebook.react.PackageList
1918
import com.facebook.react.ReactApplication
2019
import com.facebook.react.ReactHost
@@ -80,12 +79,6 @@ class MainApplication : MultiDexApplication(), ReactApplication {
8079
// Install certificate pinning for React Native's shared OkHttp client (covers fetch(),
8180
// react-native-blob-util, etc.). Must run before any networking starts.
8281
CertificatePinning.install()
83-
// This is the entrypoint for prefetching with `react-native-nitro-fetch`.
84-
try {
85-
AutoPrefetcher.prefetchOnStart(this)
86-
} catch (_: Throwable) {
87-
System.err.println("Error initializing Nitro `AutoPrefetcher`")
88-
}
8982

9083
loadReactNative(this)
9184

config/eslint/eslint.seatbelt.tsv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
"../../src/components/FullscreenLoadingIndicator.tsx" "@typescript-eslint/no-deprecated/StyleSheet.absoluteFillObject" 1
186186
"../../src/components/GPSInProgressModal/index.native.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
187187
"../../src/components/GPSTripStateChecker/index.native.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
188-
"../../src/components/GrowlNotification/index.tsx" "no-restricted-syntax" 1
189188
"../../src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx" "@typescript-eslint/no-unsafe-type-assertion" 5
190189
"../../src/components/HTMLEngineProvider/HTMLRenderers/AccountManagerLinkRenderer.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
191190
"../../src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1

index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* @format
33
*/
44
// import of polyfills should always be first
5-
import './src/polyfills/NitroFetch';
65
import './src/polyfills/PromiseWithResolvers';
76
import './src/polyfills/requestIdleCallback';
87
import {AppRegistry} from 'react-native';

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.4.26</string>
26+
<string>9.4.27</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.4.26.7</string>
47+
<string>9.4.27.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.4.26</string>
14+
<string>9.4.27</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.4.26.7</string>
16+
<string>9.4.27.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -405,37 +405,7 @@ PODS:
405405
- nanopb/encode (= 3.30910.0)
406406
- nanopb/decode (3.30910.0)
407407
- nanopb/encode (3.30910.0)
408-
- NitroFetch (1.4.3-alpha.1):
409-
- boost
410-
- DoubleConversion
411-
- fast_float
412-
- fmt
413-
- glog
414-
- hermes-engine
415-
- NitroModules
416-
- RCT-Folly
417-
- RCT-Folly/Fabric
418-
- RCTRequired
419-
- RCTTypeSafety
420-
- React-callinvoker
421-
- React-Core
422-
- React-debug
423-
- React-Fabric
424-
- React-featureflags
425-
- React-graphics
426-
- React-ImageManager
427-
- React-jsi
428-
- React-NativeModulesApple
429-
- React-RCTFabric
430-
- React-renderercss
431-
- React-rendererdebug
432-
- React-utils
433-
- ReactCodegen
434-
- ReactCommon/turbomodule/bridging
435-
- ReactCommon/turbomodule/core
436-
- SocketRocket
437-
- Yoga
438-
- NitroModules (0.35.9):
408+
- NitroModules (0.35.0):
439409
- boost
440410
- DoubleConversion
441411
- fast_float
@@ -4339,7 +4309,6 @@ DEPENDENCIES:
43394309
- GzipSwift
43404310
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
43414311
- lottie-react-native (from `../node_modules/lottie-react-native`)
4342-
- NitroFetch (from `../node_modules/react-native-nitro-fetch`)
43434312
- NitroModules (from `../node_modules/react-native-nitro-modules`)
43444313
- "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)"
43454314
- "pusher-websocket-react-native (from `../node_modules/@pusher/pusher-websocket-react-native`)"
@@ -4568,8 +4537,6 @@ EXTERNAL SOURCES:
45684537
:tag: hermes-v250829098.0.4
45694538
lottie-react-native:
45704539
:path: "../node_modules/lottie-react-native"
4571-
NitroFetch:
4572-
:path: "../node_modules/react-native-nitro-fetch"
45734540
NitroModules:
45744541
:path: "../node_modules/react-native-nitro-modules"
45754542
onfido-react-native-sdk:
@@ -4823,7 +4790,7 @@ SPEC CHECKSUMS:
48234790
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
48244791
EXConstants: dadbeba983acc30f855a919658a2b34fbd86615d
48254792
expensify-react-native-background-task: 03c640e1f5649692d058cba48c0a138f024a6dd3
4826-
ExpensifyNitroUtils: b7225649e39a31eab926dc8551c9c64e15b98d47
4793+
ExpensifyNitroUtils: 86109fe1ab88351ed63ffe11b760d537c70019d7
48274794
Expo: ab7a622b0c0fb7bc85791632994da7ba67d4293b
48284795
ExpoAsset: afaa23466e93da462b918bff8d6a9fe15c646dc8
48294796
ExpoAudio: 14c5909ec48267bfc514bb44c546fcf6fac93837
@@ -4869,8 +4836,7 @@ SPEC CHECKSUMS:
48694836
MapboxMaps: f87023cf0d72b180b40ea0b6fb4b2d7db6b73b71
48704837
MapboxMobileEvents: d044b9edbe0ec7df60f6c2c9634fe9a7f449266b
48714838
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
4872-
NitroFetch: f660637ce0da45a9e5cc0f4a1aefe81c7095aab6
4873-
NitroModules: d2d7b8a417d5f498ef5affa78d82113ad8c35c59
4839+
NitroModules: f8c2cc3025e4550aee15ff77c525622bf98e774a
48744840
NWWebSocket: b4741420f1976e1dff4da3edad00c401e4f1d769
48754841
Onfido: 65454f91d10758193c857fd149417f6efbea84c5
48764842
onfido-react-native-sdk: bb8cfd9198e2e97978461d969497d18b37e45ca7

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.4.26</string>
14+
<string>9.4.27</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.4.26.7</string>
16+
<string>9.4.27.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

jest/setup.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,15 +313,6 @@ jest.mock('react-native-nitro-sqlite', () => ({
313313
open: jest.fn(),
314314
}));
315315

316-
jest.mock('react-native-nitro-fetch', () => ({
317-
__esModule: true,
318-
fetch: (...args: Parameters<typeof fetch>) => globalThis.fetch(...args),
319-
prefetchOnAppStart: jest.fn(() => Promise.resolve()),
320-
registerTokenRefresh: jest.fn(),
321-
clearTokenRefresh: jest.fn(),
322-
removeFromAutoPrefetch: jest.fn(() => Promise.resolve()),
323-
}));
324-
325316
jest.mock('@shopify/react-native-skia', () => ({
326317
useFont: jest.fn(() => null),
327318
matchFont: jest.fn(() => null),

0 commit comments

Comments
 (0)