Merge pull request #31824 from VickyStash/ts-migration/update-environ…

…ment-context [TS Migration] Update EnvironmentContext default value
Expensify · Nov 28, 2023 · 6bfef02 · 6bfef02
2 parents 540bedd + afea2b2
commit 6bfef02
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/components/EnvironmentBadge.tsx b/src/components/EnvironmentBadge.tsx
@@ -15,10 +15,10 @@ const ENVIRONMENT_SHORT_FORM = {
 
 function EnvironmentBadge() {
     const styles = useThemeStyles();
-    const {environment} = useEnvironment();
+    const {environment, isProduction} = useEnvironment();
 
     // If we are on production, don't show any badge
-    if (environment === CONST.ENVIRONMENT.PRODUCTION || environment === undefined) {
+    if (isProduction) {
         return null;
     }
 

diff --git a/src/components/ExpensifyWordmark.tsx b/src/components/ExpensifyWordmark.tsx
@@ -30,7 +30,7 @@ function ExpensifyWordmark({isSmallScreenWidth, style}: ExpensifyWordmarkProps)
     const styles = useThemeStyles();
     const {environment} = useEnvironment();
     // PascalCase is required for React components, so capitalize the const here
-    const LogoComponent = environment ? logoComponents[environment] : AdHocLogo;
+    const LogoComponent = logoComponents[environment];
 
     return (
         <>

diff --git a/src/components/withEnvironment.tsx b/src/components/withEnvironment.tsx
@@ -19,7 +19,10 @@ type EnvironmentContextValue = {
     environmentURL: string;
 };
 
-const EnvironmentContext = createContext<EnvironmentContextValue | null>(null);
+const EnvironmentContext = createContext<EnvironmentContextValue>({
+    environment: CONST.ENVIRONMENT.PRODUCTION,
+    environmentURL: CONST.NEW_EXPENSIFY_URL,
+});
 
 function EnvironmentProvider({children}: EnvironmentProviderProps): ReactElement {
     const [environment, setEnvironment] = useState<EnvironmentValue>(CONST.ENVIRONMENT.PRODUCTION);
@@ -47,7 +50,7 @@ export default function withEnvironment<TProps extends EnvironmentContextValue,
     WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>,
 ): (props: Omit<TProps, keyof EnvironmentContextValue> & React.RefAttributes<TRef>) => ReactElement | null {
     function WithEnvironment(props: Omit<TProps, keyof EnvironmentContextValue>, ref: ForwardedRef<TRef>): ReactElement {
-        const {environment, environmentURL} = useContext(EnvironmentContext) ?? {};
+        const {environment, environmentURL} = useContext(EnvironmentContext);
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading

diff --git a/src/hooks/useEnvironment.ts b/src/hooks/useEnvironment.ts
@@ -3,13 +3,13 @@ import {EnvironmentContext} from '@components/withEnvironment';
 import type {EnvironmentContextValue} from '@components/withEnvironment';
 import CONST from '@src/CONST';
 
-type UseEnvironment = Partial<EnvironmentContextValue> & {
+type UseEnvironment = EnvironmentContextValue & {
     isProduction: boolean;
     isDevelopment: boolean;
 };
 
 export default function useEnvironment(): UseEnvironment {
-    const {environment, environmentURL} = useContext(EnvironmentContext) ?? {};
+    const {environment, environmentURL} = useContext(EnvironmentContext);
     return {
         environment,
         environmentURL,

diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts
@@ -462,7 +462,7 @@ function getBorderColorStyle(borderColor: string): ViewStyle {
 /**
  * Returns the width style for the wordmark logo on the sign in page
  */
-function getSignInWordmarkWidthStyle(isSmallScreenWidth: boolean, environment?: ValueOf<typeof CONST.ENVIRONMENT>): ViewStyle {
+function getSignInWordmarkWidthStyle(isSmallScreenWidth: boolean, environment: ValueOf<typeof CONST.ENVIRONMENT>): ViewStyle {
     if (environment === CONST.ENVIRONMENT.DEV) {
         return isSmallScreenWidth ? {width: variables.signInLogoWidthPill} : {width: variables.signInLogoWidthLargeScreenPill};
     }