Merge pull request Expensify#67535 from shubham1206agra/refactor-onyx-22

Removed Onyx.connect in TeachersUnite lib file

Author: danieldoglas

package.json

@@ -46,7 +46,7 @@
     "test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
     "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
-    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=278 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=276 --cache --cache-location=node_modules/.cache/eslint",
     "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",

src/libs/actions/TeachersUnite.ts

@@ -1,16 +1,15 @@
 import Onyx from 'react-native-onyx';
-import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
 import * as API from '@libs/API';
 import type {AddSchoolPrincipalParams, ReferTeachersUniteVolunteerParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PhoneNumber from '@libs/PhoneNumber';
+import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
 import {getPolicy} from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
+import {buildOptimisticChatReport, buildOptimisticCreatedReportAction} from '@libs/ReportUtils';
 import type {OptimisticCreatedReportAction} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList} from '@src/types/onyx';
 
 type CreationData = {
     reportID: string;
@@ -21,27 +20,11 @@ type ReportCreationData = Record<string, CreationData>;
 
 type ExpenseReportActionData = Record<string, OptimisticCreatedReportAction>;
 
-let sessionEmail = '';
-let sessionAccountID = 0;
-Onyx.connect({
-    key: ONYXKEYS.SESSION,
-    callback: (value) => {
-        sessionEmail = value?.email ?? '';
-        sessionAccountID = value?.accountID ?? CONST.DEFAULT_NUMBER_ID;
-    },
-});
-
-let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (value) => (allPersonalDetails = value),
-});
-
 /**
  * @param publicRoomReportID - This is the global reportID for the public room, we'll ignore the optimistic one
  */
 function referTeachersUniteVolunteer(partnerUserID: string, firstName: string, lastName: string, policyID: string, publicRoomReportID: string) {
-    const optimisticPublicRoom = ReportUtils.buildOptimisticChatReport({
+    const optimisticPublicRoom = buildOptimisticChatReport({
         participantList: [],
         reportName: CONST.TEACHERS_UNITE.PUBLIC_ROOM_NAME,
         chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
@@ -80,12 +63,20 @@ function referTeachersUniteVolunteer(partnerUserID: string, firstName: string, l
 /**
  * Optimistically creates a policyExpenseChat for the school principal and passes data to AddSchoolPrincipal
  */
-function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName: string, policyID: string) {
+function addSchoolPrincipal(
+    firstName: string,
+    partnerUserID: string,
+    lastName: string,
+    policyID: string,
+    localCurrencyCode: string | undefined,
+    sessionEmail: string,
+    sessionAccountID: number,
+) {
     const policyName = CONST.TEACHERS_UNITE.POLICY_NAME;
-    const loggedInEmail = PhoneNumber.addSMSDomainIfPhoneNumber(sessionEmail);
+    const loggedInEmail = addSMSDomainIfPhoneNumber(sessionEmail);
     const reportCreationData: ReportCreationData = {};
 
-    const expenseChatData = ReportUtils.buildOptimisticChatReport({
+    const expenseChatData = buildOptimisticChatReport({
         participantList: [sessionAccountID],
         reportName: '',
         chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
@@ -95,7 +86,7 @@ function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName:
         oldPolicyName: policyName,
     });
     const expenseChatReportID = expenseChatData.reportID;
-    const expenseReportCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(sessionEmail);
+    const expenseReportCreatedAction = buildOptimisticCreatedReportAction(sessionEmail);
     const expenseReportActionData: ExpenseReportActionData = {
         [expenseReportCreatedAction.reportActionID]: expenseReportCreatedAction,
     };
@@ -118,7 +109,7 @@ function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName:
                 owner: sessionEmail,
                 // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
                 // eslint-disable-next-line deprecation/deprecation
-                outputCurrency: getPolicy(policyID)?.outputCurrency ?? allPersonalDetails?.[sessionAccountID]?.localCurrencyCode ?? CONST.CURRENCY.USD,
+                outputCurrency: getPolicy(policyID)?.outputCurrency ?? localCurrencyCode ?? CONST.CURRENCY.USD,
                 employeeList: {
                     [sessionEmail]: {
                         role: CONST.POLICY.ROLE.USER,

src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx

@@ -8,6 +8,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -26,13 +27,14 @@ function IntroSchoolPrincipalPage() {
     const {translate} = useLocalize();
     const {isProduction} = useEnvironment();
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
+    const {localCurrencyCode, login, accountID} = useCurrentUserPersonalDetails();
 
     /**
      * Submit form to pass firstName, partnerUserID and lastName
      */
     const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.INTRO_SCHOOL_PRINCIPAL_FORM>) => {
         const policyID = isProduction ? CONST.TEACHERS_UNITE.PROD_POLICY_ID : CONST.TEACHERS_UNITE.TEST_POLICY_ID;
-        TeachersUnite.addSchoolPrincipal(values.firstName.trim(), values.partnerUserID.trim(), values.lastName.trim(), policyID);
+        TeachersUnite.addSchoolPrincipal(values.firstName.trim(), values.partnerUserID.trim(), values.lastName.trim(), policyID, localCurrencyCode, login ?? '', accountID);
     };
 
     /**