Small ts warning fix

Author: JamieRuderman

frontend/src/components/OrganizationMemberList.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { State } from '../store'
 import { useSelector } from 'react-redux'
 import { selectAvailableUsers } from '../selectors/organizations'
 import { OrganizationMember } from '../components/OrganizationMember'
@@ -9,7 +8,7 @@ import { List } from '@mui/material'
 type Props = { organization?: IOrganizationState; owner?: IOrganizationMember; enterprise?: boolean }
 
 export const OrganizationMemberList: React.FC<Props> = ({ organization, owner, enterprise }) => {
-  const freeUsers = useSelector((state: State) => selectAvailableUsers(state))
+  const freeUsers = useSelector(selectAvailableUsers)
   const members = organization?.members ? [...organization.members].sort(alphaEmailSort) : []
   return (
     <List>

frontend/src/pages/OrganizationAddPage.tsx

@@ -14,14 +14,10 @@ import { Title } from '../components/Title'
 import { useHistory } from 'react-router-dom'
 
 export const OrganizationAddPage = () => {
-  const { contacts, organization, freeUsers } = useSelector((state: State) => {
-    const organization = selectOrganization(state)
-    return {
-      organization,
-      contacts: state.contacts.all.filter(c => !organization.members.find(s => s.user.id === c.id)) || [],
-      freeUsers: selectAvailableUsers(state),
-    }
-  })
+  const organization = useSelector(selectOrganization)
+  const allContacts = useSelector((state: State) => state.contacts.all)
+  const freeUsers = useSelector(selectAvailableUsers)
+  const contacts = allContacts.filter(c => !organization.members.find(s => s.user.id === c.id)) || []
 
   const [emails, setEmails] = React.useState<string[]>([])
   const [roleId, setRoleId] = React.useState<IOrganizationRoleIdType>(

frontend/src/selectors/organizations.ts

@@ -80,11 +80,6 @@ export const selectLimits = createSelector([selectOrganization], (organization):
   return organization.limits || []
 })
 
-// export const selectResellerLimits = createSelector(
-//   [selectOrganization, optionalCustomerId],
-//   (organization, customerId): ILimit[] => organization.reseller?.customers.find(c => c.id === customerId)?.limits || []
-// )
-
 export const selectLimit = createSelector(
   [selectLimits, optionalSecondParam],
   (limits, limitName): ILimit | undefined => limits.find(limit => limit.name === limitName)
@@ -136,5 +131,5 @@ export const selectOwner = createSelector(
 
 export const selectAvailableUsers = createSelector(
   [state => selectLimit(state, undefined, 'org-users')],
-  (limit): number => Math.max(limit?.value - limit?.actual, 0)
+  (limit): number => Math.max(limit?.value - limit?.actual || -1, 0)
 )