diff --git a/native/account/logged-out-staff-info.react.js b/native/account/logged-out-staff-info.react.js --- a/native/account/logged-out-staff-info.react.js +++ b/native/account/logged-out-staff-info.react.js @@ -4,13 +4,13 @@ import { Text, View } from 'react-native'; import SWMansionIcon from '../components/swmansion-icon.react.js'; -import { StaffContext } from '../staff/staff-context.js'; +import { useStaffContext } from '../staff/staff-context.provider.react.js'; import { useStyles, useColors } from '../themes/colors.js'; import { isStaffRelease, useStaffCanSee } from '../utils/staff-utils.js'; function LoggedOutStaffInfo(): React.Node { const staffCanSee = useStaffCanSee(); - const { staffUserHasBeenLoggedIn } = React.useContext(StaffContext); + const { staffUserHasBeenLoggedIn } = useStaffContext(); const styles = useStyles(unboundStyles); const colors = useColors(); diff --git a/native/data/sqlite-data-handler.js b/native/data/sqlite-data-handler.js --- a/native/data/sqlite-data-handler.js +++ b/native/data/sqlite-data-handler.js @@ -27,7 +27,7 @@ import { commCoreModule } from '../native-modules.js'; import { setStoreLoadedActionType } from '../redux/action-types.js'; import { useSelector } from '../redux/redux-utils.js'; -import { StaffContext } from '../staff/staff-context.js'; +import { useStaffContext } from '../staff/staff-context.provider.react.js'; import Alert from '../utils/alert.js'; import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js'; import { isTaskCancelledError } from '../utils/error-handling.js'; @@ -53,7 +53,7 @@ const urlPrefix = useSelector(urlPrefixSelector(ashoatKeyserverID)); invariant(urlPrefix, "missing urlPrefix for ashoat's keyserver"); const staffCanSee = useStaffCanSee(); - const { staffUserHasBeenLoggedIn } = React.useContext(StaffContext); + const { staffUserHasBeenLoggedIn } = useStaffContext(); const loggedIn = useSelector(isLoggedIn); const currentLoggedInUserID = useSelector(state => state.currentUserInfo?.anonymous ? undefined : state.currentUserInfo?.id, diff --git a/native/profile/build-info.react.js b/native/profile/build-info.react.js --- a/native/profile/build-info.react.js +++ b/native/profile/build-info.react.js @@ -9,7 +9,7 @@ import type { ProfileNavigationProp } from './profile.react.js'; import type { NavigationRoute } from '../navigation/route-names.js'; import { persistConfig, codeVersion } from '../redux/persist.js'; -import { StaffContext } from '../staff/staff-context.js'; +import { useStaffContext } from '../staff/staff-context.provider.react.js'; import { useStyles } from '../themes/colors.js'; import { isStaffRelease, useStaffCanSee } from '../utils/staff-utils.js'; @@ -20,7 +20,7 @@ // eslint-disable-next-line no-unused-vars function BuildInfo(props: Props): React.Node { const isCurrentUserStaff = useIsCurrentUserStaff(); - const { staffUserHasBeenLoggedIn } = React.useContext(StaffContext); + const { staffUserHasBeenLoggedIn } = useStaffContext(); const styles = useStyles(unboundStyles); const staffCanSee = useStaffCanSee(); diff --git a/native/staff/staff-context.js b/native/staff/staff-context.js deleted file mode 100644 --- a/native/staff/staff-context.js +++ /dev/null @@ -1,13 +0,0 @@ -// @flow - -import * as React from 'react'; - -export type StaffContextType = { - +staffUserHasBeenLoggedIn: boolean, -}; - -const StaffContext: React.Context = React.createContext({ - staffUserHasBeenLoggedIn: false, -}); - -export { StaffContext }; diff --git a/native/staff/staff-context.provider.react.js b/native/staff/staff-context.provider.react.js --- a/native/staff/staff-context.provider.react.js +++ b/native/staff/staff-context.provider.react.js @@ -4,7 +4,14 @@ import { useIsCurrentUserStaff } from 'lib/shared/staff-utils.js'; -import { StaffContext, type StaffContextType } from './staff-context.js'; +export type StaffContextType = { + +staffUserHasBeenLoggedIn: boolean, +}; + +const StaffContext: React.Context = + React.createContext({ + staffUserHasBeenLoggedIn: false, + }); type Props = { +children: React.Node, @@ -33,4 +40,6 @@ ); } -export { StaffContextProvider }; +const useStaffContext = (): StaffContextType => React.useContext(StaffContext); + +export { StaffContextProvider, useStaffContext };