test(identity): revert redefining ENV and adapt controller init to match

Signed-off-by: Mircea Nistor <mirceanis@gmail.com>

Author: mirceanis

app/scripts/controller-init/identity/authentication-controller-init.ts

@@ -5,7 +5,7 @@ import {
 import { Env, Platform } from '@metamask/profile-sync-controller/sdk';
 import { ControllerInitFunction } from '../types';
 import { AuthenticationControllerMessenger } from '../messengers/identity';
-import { isProduction } from '../../../../shared/modules/environment';
+import { isDevOrTestBuild } from '../../services/oauth/config';
 
 /**
  * Initialize the Authentication controller.
@@ -22,7 +22,7 @@ export const AuthenticationControllerInit: ControllerInitFunction<
 > = ({ controllerMessenger, persistedState, getMetaMetricsId }) => {
   const controller = new AuthenticationController({
     config: {
-      env: isProduction() ? Env.PRD : Env.DEV,
+      env: isDevOrTestBuild() ? Env.DEV : Env.PRD,
     },
     messenger: controllerMessenger,
     state:

app/scripts/controller-init/identity/user-storage-controller-init.ts

@@ -6,12 +6,12 @@ import {
 import { captureException } from '@sentry/browser';
 import { Env } from '@metamask/profile-sync-controller/sdk';
 import { ControllerInitFunction } from '../types';
-import { isProduction } from '../../../../shared/modules/environment';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { trace } from '../../../../shared/lib/trace';
+import { isDevOrTestBuild } from '../../services/oauth/config';
 
 /**
  * Initialize the UserStorage controller.
@@ -32,9 +32,9 @@ export const UserStorageControllerInit: ControllerInitFunction<
     // @ts-expect-error Controller uses string for names rather than enum
     trace,
     config: {
-      env: isProduction() ? Env.PRD : Env.DEV,
+      env: isDevOrTestBuild() ? Env.DEV : Env.PRD,
       accountSyncing: {
-        maxNumberOfAccountsToAdd: isProduction() ? undefined : 100,
+        maxNumberOfAccountsToAdd: isDevOrTestBuild() ? 100 : undefined,
         onAccountAdded: (profileId) => {
           trackEvent({
             category: MetaMetricsEventCategory.BackupAndSync,

development/build/constants.js

@@ -22,7 +22,7 @@ const ENVIRONMENT = {
   PULL_REQUEST: 'pull-request',
   RELEASE_CANDIDATE: 'release-candidate',
   STAGING: 'staging',
-  TESTING: 'test',
+  TESTING: 'testing',
 };
 
 const TASKS = {

shared/modules/environment.test.ts

@@ -22,7 +22,7 @@ describe('isProduction', () => {
     expect(isProduction()).toBe(false);
   });
 
-  it('should return false when ENVIRONMENT is "test"', () => {
+  it('should return false when ENVIRONMENT is "testing"', () => {
     process.env.METAMASK_ENVIRONMENT = ENVIRONMENT.TESTING;
     expect(isProduction()).toBe(false);
   });

ui/selectors/selectors.js

@@ -1863,7 +1863,7 @@ export function getIsSwapsChain(state, overrideChainId) {
   const chainId = overrideChainId ?? currentChainId;
   const isDevelopment =
     process.env.METAMASK_ENVIRONMENT === 'development' ||
-    process.env.METAMASK_ENVIRONMENT === 'test';
+    process.env.METAMASK_ENVIRONMENT === 'testing';
   return isDevelopment
     ? ALLOWED_DEV_SWAPS_CHAIN_IDS.includes(chainId)
     : ALLOWED_PROD_SWAPS_CHAIN_IDS.includes(chainId);