From f5bd4f98c848035d218b56a2f45d16033d5d10e8 Mon Sep 17 00:00:00 2001
From: Leya Salazar <96083374+leyasalazar@users.noreply.github.com>
Date: Thu, 31 Aug 2023 14:20:13 -0500
Subject: [PATCH] ui/components: Convert NewUserSetUp to ts (#3242)

* convert NewUserSetUp to ts

* updated userId type to string

* changed to single  quotation
---
 .../app/main/components/{NewUserSetup.js => NewUserSetup.tsx} | 4 ++--
 web/src/app/util/RequireConfig.tsx                            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename web/src/app/main/components/{NewUserSetup.js => NewUserSetup.tsx} (93%)

diff --git a/web/src/app/main/components/NewUserSetup.js b/web/src/app/main/components/NewUserSetup.tsx
similarity index 93%
rename from web/src/app/main/components/NewUserSetup.js
rename to web/src/app/main/components/NewUserSetup.tsx
index 7863f387fa..1aafc8e3e2 100644
--- a/web/src/app/main/components/NewUserSetup.js
+++ b/web/src/app/main/components/NewUserSetup.tsx
@@ -4,14 +4,14 @@ import UserContactMethodVerificationDialog from '../../users/UserContactMethodVe
 import { useSessionInfo } from '../../util/RequireConfig'
 import { useResetURLParams, useURLParam } from '../../actions'
 
-export default function NewUserSetup() {
+export default function NewUserSetup(): JSX.Element {
   const [isFirstLogin] = useURLParam('isFirstLogin', '')
   const clearIsFirstLogin = useResetURLParams('isFirstLogin')
   const [contactMethodID, setContactMethodID] = useState('')
   const { userID, ready } = useSessionInfo()
 
   if (!isFirstLogin || !ready) {
-    return null
+    return <React.Fragment />
   }
   if (contactMethodID) {
     return (
diff --git a/web/src/app/util/RequireConfig.tsx b/web/src/app/util/RequireConfig.tsx
index f7a9723439..c7406c118c 100644
--- a/web/src/app/util/RequireConfig.tsx
+++ b/web/src/app/util/RequireConfig.tsx
@@ -14,7 +14,7 @@ const ConfigContext = React.createContext({
   integrationKeyTypes: [] as IntegrationKeyTypeInfo[],
   config: [] as ConfigValue[],
   isAdmin: false as boolean,
-  userID: null as string | null,
+  userID: '' as string,
   userName: null as string | null,
 })
 ConfigContext.displayName = 'ConfigContext'
@@ -94,7 +94,7 @@ const mapConfig = (value: ConfigValue[]): ConfigData => {
 
 export type SessionInfo = {
   isAdmin: boolean
-  userID: string | null
+  userID: string
   userName: string | null
   ready: boolean
 }