Merge branch 'Expensify:main' into fix-focus-behavior

.storybook/webpack.config.js

@@ -25,7 +25,7 @@ module.exports = ({config}) => {
     config.resolve.alias = {
         'react-native-config': 'react-web-config',
         'react-native$': 'react-native-web',
-        '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
+        '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.ts'),
         '@react-navigation/native': path.resolve(__dirname, '../__mocks__/@react-navigation/native'),
 
         // Module alias support for storybook files, coping from `webpack.common.js`

__mocks__/@react-native-clipboard/clipboard.js

@@ -0,0 +1,3 @@
+import MockClipboard from '@react-native-clipboard/clipboard/jest/clipboard-mock';
+
+export default MockClipboard;

__mocks__/@react-native-community/netinfo.ts

@@ -0,0 +1,31 @@
+import {NetInfoCellularGeneration, NetInfoStateType} from '@react-native-community/netinfo';
+import type {addEventListener, configure, fetch, NetInfoState, refresh, useNetInfo} from '@react-native-community/netinfo';
+
+const defaultState: NetInfoState = {
+    type: NetInfoStateType.cellular,
+    isConnected: true,
+    isInternetReachable: true,
+    details: {
+        isConnectionExpensive: true,
+        cellularGeneration: NetInfoCellularGeneration['3g'],
+        carrier: 'T-Mobile',
+    },
+};
+
+type NetInfoMock = {
+    configure: typeof configure;
+    fetch: typeof fetch;
+    refresh: typeof refresh;
+    addEventListener: typeof addEventListener;
+    useNetInfo: typeof useNetInfo;
+};
+
+const netInfoMock: NetInfoMock = {
+    configure: () => {},
+    fetch: () => Promise.resolve(defaultState),
+    refresh: () => Promise.resolve(defaultState),
+    addEventListener: () => () => {},
+    useNetInfo: () => defaultState,
+};
+
+export default netInfoMock;

__mocks__/fileMock.ts

@@ -0,0 +1,3 @@
+const fileMock = 'test-file-stub';
+
+export default fileMock;

__mocks__/react-native-blob-util.ts

@@ -0,0 +1,5 @@
+import type RNFetchBlob from 'react-native-blob-util';
+
+const ReactNativeBlobUtilMock: Partial<typeof RNFetchBlob> = {};
+
+export default ReactNativeBlobUtilMock;

__mocks__/react-native-config.ts

@@ -0,0 +1,8 @@
+import dotenv from 'dotenv';
+import path from 'path';
+
+type ReactNativeConfigMock = dotenv.DotenvParseOutput | undefined;
+
+const reactNativeConfigMock: ReactNativeConfigMock = dotenv.config({path: path.resolve('./.env.example')}).parsed;
+
+export default reactNativeConfigMock;

__mocks__/react-native-device-info.ts

@@ -0,0 +1,6 @@
+import type DeviceInfoModule from 'react-native-device-info';
+import MockDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock';
+
+const DeviceInfo: typeof DeviceInfoModule = MockDeviceInfo;
+
+export default DeviceInfo;

__mocks__/react-native-document-picker.js

@@ -0,0 +1,23 @@
+export default {
+    getConstants: jest.fn(),
+    pick: jest.fn(),
+    releaseSecureAccess: jest.fn(),
+    pickDirectory: jest.fn(),
+
+    types: Object.freeze({
+        allFiles: 'public.item',
+        audio: 'public.audio',
+        csv: 'public.comma-separated-values-text',
+        doc: 'com.microsoft.word.doc',
+        docx: 'org.openxmlformats.wordprocessingml.document',
+        images: 'public.image',
+        pdf: 'com.adobe.pdf',
+        plainText: 'public.plain-text',
+        ppt: 'com.microsoft.powerpoint.ppt',
+        pptx: 'org.openxmlformats.presentationml.presentation',
+        video: 'public.movie',
+        xls: 'com.microsoft.excel.xls',
+        xlsx: 'org.openxmlformats.spreadsheetml.sheet',
+        zip: 'public.zip-archive',
+    }),
+};

__mocks__/react-native-key-command.ts

@@ -0,0 +1,9 @@
+import type {addListener as _addListener, constants as _constants} from 'react-native-key-command';
+
+const registerKeyCommands = () => {};
+const unregisterKeyCommands = () => {};
+const constants: Partial<typeof _constants> = {};
+const eventEmitter = () => {};
+const addListener: typeof _addListener = () => () => {};
+
+export {addListener, constants, eventEmitter, registerKeyCommands, unregisterKeyCommands};

__mocks__/react-native-localize.ts

@@ -0,0 +1,3 @@
+import mockRNLocalize from 'react-native-localize/mock';
+
+module.exports = mockRNLocalize;

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043900
-        versionName "1.4.39-0"
+        versionCode 1001044002
+        versionName "1.4.40-2"
     }
 
     flavorDimensions "default"

android/app/src/main/java/com/expensify/chat/customairshipextender/CustomAirshipExtender.java

@@ -14,8 +14,5 @@ public void onAirshipReady(@NonNull Context context, @NonNull UAirship airship)
 
         CustomNotificationProvider notificationProvider = new CustomNotificationProvider(context, airship.getAirshipConfigOptions());
         pushManager.setNotificationProvider(notificationProvider);
-
-        NotificationListener notificationListener = airship.getPushManager().getNotificationListener();
-        pushManager.setNotificationListener(new CustomNotificationListener(notificationListener, notificationProvider));
     }
 }