Skip to content

Commit b0452bd

Browse files
committed
Merge branch 'main' of https://github.com/Expensify/App into ikevin127-webDevHeapCrashOptimization
2 parents 1d0a308 + 4b68aa8 commit b0452bd

318 files changed

Lines changed: 8266 additions & 4257 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.

.well-known/apple-app-site-association

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
"/": "/a/*",
1313
"comment": "Profile Page"
1414
},
15+
{
16+
"/": "/home/*",
17+
"comment": "Home Page"
18+
},
19+
{
20+
"/": "/workspaces/*",
21+
"comment": "Workspaces List Page"
22+
},
1523
{
1624
"/": "/settings/*",
1725
"comment": "Profile and app settings"

Mobile-Expensify

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
export default function analytics() {
2-
return {
3-
logEvent: jest.fn(),
4-
};
5-
}
1+
const logEvent = jest.fn();
2+
const getAnalytics = jest.fn();
3+
4+
export {logEvent, getAnalytics};
Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import type {FirebaseCrashlyticsTypes} from '@react-native-firebase/crashlytics';
2-
3-
type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled' | 'setUserId'>;
4-
5-
type CrashlyticsMock = () => CrashlyticsModule;
6-
71
// <App> uses <ErrorBoundary> and we need to mock the imported crashlytics module
82
// due to an error that happens otherwise https://github.com/invertase/react-native-firebase/issues/2475
9-
const crashlyticsMock: CrashlyticsMock = () => ({
10-
log: jest.fn(),
11-
recordError: jest.fn(),
12-
setCrashlyticsCollectionEnabled: jest.fn(),
13-
setUserId: jest.fn(),
14-
});
3+
const getCrashlytics = jest.fn();
4+
const log = jest.fn();
5+
const recordError = jest.fn();
6+
const setCrashlyticsCollectionEnabled = jest.fn();
7+
const setUserId = jest.fn();
158

16-
export default crashlyticsMock;
9+
export {getCrashlytics, log, recordError, setCrashlyticsCollectionEnabled, setUserId};
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
type PerfMock = () => void;
1+
/* eslint-disable import/prefer-default-export */
2+
const getPerformance = jest.fn();
23

3-
const perfMock: PerfMock = () => {};
4-
5-
export default perfMock;
4+
export {getPerformance};

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 1009018401
118-
versionName "9.1.84-1"
117+
versionCode 1009018603
118+
versionName "9.1.86-3"
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"
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 30 additions & 0 deletions
Loading
Lines changed: 28 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)