[No QA] fix(environment): resolve module resolution error after renaming to EnvironmentContext

src/components/EnvironmentContext.tsx

@@ -2,7 +2,8 @@ import {DomUtils, parseDocument} from 'htmlparser2';
 import type {ReactElement, ReactNode} from 'react';
 import React, {createContext, useCallback, useEffect, useMemo, useState} from 'react';
 import type {ValueOf} from 'type-fest';
-import {getEnvironment, getEnvironmentURL} from '@libs/Environment/Environment';
+import {getEnvironmentURL} from '@libs/Environment/Environment';
+import getEnvironment from '@libs/Environment/getEnvironment';
 import CONST from '@src/CONST';
 
 type EnvironmentProviderProps = {

src/libs/ApiUtils.ts

@@ -5,7 +5,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Request} from '@src/types/onyx';
 import proxyConfig from '../../config/proxyConfig';
-import {getEnvironment} from './Environment/Environment';
+import getEnvironment from './Environment/getEnvironment';
 
 // To avoid rebuilding native apps, native apps use production config for both staging and prod
 // We use the async environment check because it works on all platforms

src/libs/FraudProtection/GroupIBSdkBridge/index.native.ts

@@ -1,5 +1,6 @@
 import {FP, FPAttributeFormat} from 'group-ib-fp';
-import {getEnvironment, getOldDotEnvironmentURL} from '@libs/Environment/Environment';
+import {getOldDotEnvironmentURL} from '@libs/Environment/Environment';
+import getEnvironment from '@libs/Environment/getEnvironment';
 import Log from '@libs/Log';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';

src/libs/FraudProtection/GroupIBSdkBridge/index.ts

@@ -1,4 +1,5 @@
-import {getEnvironment, getOldDotEnvironmentURL} from '@libs/Environment/Environment';
+import {getOldDotEnvironmentURL} from '@libs/Environment/Environment';
+import getEnvironment from '@libs/Environment/getEnvironment';
 import Log from '@libs/Log';
 import CONST from '@src/CONST';
 import cidMap from './cidMap';

src/libs/Fullstory/index.native.ts

@@ -1,7 +1,7 @@
 import FullStory, {FSPage} from '@fullstory/react-native';
 import {Str} from 'expensify-common';
 import CONST from '@src/CONST';
-import * as Environment from '@src/libs/Environment/Environment';
+import getEnvironment from '@src/libs/Environment/getEnvironment';
 import getChatFSClass from './common';
 import type {Fullstory} from './types';
 
@@ -33,7 +33,7 @@ const FS: Fullstory = {
             // We only use FullStory in production environment. We need to check this here
             // after the init function since this function is also called on updates for
             // UserMetadata onyx key.
-            Environment.getEnvironment().then((envName: string) => {
+            getEnvironment().then((envName: string) => {
                 const isTestEmail = userMetadata.email !== undefined && userMetadata.email.startsWith('fullstory') && userMetadata.email.endsWith(CONST.EMAIL.QA_DOMAIN);
                 if ((CONST.ENVIRONMENT.PRODUCTION !== envName && !isTestEmail) || Str.extractEmailDomain(userMetadata.email ?? '') === CONST.EXPENSIFY_PARTNER_NAME) {
                     return;

src/libs/Fullstory/index.ts

@@ -2,7 +2,7 @@ import {FullStory, init, isInitialized} from '@fullstory/browser';
 import {Str} from 'expensify-common';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
-import * as Environment from '@src/libs/Environment/Environment';
+import getEnvironment from '@src/libs/Environment/getEnvironment';
 import getChatFSClass from './common';
 import type {FSPageLike, Fullstory} from './types';
 
@@ -54,7 +54,7 @@ const FS: Fullstory = {
             return;
         }
         try {
-            Environment.getEnvironment().then((envName: string) => {
+            getEnvironment().then((envName: string) => {
                 const isTestEmail = userMetadata.email !== undefined && userMetadata.email.startsWith('fullstory') && userMetadata.email.endsWith(CONST.EMAIL.QA_DOMAIN);
                 if (
                     (CONST.ENVIRONMENT.PRODUCTION !== envName && !isTestEmail) ||

src/libs/ReportUtils.ts

@@ -85,7 +85,8 @@
 import {convertToDisplayString} from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {hasValidDraftComment} from './DraftCommentUtils';
-import {getEnvironment, getEnvironmentURL} from './Environment/Environment';
+import {getEnvironmentURL} from './Environment/Environment';
+import getEnvironment from './Environment/getEnvironment';
 import type EnvironmentType from './Environment/getEnvironment/types';
 import {getMicroSecondOnyxErrorWithTranslationKey, isReceiptError} from './ErrorUtils';
 import getAttachmentDetails from './fileDownload/getAttachmentDetails';
@@ -920,7 +921,7 @@
 const parsedReportActionMessageCache: Record<string, string> = {};
 
 let conciergeReportID: OnyxEntry<string>;
 Onyx.connect({
     key: ONYXKEYS.CONCIERGE_REPORT_ID,
     callback: (value) => {
         conciergeReportID = value;
@@ -928,7 +929,7 @@
 });
 
 const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         // When signed out, val is undefined
@@ -946,7 +947,7 @@
 let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 let allPersonalDetailLogins: string[];
 let currentUserPersonalDetails: OnyxEntry<PersonalDetails>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
         if (currentUserAccountID) {
@@ -958,14 +959,14 @@
 });
 
 let allReportsDraft: OnyxCollection<Report>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
     waitForCollectionCallback: true,
     callback: (value) => (allReportsDraft = value),
 });
 
 let allPolicies: OnyxCollection<Policy>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
     callback: (value) => (allPolicies = value),
@@ -973,7 +974,7 @@
 
 let allReports: OnyxCollection<Report>;
 let reportsByPolicyID: ReportByPolicyMap;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1014,14 +1015,14 @@
 });
 
 let allBetas: OnyxEntry<Beta[]>;
 Onyx.connect({
     key: ONYXKEYS.BETAS,
     callback: (value) => (allBetas = value),
 });
 
 let allTransactions: OnyxCollection<Transaction> = {};
 let reportsTransactions: Record<string, Transaction[]> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1047,7 +1048,7 @@
 });
 
 let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
     callback: (actions) => {
@@ -1060,7 +1061,7 @@
 
 let allReportMetadata: OnyxCollection<ReportMetadata>;
 const allReportMetadataKeyValue: Record<string, ReportMetadata> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_METADATA,
     waitForCollectionCallback: true,
     callback: (value) => {

src/libs/actions/StatsCounter.ts

@@ -2,11 +2,12 @@ import * as API from '@libs/API';
 import type GraphiteParams from '@libs/API/parameters/GraphiteParams';
 import {READ_COMMANDS} from '@libs/API/types';
 import * as Environment from '@libs/Environment/Environment';
+import getEnvironment from '@libs/Environment/getEnvironment';
 import getPlatform from '@libs/getPlatform';
 import pkg from '../../../package.json';
 
 const StatsCounter = (eventName: string, value = 1) => {
-    Environment.getEnvironment().then((envName) => {
+    getEnvironment().then((envName) => {
         const platform = getPlatform();
         const version = pkg.version.replace(/\./g, '-');
 

src/libs/actions/Timing.ts

@@ -2,6 +2,7 @@ import * as API from '@libs/API';
 import type {SendPerformanceTimingParams} from '@libs/API/parameters';
 import {READ_COMMANDS} from '@libs/API/types';
 import * as Environment from '@libs/Environment/Environment';
+import getEnvironment from '@libs/Environment/getEnvironment';
 import Firebase from '@libs/Firebase';
 import getPlatform from '@libs/getPlatform';
 import Log from '@libs/Log';
@@ -48,7 +49,7 @@ function end(eventName: string, secondaryName = '', maxExecutionTime = 0) {
         Firebase.stopTrace(eventName);
     }
 
-    Environment.getEnvironment().then((envName) => {
+    getEnvironment().then((envName) => {
         const baseEventName = `${envName}.new.expensify.${eventName}`;
         const grafanaEventName = secondaryName ? `${baseEventName}.${secondaryName}` : baseEventName;
 

tests/unit/EnvironmentContextTest.tsx

@@ -7,8 +7,13 @@ import CONST from '@src/CONST';
 const mockGetEnvironment: jest.MockedFunction<() => Promise<string>> = jest.fn();
 const mockGetEnvironmentURL: jest.MockedFunction<() => Promise<string>> = jest.fn();
 
+jest.mock('@libs/Environment/getEnvironment', () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: jest.fn(() => mockGetEnvironment()),
+}));
+
 jest.mock('@libs/Environment/Environment', () => ({
-    getEnvironment: jest.fn().mockImplementation(() => mockGetEnvironment()),
     getEnvironmentURL: jest.fn().mockImplementation(() => mockGetEnvironmentURL()),
 }));