Merge pull request #43063 from ShridharGoel/associate-info

Associate crashes with user info

__mocks__/@react-native-firebase/crashlytics.ts

@@ -1,6 +1,6 @@
 import type {FirebaseCrashlyticsTypes} from '@react-native-firebase/crashlytics';
 
-type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled'>;
+type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled' | 'setUserId'>;
 
 type CrashlyticsMock = () => CrashlyticsModule;
 
@@ -10,6 +10,7 @@ const crashlyticsMock: CrashlyticsMock = () => ({
     log: jest.fn(),
     recordError: jest.fn(),
     setCrashlyticsCollectionEnabled: jest.fn(),
+    setUserId: jest.fn(),
 });
 
 export default crashlyticsMock;

src/Expensify.tsx

@@ -31,6 +31,7 @@ import NetworkConnection from './libs/NetworkConnection';
 import PushNotification from './libs/Notification/PushNotification';
 import './libs/Notification/PushNotification/subscribePushNotification';
 import Performance from './libs/Performance';
+import setCrashlyticsUserId from './libs/setCrashlyticsUserId';
 import StartupTimer from './libs/StartupTimer';
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 import './libs/UnreadIndicatorUpdater';
@@ -238,6 +239,13 @@ function Expensify({
         Audio.setAudioModeAsync({playsInSilentModeIOS: true});
     }, []);
 
+    useEffect(() => {
+        if (!isAuthenticated) {
+            return;
+        }
+        setCrashlyticsUserId(session?.accountID ?? -1);
+    }, [isAuthenticated, session?.accountID]);
+
     // Display a blank page until the onyx migration completes
     if (!isOnyxMigrated) {
         return null;

src/components/TestCrash/index.native.tsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import TestToolRow from '@components/TestToolRow';
+import useLocalize from '@hooks/useLocalize';
+import testCrash from '@libs/testCrash';
+import firebase from '../../../firebase.json';
+
+/**
+ * Adds a button in native dev builds to test the crashlytics integration with user info.
+ */
+function TestCrash() {
+    const {translate} = useLocalize();
+
+    const isCrashlyticsDebugEnabled = firebase?.['react-native']?.crashlytics_debug_enabled ?? false;
+
+    const toolRowTitle = translate('initialSettingsPage.troubleshoot.testCrash');
+
+    return (
+        <View>
+            {isCrashlyticsDebugEnabled ? (
+                <TestToolRow title={toolRowTitle}>
+                    <Button
+                        small
+                        text={toolRowTitle}
+                        onPress={testCrash}
+                    />
+                </TestToolRow>
+            ) : null}
+        </View>
+    );
+}
+
+export default TestCrash;

src/components/TestCrash/index.tsx

@@ -0,0 +1,8 @@
+import React from 'react';
+import {View} from 'react-native';
+
+function TestCrash() {
+    return <View />;
+}
+
+export default TestCrash;

src/components/TestToolMenu.tsx

@@ -13,6 +13,7 @@ import type {Network as NetworkOnyx, User as UserOnyx} from '@src/types/onyx';
 import Button from './Button';
 import {withNetwork} from './OnyxProvider';
 import Switch from './Switch';
+import TestCrash from './TestCrash';
 import TestToolRow from './TestToolRow';
 import Text from './Text';
 
@@ -88,6 +89,8 @@ function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) {
                     onPress={() => Session.invalidateCredentials()}
                 />
             </TestToolRow>
+
+            <TestCrash />
         </>
     );
 }

src/languages/en.ts

@@ -1009,6 +1009,7 @@ export default {
             destroy: 'Destroy',
             maskExportOnyxStateData: 'Mask fragile user data while exporting Onyx state',
             exportOnyxState: 'Export Onyx state',
+            testCrash: 'Test crash',
         },
         debugConsole: {
             saveLog: 'Save log',

src/languages/es.ts

@@ -1016,6 +1016,7 @@ export default {
             destroy: 'Destruir',
             maskExportOnyxStateData: 'Enmascare los datos frágiles del usuario mientras exporta el estado Onyx',
             exportOnyxState: 'Exportar estado Onyx',
+            testCrash: 'Prueba de fallo',
         },
         debugConsole: {
             saveLog: 'Guardar registro',

src/libs/setCrashlyticsUserId/index.native.ts

@@ -0,0 +1,7 @@
+import crashlytics from '@react-native-firebase/crashlytics';
+
+const setCrashlyticsUserId = (accountID: string | number) => {
+    crashlytics().setUserId(accountID.toString());
+};
+
+export default setCrashlyticsUserId;

src/libs/setCrashlyticsUserId/index.ts

@@ -0,0 +1,3 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const setCrashlyticsUserId = (_: string | number) => {};
+export default setCrashlyticsUserId;

src/libs/testCrash/index.native.ts

@@ -0,0 +1,6 @@
+import crashlytics from '@react-native-firebase/crashlytics';
+
+const testCrash = () => {
+    crashlytics().crash();
+};
+export default testCrash;

src/libs/testCrash/index.ts

@@ -0,0 +1,2 @@
+const testCrash = () => {};
+export default testCrash;