ui/components: Convert NewUserSetUp to ts (#3242)

* convert NewUserSetUp to ts * updated userId type to string * changed to single quotation
target · Aug 31, 2023 · c7d8bdf · c7d8bdf
1 parent 498dbff
commit c7d8bdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/web/src/app/main/components/NewUserSetup.js → web/src/app/main/components/NewUserSetup.tsx b/web/src/app/main/components/NewUserSetup.js → 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
@@ -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
 }