diff --git a/app/actions/index.ts b/app/actions/index.ts
index b1b25bd04..6985dc934 100644
--- a/app/actions/index.ts
+++ b/app/actions/index.ts
@@ -101,9 +101,7 @@ export function actionToKBar(
       keywords: action.keywords ?? "",
       shortcut: action.shortcut || [],
       icon: resolvedIcon,
-      perform: action.perform
-        ? () => action.perform && action.perform(context)
-        : undefined,
+      perform: action.perform ? () => action?.perform?.(context) : undefined,
     },
     // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
   ].concat(children.map((child) => ({ ...child, parent: action.id })));
diff --git a/app/components/Authenticated.tsx b/app/components/Authenticated.tsx
index 225791c66..976063b50 100644
--- a/app/components/Authenticated.tsx
+++ b/app/components/Authenticated.tsx
@@ -15,7 +15,7 @@ type Props = {
 const Authenticated = ({ children }: Props) => {
   const { auth } = useStores();
   const { i18n } = useTranslation();
-  const language = auth.user && auth.user.language;
+  const language = auth.user?.language;
 
   // Watching for language changes here as this is the earliest point we have
   // the user available and means we can start loading translations faster
diff --git a/app/components/CommandBar.tsx b/app/components/CommandBar.tsx
index 3f63e4caa..5f4efc16d 100644
--- a/app/components/CommandBar.tsx
+++ b/app/components/CommandBar.tsx
@@ -67,7 +67,7 @@ function CommandBar() {
   );
 }
 
-function KBarPortal({ children }: { children: React.ReactNode }) {
+const KBarPortal: React.FC = ({ children }) => {
   const { showing } = useKBar((state) => ({
     showing: state.visualState !== "hidden",
   }));
@@ -77,7 +77,7 @@ function KBarPortal({ children }: { children: React.ReactNode }) {
   }
 
   return <Portal>{children}</Portal>;
-}
+};
 
 const Hint = styled(Text)`
   display: flex;
diff --git a/app/components/ContextMenu/MenuItem.tsx b/app/components/ContextMenu/MenuItem.tsx
index c1354f798..cf033e3f1 100644
--- a/app/components/ContextMenu/MenuItem.tsx
+++ b/app/components/ContextMenu/MenuItem.tsx
@@ -8,7 +8,6 @@ import MenuIconWrapper from "../MenuIconWrapper";
 
 type Props = {
   onClick?: (arg0: React.SyntheticEvent) => void | Promise<void>;
-  children?: React.ReactNode;
   selected?: boolean;
   disabled?: boolean;
   dangerous?: boolean;
@@ -21,7 +20,7 @@ type Props = {
   icon?: React.ReactElement;
 };
 
-const MenuItem = ({
+const MenuItem: React.FC<Props> = ({
   onClick,
   children,
   selected,
@@ -30,7 +29,7 @@ const MenuItem = ({
   hide,
   icon,
   ...rest
-}: Props) => {
+}) => {
   const handleClick = React.useCallback(
     (ev) => {
       if (onClick) {
diff --git a/app/components/ContextMenu/index.tsx b/app/components/ContextMenu/index.tsx
index 735b4069f..893c638ea 100644
--- a/app/components/ContextMenu/index.tsx
+++ b/app/components/ContextMenu/index.tsx
@@ -38,19 +38,18 @@ type Props = {
   visible?: boolean;
   placement?: Placement;
   animating?: boolean;
-  children: React.ReactNode;
   unstable_disclosureRef?: React.RefObject<HTMLElement | null>;
   onOpen?: () => void;
   onClose?: () => void;
   hide?: () => void;
 };
 
-export default function ContextMenu({
+const ContextMenu: React.FC<Props> = ({
   children,
   onOpen,
   onClose,
   ...rest
-}: Props) {
+}) => {
   const previousVisible = usePrevious(rest.visible);
   const maxHeight = useMenuHeight(rest.visible, rest.unstable_disclosureRef);
   const backgroundRef = React.useRef<HTMLDivElement>(null);
@@ -137,7 +136,9 @@ export default function ContextMenu({
       )}
     </>
   );
-}
+};
+
+export default ContextMenu;
 
 export const Backdrop = styled.div`
   animation: ${fadeIn} 200ms ease-in-out;
diff --git a/app/components/DocumentMeta.tsx b/app/components/DocumentMeta.tsx
index c97570555..719f296b1 100644
--- a/app/components/DocumentMeta.tsx
+++ b/app/components/DocumentMeta.tsx
@@ -35,11 +35,10 @@ type Props = {
   showLastViewed?: boolean;
   showParentDocuments?: boolean;
   document: Document;
-  children?: React.ReactNode;
   to?: string;
 };
 
-function DocumentMeta({
+const DocumentMeta: React.FC<Props> = ({
   showPublished,
   showCollection,
   showLastViewed,
@@ -48,7 +47,7 @@ function DocumentMeta({
   children,
   to,
   ...rest
-}: Props) {
+}) => {
   const { t } = useTranslation();
   const { collections } = useStores();
   const user = useCurrentUser();
@@ -172,6 +171,6 @@ function DocumentMeta({
       {children}
     </Container>
   );
-}
+};
 
 export default observer(DocumentMeta);
diff --git a/app/components/ErrorBoundary.tsx b/app/components/ErrorBoundary.tsx
index 1698bed47..83749e0f3 100644
--- a/app/components/ErrorBoundary.tsx
+++ b/app/components/ErrorBoundary.tsx
@@ -10,6 +10,7 @@ import CenteredContent from "~/components/CenteredContent";
 import PageTitle from "~/components/PageTitle";
 import Text from "~/components/Text";
 import env from "~/env";
+import isHosted from "~/utils/isHosted";
 
 type Props = WithTranslation & {
   reloadOnChunkMissing?: boolean;
@@ -61,7 +62,7 @@ class ErrorBoundary extends React.Component<Props> {
 
     if (this.error) {
       const error = this.error;
-      const isReported = !!env.SENTRY_DSN && env.DEPLOYMENT === "hosted";
+      const isReported = !!env.SENTRY_DSN && isHosted;
       const isChunkError = this.error.message.match(/chunk/);
 
       if (isChunkError) {
diff --git a/app/components/LocaleTime.tsx b/app/components/LocaleTime.tsx
index a437828c8..b94785554 100644
--- a/app/components/LocaleTime.tsx
+++ b/app/components/LocaleTime.tsx
@@ -22,7 +22,6 @@ function eachMinute(fn: () => void) {
 
 type Props = {
   dateTime: string;
-  children?: React.ReactNode;
   tooltipDelay?: number;
   addSuffix?: boolean;
   shorten?: boolean;
@@ -30,7 +29,7 @@ type Props = {
   format?: string;
 };
 
-function LocaleTime({
+const LocaleTime: React.FC<Props> = ({
   addSuffix,
   children,
   dateTime,
@@ -38,7 +37,7 @@ function LocaleTime({
   format,
   relative,
   tooltipDelay,
-}: Props) {
+}) => {
   const userLocale = useUserLocale();
   const [_, setMinutesMounted] = React.useState(0); // eslint-disable-line @typescript-eslint/no-unused-vars
   const callback = React.useRef<() => void>();
@@ -86,6 +85,6 @@ function LocaleTime({
       <time dateTime={dateTime}>{children || content}</time>
     </Tooltip>
   );
-}
+};
 
 export default LocaleTime;
diff --git a/app/components/Notice.tsx b/app/components/Notice.tsx
index 8fff91d67..fe6fd10c3 100644
--- a/app/components/Notice.tsx
+++ b/app/components/Notice.tsx
@@ -4,12 +4,11 @@ import Flex from "./Flex";
 import Text from "./Text";
 
 type Props = {
-  children: React.ReactNode;
   icon?: JSX.Element;
   description?: JSX.Element;
 };
 
-const Notice = ({ children, icon, description }: Props) => {
+const Notice: React.FC<Props> = ({ children, icon, description }) => {
   return (
     <Container>
       <Flex as="span" gap={8}>
diff --git a/app/components/NoticeAlert.tsx b/app/components/NoticeAlert.tsx
index 16e0a2b4c..c2d55d574 100644
--- a/app/components/NoticeAlert.tsx
+++ b/app/components/NoticeAlert.tsx
@@ -1,11 +1,7 @@
 import * as React from "react";
 import Notice from "~/components/Notice";
 
-export default function AlertNotice({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+const AlertNotice: React.FC = ({ children }) => {
   return (
     <Notice>
       <svg
@@ -28,4 +24,6 @@ export default function AlertNotice({
       {children}
     </Notice>
   );
-}
+};
+
+export default AlertNotice;
diff --git a/app/components/PageTitle.tsx b/app/components/PageTitle.tsx
index b4aaacaa0..f2c7f777b 100644
--- a/app/components/PageTitle.tsx
+++ b/app/components/PageTitle.tsx
@@ -16,7 +16,7 @@ const PageTitle = ({ title, favicon }: Props) => {
   return (
     <Helmet>
       <title>
-        {team && team.name ? `${title} - ${team.name}` : `${title} - Outline`}
+        {team?.name ? `${title} - ${team.name}` : `${title} - Outline`}
       </title>
       {favicon ? (
         <link rel="shortcut icon" href={favicon} />
diff --git a/app/components/Popover.tsx b/app/components/Popover.tsx
index 1cbc27ad7..2f45b9913 100644
--- a/app/components/Popover.tsx
+++ b/app/components/Popover.tsx
@@ -7,12 +7,11 @@ import useMobile from "~/hooks/useMobile";
 import { fadeAndScaleIn } from "~/styles/animations";
 
 type Props = {
-  children: React.ReactNode;
   tabIndex?: number;
   width?: number;
 };
 
-function Popover({ children, width = 380, ...rest }: Props) {
+const Popover: React.FC<Props> = ({ children, width = 380, ...rest }) => {
   const isMobile = useMobile();
 
   if (isMobile) {
@@ -28,7 +27,7 @@ function Popover({ children, width = 380, ...rest }: Props) {
       <Contents $width={width}>{children}</Contents>
     </ReakitPopover>
   );
-}
+};
 
 const Contents = styled.div<{ $width?: number }>`
   animation: ${fadeAndScaleIn} 200ms ease;
diff --git a/app/components/Scene.tsx b/app/components/Scene.tsx
index 73b3f0722..3d28a21e1 100644
--- a/app/components/Scene.tsx
+++ b/app/components/Scene.tsx
@@ -8,13 +8,12 @@ type Props = {
   icon?: React.ReactNode;
   title?: React.ReactNode;
   textTitle?: string;
-  children: React.ReactNode;
   breadcrumb?: React.ReactNode;
   actions?: React.ReactNode;
   centered?: boolean;
 };
 
-function Scene({
+const Scene: React.FC<Props> = ({
   title,
   icon,
   textTitle,
@@ -22,7 +21,7 @@ function Scene({
   breadcrumb,
   children,
   centered,
-}: Props) {
+}) => {
   return (
     <FillWidth>
       <PageTitle title={textTitle || title} />
@@ -47,7 +46,7 @@ function Scene({
       )}
     </FillWidth>
   );
-}
+};
 
 const FillWidth = styled.div`
   width: 100%;
diff --git a/app/components/Sidebar/App.tsx b/app/components/Sidebar/App.tsx
index fc5ea7b4d..8d0b6106e 100644
--- a/app/components/Sidebar/App.tsx
+++ b/app/components/Sidebar/App.tsx
@@ -25,7 +25,7 @@ import ArchiveLink from "./components/ArchiveLink";
 import Collections from "./components/Collections";
 import Section from "./components/Section";
 import SidebarAction from "./components/SidebarAction";
-import SidebarButton from "./components/SidebarButton";
+import SidebarButton, { SidebarButtonProps } from "./components/SidebarButton";
 import SidebarLink from "./components/SidebarLink";
 import Starred from "./components/Starred";
 import TrashLink from "./components/TrashLink";
@@ -55,7 +55,7 @@ function AppSidebar() {
       {dndArea && (
         <DndProvider backend={HTML5Backend} options={html5Options}>
           <OrganizationMenu>
-            {(props) => (
+            {(props: SidebarButtonProps) => (
               <SidebarButton
                 {...props}
                 title={team.name}
diff --git a/app/components/Sidebar/Settings.tsx b/app/components/Sidebar/Settings.tsx
index 286c709ce..c190963f4 100644
--- a/app/components/Sidebar/Settings.tsx
+++ b/app/components/Sidebar/Settings.tsx
@@ -7,8 +7,8 @@ import { useHistory } from "react-router-dom";
 import styled from "styled-components";
 import Flex from "~/components/Flex";
 import Scrollable from "~/components/Scrollable";
-import env from "~/env";
 import useAuthorizedSettingsConfig from "~/hooks/useAuthorizedSettingsConfig";
+import isHosted from "~/utils/isHosted";
 import Sidebar from "./Sidebar";
 import Header from "./components/Header";
 import Section from "./components/Section";
@@ -16,8 +16,6 @@ import SidebarButton from "./components/SidebarButton";
 import SidebarLink from "./components/SidebarLink";
 import Version from "./components/Version";
 
-const isHosted = env.DEPLOYMENT === "hosted";
-
 function SettingsSidebar() {
   const { t } = useTranslation();
   const history = useHistory();
diff --git a/app/components/Sidebar/Sidebar.tsx b/app/components/Sidebar/Sidebar.tsx
index 4a08ceb5f..8c85c5a1f 100644
--- a/app/components/Sidebar/Sidebar.tsx
+++ b/app/components/Sidebar/Sidebar.tsx
@@ -13,7 +13,7 @@ import AccountMenu from "~/menus/AccountMenu";
 import { fadeIn } from "~/styles/animations";
 import Avatar from "../Avatar";
 import ResizeBorder from "./components/ResizeBorder";
-import SidebarButton from "./components/SidebarButton";
+import SidebarButton, { SidebarButtonProps } from "./components/SidebarButton";
 import Toggle, { ToggleButton, Positioner } from "./components/Toggle";
 
 const ANIMATION_MS = 250;
@@ -170,7 +170,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(
 
           {user && (
             <AccountMenu>
-              {(props) => (
+              {(props: SidebarButtonProps) => (
                 <SidebarButton
                   {...props}
                   showMoreMenu
diff --git a/app/components/Sidebar/components/DocumentLink.tsx b/app/components/Sidebar/components/DocumentLink.tsx
index d903a423a..772ff9973 100644
--- a/app/components/Sidebar/components/DocumentLink.tsx
+++ b/app/components/Sidebar/components/DocumentLink.tsx
@@ -66,8 +66,7 @@ function DocumentLink(
   }, [fetchChildDocuments, node, hasChildDocuments, isActiveDocument]);
 
   const pathToNode = React.useMemo(
-    () =>
-      collection && collection.pathToDocument(node.id).map((entry) => entry.id),
+    () => collection?.pathToDocument(node.id).map((entry) => entry.id),
     [collection, node]
   );
 
diff --git a/app/components/Sidebar/components/Header.tsx b/app/components/Sidebar/components/Header.tsx
index 32f361610..e779b3b46 100644
--- a/app/components/Sidebar/components/Header.tsx
+++ b/app/components/Sidebar/components/Header.tsx
@@ -5,10 +5,9 @@ import styled from "styled-components";
 type Props = {
   onClick?: React.MouseEventHandler;
   expanded?: boolean;
-  children: React.ReactNode;
 };
 
-export function Header({ onClick, expanded, children }: Props) {
+export const Header: React.FC<Props> = ({ onClick, expanded, children }) => {
   return (
     <H3>
       <Button onClick={onClick} disabled={!onClick}>
@@ -19,7 +18,7 @@ export function Header({ onClick, expanded, children }: Props) {
       </Button>
     </H3>
   );
-}
+};
 
 const Button = styled.button`
   display: inline-flex;
diff --git a/app/components/Sidebar/components/NavLink.tsx b/app/components/Sidebar/components/NavLink.tsx
index 7ba8010ec..2295e4c66 100644
--- a/app/components/Sidebar/components/NavLink.tsx
+++ b/app/components/Sidebar/components/NavLink.tsx
@@ -70,7 +70,7 @@ const NavLink = ({
   const { pathname: path } = toLocation;
 
   // Regex taken from: https://github.com/pillarjs/path-to-regexp/blob/master/index.js#L202
-  const escapedPath = path && path.replace(/([.+*?=^!:${}()[\]|/\\])/g, "\\$1");
+  const escapedPath = path?.replace(/([.+*?=^!:${}()[\]|/\\])/g, "\\$1");
   const match = escapedPath
     ? matchPath(currentLocation.pathname, {
         path: escapedPath,
diff --git a/app/components/Sidebar/components/SidebarButton.tsx b/app/components/Sidebar/components/SidebarButton.tsx
index fc3378f98..a23e0e87c 100644
--- a/app/components/Sidebar/components/SidebarButton.tsx
+++ b/app/components/Sidebar/components/SidebarButton.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import styled from "styled-components";
 import Flex from "~/components/Flex";
 
-type Props = {
+export type SidebarButtonProps = {
   title: React.ReactNode;
   image: React.ReactNode;
   minHeight?: number;
@@ -13,7 +13,7 @@ type Props = {
   onClick: React.MouseEventHandler<HTMLButtonElement>;
 };
 
-const SidebarButton = React.forwardRef<HTMLButtonElement, Props>(
+const SidebarButton = React.forwardRef<HTMLButtonElement, SidebarButtonProps>(
   (
     {
       showDisclosure,
@@ -22,7 +22,7 @@ const SidebarButton = React.forwardRef<HTMLButtonElement, Props>(
       title,
       minHeight = 0,
       ...rest
-    }: Props,
+    }: SidebarButtonProps,
     ref
   ) => (
     <Wrapper
diff --git a/app/components/SocketProvider.tsx b/app/components/SocketProvider.tsx
index c083addab..3d6541c1a 100644
--- a/app/components/SocketProvider.tsx
+++ b/app/components/SocketProvider.tsx
@@ -22,9 +22,7 @@ export const SocketContext: any = React.createContext<SocketWithAuthentication |
   null
 );
 
-type Props = RootStore & {
-  children: React.ReactNode;
-};
+type Props = RootStore;
 
 @observer
 class SocketProvider extends React.Component<Props> {
@@ -46,7 +44,7 @@ class SocketProvider extends React.Component<Props> {
   }
 
   checkConnection = () => {
-    if (this.socket && this.socket.disconnected && getPageVisible()) {
+    if (this.socket?.disconnected && getPageVisible()) {
       // null-ifying this reference is important, do not remove. Without it
       // references to old sockets are potentially held in context
       this.socket.close();
@@ -102,10 +100,9 @@ class SocketProvider extends React.Component<Props> {
     // connection may have failed (caused by proxy, firewall, browser, ...)
     this.socket.on("reconnect_attempt", () => {
       if (this.socket) {
-        this.socket.io.opts.transports =
-          auth.team && auth.team.domain
-            ? ["websocket"]
-            : ["websocket", "polling"];
+        this.socket.io.opts.transports = auth?.team?.domain
+          ? ["websocket"]
+          : ["websocket", "polling"];
       }
     });
 
@@ -210,10 +207,7 @@ class SocketProvider extends React.Component<Props> {
           // if we already have the latest version (it was us that performed
           // the change) then we don't need to update anything either.
 
-          if (
-            collection &&
-            collection.updatedAt === collectionDescriptor.updatedAt
-          ) {
+          if (collection?.updatedAt === collectionDescriptor.updatedAt) {
             continue;
           }
 
diff --git a/app/components/Subheading.tsx b/app/components/Subheading.tsx
index 85bd5e767..d165fc6f8 100644
--- a/app/components/Subheading.tsx
+++ b/app/components/Subheading.tsx
@@ -2,7 +2,6 @@ import * as React from "react";
 import styled from "styled-components";
 
 type Props = {
-  children: React.ReactNode;
   sticky?: boolean;
 };
 
@@ -34,7 +33,7 @@ const Background = styled.div<{ sticky?: boolean }>`
   z-index: 1;
 `;
 
-const Subheading = ({ children, sticky, ...rest }: Props) => {
+const Subheading: React.FC<Props> = ({ children, sticky, ...rest }) => {
   return (
     <Background sticky={sticky}>
       <H3 {...rest}>
diff --git a/app/components/Tab.tsx b/app/components/Tab.tsx
index 8f8dac6f8..4d12f6a49 100644
--- a/app/components/Tab.tsx
+++ b/app/components/Tab.tsx
@@ -9,7 +9,6 @@ type Props = Omit<
 > & {
   to: string;
   exact?: boolean;
-  children: React.ReactNode;
 };
 
 const TabLink = styled(NavLinkWithChildrenFunc)`
@@ -45,7 +44,7 @@ const transition = {
   damping: 30,
 };
 
-export default function Tab({ children, ...rest }: Props) {
+const Tab: React.FC<Props> = ({ children, ...rest }) => {
   const theme = useTheme();
   const activeStyle = {
     color: theme.textSecondary,
@@ -67,4 +66,6 @@ export default function Tab({ children, ...rest }: Props) {
       )}
     </TabLink>
   );
-}
+};
+
+export default Tab;
diff --git a/app/components/Tabs.tsx b/app/components/Tabs.tsx
index 0805d12d6..e4939e58e 100644
--- a/app/components/Tabs.tsx
+++ b/app/components/Tabs.tsx
@@ -56,7 +56,7 @@ export const Separator = styled.span`
   margin-top: 6px;
 `;
 
-const Tabs = ({ children }: { children: React.ReactNode }) => {
+const Tabs: React.FC = ({ children }) => {
   const ref = React.useRef<any>();
   const [shadowVisible, setShadow] = React.useState(false);
   const { width } = useWindowSize();
diff --git a/app/components/Theme.tsx b/app/components/Theme.tsx
index eb85af31b..c434e1ee5 100644
--- a/app/components/Theme.tsx
+++ b/app/components/Theme.tsx
@@ -6,11 +6,7 @@ import useMediaQuery from "~/hooks/useMediaQuery";
 import useStores from "~/hooks/useStores";
 import GlobalStyles from "~/styles/globals";
 
-type Props = {
-  children: React.ReactNode;
-};
-
-function Theme({ children }: Props) {
+const Theme: React.FC = ({ children }) => {
   const { ui } = useStores();
   const resolvedTheme = ui.resolvedTheme === "dark" ? dark : light;
   const resolvedMobileTheme =
@@ -37,6 +33,6 @@ function Theme({ children }: Props) {
       </>
     </ThemeProvider>
   );
-}
+};
 
 export default observer(Theme);
diff --git a/app/editor/components/CommandMenu.tsx b/app/editor/components/CommandMenu.tsx
index 0d87a0b89..2ace5b25e 100644
--- a/app/editor/components/CommandMenu.tsx
+++ b/app/editor/components/CommandMenu.tsx
@@ -139,7 +139,7 @@ class CommandMenu<T = MenuItem> extends React.Component<Props<T>, State> {
         this.setState({
           selectedIndex: Math.max(
             0,
-            prev && prev.name === "separator" ? prevIndex - 1 : prevIndex
+            prev?.name === "separator" ? prevIndex - 1 : prevIndex
           ),
         });
       } else {
@@ -162,7 +162,7 @@ class CommandMenu<T = MenuItem> extends React.Component<Props<T>, State> {
 
         this.setState({
           selectedIndex: Math.min(
-            next && next.name === "separator" ? nextIndex + 1 : nextIndex,
+            next?.name === "separator" ? nextIndex + 1 : nextIndex,
             total
           ),
         });
diff --git a/app/editor/components/SelectionToolbar.tsx b/app/editor/components/SelectionToolbar.tsx
index f71f14a09..55e1ec598 100644
--- a/app/editor/components/SelectionToolbar.tsx
+++ b/app/editor/components/SelectionToolbar.tsx
@@ -191,8 +191,7 @@ export default class SelectionToolbar extends React.Component<Props> {
     const isTableSelection = colIndex !== undefined && rowIndex !== undefined;
     const link = isMarkActive(state.schema.marks.link)(state);
     const range = getMarkRange(selection.$from, state.schema.marks.link);
-    const isImageSelection =
-      selection.node && selection.node.type.name === "image";
+    const isImageSelection = selection.node?.type?.name === "image";
     let isTextSelection = false;
 
     let items: MenuItem[] = [];
diff --git a/app/editor/components/Tooltip.tsx b/app/editor/components/Tooltip.tsx
index 6dc9fc308..670a8eabe 100644
--- a/app/editor/components/Tooltip.tsx
+++ b/app/editor/components/Tooltip.tsx
@@ -3,11 +3,10 @@ import styled from "styled-components";
 import Tooltip from "~/components/Tooltip";
 
 type Props = {
-  children: React.ReactNode;
   tooltip?: string;
 };
 
-const WrappedTooltip = ({ children, tooltip }: Props) => (
+const WrappedTooltip: React.FC<Props> = ({ children, tooltip }) => (
   <Tooltip offset="0, 8" delay={150} tooltip={tooltip} placement="top">
     <TooltipContent>{children}</TooltipContent>
   </Tooltip>
diff --git a/app/hooks/useAuthorizedSettingsConfig.ts b/app/hooks/useAuthorizedSettingsConfig.ts
index fe96f5648..016af6ff9 100644
--- a/app/hooks/useAuthorizedSettingsConfig.ts
+++ b/app/hooks/useAuthorizedSettingsConfig.ts
@@ -29,6 +29,7 @@ import Zapier from "~/scenes/Settings/Zapier";
 import SlackIcon from "~/components/SlackIcon";
 import ZapierIcon from "~/components/ZapierIcon";
 import env from "~/env";
+import isHosted from "~/utils/isHosted";
 import useCurrentTeam from "./useCurrentTeam";
 import usePolicy from "./usePolicy";
 
@@ -61,8 +62,6 @@ type ConfigType = {
   [key in SettingsPage]: ConfigItem;
 };
 
-const isHosted = env.DEPLOYMENT === "hosted";
-
 const useAuthorizedSettingsConfig = () => {
   const team = useCurrentTeam();
   const can = usePolicy(team.id);
diff --git a/app/index.tsx b/app/index.tsx
index cdf525f26..9a65d2d40 100644
--- a/app/index.tsx
+++ b/app/index.tsx
@@ -37,7 +37,7 @@ if ("serviceWorker" in window.navigator) {
       }
     );
 
-    if (maybePromise && maybePromise.then) {
+    if (maybePromise?.then) {
       maybePromise
         .then((registration) => {
           console.log("SW registered: ", registration);
diff --git a/app/menus/AccountMenu.tsx b/app/menus/AccountMenu.tsx
index 2c6eb30c9..1c63b5aa3 100644
--- a/app/menus/AccountMenu.tsx
+++ b/app/menus/AccountMenu.tsx
@@ -18,11 +18,7 @@ import usePrevious from "~/hooks/usePrevious";
 import useStores from "~/hooks/useStores";
 import separator from "~/menus/separator";
 
-type Props = {
-  children: (props: any) => React.ReactNode;
-};
-
-function AccountMenu(props: Props) {
+const AccountMenu: React.FC = ({ children }) => {
   const menu = useMenuState({
     placement: "bottom-end",
     modal: true,
@@ -55,12 +51,12 @@ function AccountMenu(props: Props) {
 
   return (
     <>
-      <MenuButton {...menu}>{props.children}</MenuButton>
+      <MenuButton {...menu}>{children}</MenuButton>
       <ContextMenu {...menu} aria-label={t("Account")}>
         <Template {...menu} items={undefined} actions={actions} />
       </ContextMenu>
     </>
   );
-}
+};
 
 export default observer(AccountMenu);
diff --git a/app/menus/OrganizationMenu.tsx b/app/menus/OrganizationMenu.tsx
index 2b2031b6d..5286892d2 100644
--- a/app/menus/OrganizationMenu.tsx
+++ b/app/menus/OrganizationMenu.tsx
@@ -13,11 +13,7 @@ import useSessions from "~/hooks/useSessions";
 import useStores from "~/hooks/useStores";
 import separator from "~/menus/separator";
 
-type Props = {
-  children: (props: any) => React.ReactNode;
-};
-
-function OrganizationMenu(props: Props) {
+const OrganizationMenu: React.FC = ({ children }) => {
   const [sessions] = useSessions();
   const menu = useMenuState({
     unstable_offset: [4, -4],
@@ -65,13 +61,13 @@ function OrganizationMenu(props: Props) {
 
   return (
     <>
-      <MenuButton {...menu}>{props.children}</MenuButton>
+      <MenuButton {...menu}>{children}</MenuButton>
       <ContextMenu {...menu} aria-label={t("Account")}>
         <Template {...menu} items={undefined} actions={actions} />
       </ContextMenu>
     </>
   );
-}
+};
 
 const Logo = styled("img")`
   border-radius: 2px;
diff --git a/app/scenes/Collection/DropToImport.tsx b/app/scenes/Collection/DropToImport.tsx
index 8bffe3c50..fc6f76600 100644
--- a/app/scenes/Collection/DropToImport.tsx
+++ b/app/scenes/Collection/DropToImport.tsx
@@ -9,13 +9,17 @@ import useImportDocument from "~/hooks/useImportDocument";
 import useToasts from "~/hooks/useToasts";
 
 type Props = {
-  children: React.ReactNode;
   disabled: boolean;
   accept: string;
   collectionId: string;
 };
 
-function DropToImport({ children, disabled, accept, collectionId }: Props) {
+const DropToImport: React.FC<Props> = ({
+  children,
+  disabled,
+  accept,
+  collectionId,
+}) => {
   const { handleFiles, isImporting } = useImportDocument(collectionId);
   const { showToast } = useToasts();
   const { t } = useTranslation();
@@ -53,7 +57,7 @@ function DropToImport({ children, disabled, accept, collectionId }: Props) {
       )}
     </Dropzone>
   );
-}
+};
 
 const DropMessage = styled(Text)`
   opacity: 0;
diff --git a/app/scenes/Document/components/HideSidebar.ts b/app/scenes/Document/components/HideSidebar.ts
index 738577a37..4e19d0e50 100644
--- a/app/scenes/Document/components/HideSidebar.ts
+++ b/app/scenes/Document/components/HideSidebar.ts
@@ -3,7 +3,6 @@ import UiStore from "~/stores/UiStore";
 
 type Props = {
   ui: UiStore;
-  children?: React.ReactNode;
 };
 
 class HideSidebar extends React.Component<Props> {
diff --git a/app/scenes/Document/components/MarkAsViewed.ts b/app/scenes/Document/components/MarkAsViewed.ts
index 8f41fe45f..81a6ef04d 100644
--- a/app/scenes/Document/components/MarkAsViewed.ts
+++ b/app/scenes/Document/components/MarkAsViewed.ts
@@ -4,7 +4,6 @@ import Document from "~/models/Document";
 const MARK_AS_VIEWED_AFTER = 3 * 1000;
 type Props = {
   document: Document;
-  children?: React.ReactNode;
 };
 
 class MarkAsViewed extends React.Component<Props> {
diff --git a/app/scenes/Document/components/PublicBreadcrumb.tsx b/app/scenes/Document/components/PublicBreadcrumb.tsx
index f6c9dbfda..66134421e 100644
--- a/app/scenes/Document/components/PublicBreadcrumb.tsx
+++ b/app/scenes/Document/components/PublicBreadcrumb.tsx
@@ -6,7 +6,6 @@ type Props = {
   documentId: string;
   shareId: string;
   sharedTree: NavigationNode | undefined;
-  children?: React.ReactNode;
 };
 
 function pathToDocument(
@@ -38,12 +37,12 @@ function pathToDocument(
   return path;
 }
 
-const PublicBreadcrumb = ({
+const PublicBreadcrumb: React.FC<Props> = ({
   documentId,
   shareId,
   sharedTree,
   children,
-}: Props) => {
+}) => {
   const items: MenuInternalLink[] = React.useMemo(
     () =>
       pathToDocument(sharedTree, documentId)
diff --git a/app/scenes/Document/components/ShareButton.tsx b/app/scenes/Document/components/ShareButton.tsx
index 7932e985b..6d27c95a3 100644
--- a/app/scenes/Document/components/ShareButton.tsx
+++ b/app/scenes/Document/components/ShareButton.tsx
@@ -20,8 +20,7 @@ function ShareButton({ document }: Props) {
   const share = shares.getByDocumentId(document.id);
   const sharedParent = shares.getByDocumentParents(document.id);
   const isPubliclyShared =
-    (share && share.published) ||
-    (sharedParent && sharedParent.published && !document.isDraft);
+    share?.published || (sharedParent?.published && !document.isDraft);
 
   const popover = usePopoverState({
     gutter: 0,
diff --git a/app/scenes/Document/components/SocketPresence.ts b/app/scenes/Document/components/SocketPresence.ts
index 63d393d9a..9491c9376 100644
--- a/app/scenes/Document/components/SocketPresence.ts
+++ b/app/scenes/Document/components/SocketPresence.ts
@@ -3,7 +3,6 @@ import { USER_PRESENCE_INTERVAL } from "@shared/constants";
 import { SocketContext } from "~/components/SocketProvider";
 
 type Props = {
-  children?: React.ReactNode;
   documentId: string;
   isEditing: boolean;
 };
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 751b4f16d..c88471ff3 100644
--- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx
@@ -20,12 +20,11 @@ import env from "~/env";
 import useQuery from "~/hooks/useQuery";
 import useStores from "~/hooks/useStores";
 import { isCustomDomain } from "~/utils/domains";
+import isHosted from "~/utils/isHosted";
 import { changeLanguage, detectLanguage } from "~/utils/language";
 import Notices from "./Notices";
 import Provider from "./Provider";
 
-const isHosted = env.DEPLOYMENT === "hosted";
-
 function Header({ config }: { config?: Config | undefined }) {
   const { t } = useTranslation();
   const isSubdomain = !!config?.hostname;
@@ -160,7 +159,7 @@ function Login() {
       <Centered align="center" justify="center" column auto>
         <PageTitle title={t("Login")} />
         <Logo>
-          {env.TEAM_LOGO && env.DEPLOYMENT !== "hosted" ? (
+          {env.TEAM_LOGO && !isHosted ? (
             <TeamLogo src={env.TEAM_LOGO} />
           ) : (
             <OutlineLogo size={38} fill="currentColor" />
diff --git a/app/scenes/Settings/Details.tsx b/app/scenes/Settings/Details.tsx
index a862906e7..3ee27a3e5 100644
--- a/app/scenes/Settings/Details.tsx
+++ b/app/scenes/Settings/Details.tsx
@@ -13,6 +13,7 @@ import env from "~/env";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";
+import isHosted from "~/utils/isHosted";
 import ImageInput from "./components/ImageInput";
 import SettingRow from "./components/SettingRow";
 
@@ -133,7 +134,7 @@ function Details() {
           />
         </SettingRow>
         <SettingRow
-          visible={env.SUBDOMAINS_ENABLED && env.DEPLOYMENT === "hosted"}
+          visible={env.SUBDOMAINS_ENABLED && isHosted}
           label={t("Subdomain")}
           name="subdomain"
           description={
diff --git a/app/scenes/Settings/Notifications.tsx b/app/scenes/Settings/Notifications.tsx
index 42792ae09..8056ad9ce 100644
--- a/app/scenes/Settings/Notifications.tsx
+++ b/app/scenes/Settings/Notifications.tsx
@@ -13,6 +13,7 @@ import env from "~/env";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";
+import isHosted from "~/utils/isHosted";
 import SettingRow from "./components/SettingRow";
 
 function Notifications() {
@@ -47,7 +48,7 @@ function Notifications() {
       separator: true,
     },
     {
-      visible: env.DEPLOYMENT === "hosted",
+      visible: isHosted,
       event: "emails.onboarding",
       title: t("Getting started"),
       description: t(
@@ -55,7 +56,7 @@ function Notifications() {
       ),
     },
     {
-      visible: env.DEPLOYMENT === "hosted",
+      visible: isHosted,
       event: "emails.features",
       title: t("New features"),
       description: t("Receive an email when new features of note are added"),
diff --git a/app/scenes/Settings/components/ImageUpload.tsx b/app/scenes/Settings/components/ImageUpload.tsx
index 11b116686..4566b8ec2 100644
--- a/app/scenes/Settings/components/ImageUpload.tsx
+++ b/app/scenes/Settings/components/ImageUpload.tsx
@@ -17,7 +17,6 @@ import { uploadFile, dataUrlToBlob } from "~/utils/files";
 const EMPTY_OBJECT = {};
 
 export type Props = {
-  children?: React.ReactNode;
   onSuccess: (url: string) => void | Promise<void>;
   onError: (error: string) => void;
   submitText?: string;
diff --git a/app/stores/AuthStore.ts b/app/stores/AuthStore.ts
index 36e902cc6..89e65f64b 100644
--- a/app/stores/AuthStore.ts
+++ b/app/stores/AuthStore.ts
@@ -146,7 +146,7 @@ export default class AuthStore {
   @action
   fetchConfig = async () => {
     const res = await client.post("/auth.config");
-    invariant(res && res.data, "Config not available");
+    invariant(res?.data, "Config not available");
     this.config = res.data;
   };
 
@@ -154,7 +154,7 @@ export default class AuthStore {
   fetch = async () => {
     try {
       const res = await client.post("/auth.info");
-      invariant(res && res.data, "Auth not available");
+      invariant(res?.data, "Auth not available");
       runInAction("AuthStore#fetch", () => {
         this.addPolicies(res.policies);
         const { user, team } = res.data;
@@ -212,7 +212,7 @@ export default class AuthStore {
 
     try {
       const res = await client.post(`/users.update`, params);
-      invariant(res && res.data, "User response not available");
+      invariant(res?.data, "User response not available");
       runInAction("AuthStore#updateUser", () => {
         this.addPolicies(res.policies);
         this.user = new User(res.data, this);
@@ -235,7 +235,7 @@ export default class AuthStore {
 
     try {
       const res = await client.post(`/team.update`, params);
-      invariant(res && res.data, "Team response not available");
+      invariant(res?.data, "Team response not available");
       runInAction("AuthStore#updateTeam", () => {
         this.addPolicies(res.policies);
         this.team = new Team(res.data, this);
diff --git a/app/stores/BaseStore.ts b/app/stores/BaseStore.ts
index 64019abd4..c858d3a1d 100644
--- a/app/stores/BaseStore.ts
+++ b/app/stores/BaseStore.ts
@@ -138,7 +138,7 @@ export default class BaseStore<T extends BaseModel> {
         ...options,
       });
 
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       this.addPolicies(res.policies);
       return this.add(res.data);
     } finally {
@@ -163,7 +163,7 @@ export default class BaseStore<T extends BaseModel> {
         ...options,
       });
 
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       this.addPolicies(res.policies);
       return this.add(res.data);
     } finally {
@@ -206,7 +206,7 @@ export default class BaseStore<T extends BaseModel> {
       const res = await client.post(`/${this.apiEndpoint}.info`, {
         id,
       });
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       this.addPolicies(res.policies);
       return this.add(res.data);
     } catch (err) {
@@ -230,7 +230,7 @@ export default class BaseStore<T extends BaseModel> {
 
     try {
       const res = await client.post(`/${this.apiEndpoint}.list`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
 
       runInAction(`list#${this.modelName}`, () => {
         this.addPolicies(res.policies);
diff --git a/app/stores/CollectionGroupMembershipsStore.ts b/app/stores/CollectionGroupMembershipsStore.ts
index 69d5f9168..43cc787d3 100644
--- a/app/stores/CollectionGroupMembershipsStore.ts
+++ b/app/stores/CollectionGroupMembershipsStore.ts
@@ -21,7 +21,7 @@ export default class CollectionGroupMembershipsStore extends BaseStore<
 
     try {
       const res = await client.post(`/collections.group_memberships`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       runInAction(`CollectionGroupMembershipsStore#fetchPage`, () => {
         res.data.groups.forEach(this.rootStore.groups.add);
         res.data.collectionGroupMemberships.forEach(this.add);
@@ -48,7 +48,7 @@ export default class CollectionGroupMembershipsStore extends BaseStore<
       groupId,
       permission,
     });
-    invariant(res && res.data, "Membership data should be available");
+    invariant(res?.data, "Membership data should be available");
 
     const cgm = res.data.collectionGroupMemberships.map(this.add);
     return cgm[0];
diff --git a/app/stores/CollectionsStore.ts b/app/stores/CollectionsStore.ts
index 8a5cea888..03d92ecd2 100644
--- a/app/stores/CollectionsStore.ts
+++ b/app/stores/CollectionsStore.ts
@@ -111,7 +111,7 @@ export default class CollectionsStore extends BaseStore<Collection> {
       id: collectionId,
       index,
     });
-    invariant(res && res.success, "Collection could not be moved");
+    invariant(res?.success, "Collection could not be moved");
     const collection = this.get(collectionId);
 
     if (collection) {
@@ -153,7 +153,7 @@ export default class CollectionsStore extends BaseStore<Collection> {
       const res = await client.post(`/collections.info`, {
         id,
       });
-      invariant(res && res.data, "Collection not available");
+      invariant(res?.data, "Collection not available");
       this.addPolicies(res.policies);
       return this.add(res.data);
     } catch (err) {
diff --git a/app/stores/DocumentsStore.ts b/app/stores/DocumentsStore.ts
index b64f2dff8..43a7644be 100644
--- a/app/stores/DocumentsStore.ts
+++ b/app/stores/DocumentsStore.ts
@@ -239,7 +239,7 @@ export default class DocumentsStore extends BaseStore<Document> {
     const res = await client.post(`/documents.list`, {
       backlinkDocumentId: documentId,
     });
-    invariant(res && res.data, "Document list not available");
+    invariant(res?.data, "Document list not available");
     const { data } = res;
 
     runInAction("DocumentsStore#fetchBacklinks", () => {
@@ -271,7 +271,7 @@ export default class DocumentsStore extends BaseStore<Document> {
     const res = await client.post(`/documents.list`, {
       parentDocumentId: documentId,
     });
-    invariant(res && res.data, "Document list not available");
+    invariant(res?.data, "Document list not available");
     const { data } = res;
 
     runInAction("DocumentsStore#fetchChildDocuments", () => {
@@ -289,7 +289,7 @@ export default class DocumentsStore extends BaseStore<Document> {
 
     try {
       const res = await client.post(`/documents.${request}`, options);
-      invariant(res && res.data, "Document list not available");
+      invariant(res?.data, "Document list not available");
       runInAction("DocumentsStore#fetchNamedPage", () => {
         res.data.forEach(this.add);
         this.addPolicies(res.policies);
@@ -375,7 +375,7 @@ export default class DocumentsStore extends BaseStore<Document> {
     const res = await client.get("/documents.search_titles", {
       query,
     });
-    invariant(res && res.data, "Search response should be available");
+    invariant(res?.data, "Search response should be available");
     // add the documents and associated policies to the store
     res.data.forEach(this.add);
     this.addPolicies(res.policies);
@@ -392,7 +392,7 @@ export default class DocumentsStore extends BaseStore<Document> {
       ...compactedOptions,
       query,
     });
-    invariant(res && res.data, "Search response should be available");
+    invariant(res?.data, "Search response should be available");
 
     // add the documents and associated policies to the store
     res.data.forEach((result: SearchResult) => this.add(result.document));
@@ -443,7 +443,7 @@ export default class DocumentsStore extends BaseStore<Document> {
     const res = await client.post("/documents.templatize", {
       id,
     });
-    invariant(res && res.data, "Document not available");
+    invariant(res?.data, "Document not available");
     this.addPolicies(res.policies);
     this.add(res.data);
     return this.data.get(res.data.id);
@@ -485,7 +485,7 @@ export default class DocumentsStore extends BaseStore<Document> {
         apiVersion: 2,
       });
 
-      invariant(res && res.data, "Document not available");
+      invariant(res?.data, "Document not available");
       this.addPolicies(res.policies);
       this.add(res.data.document);
 
@@ -524,7 +524,7 @@ export default class DocumentsStore extends BaseStore<Document> {
         parentDocumentId,
         index: index,
       });
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       res.data.documents.forEach(this.add);
       res.data.collections.forEach(this.rootStore.collections.add);
       this.addPolicies(res.policies);
@@ -547,7 +547,7 @@ export default class DocumentsStore extends BaseStore<Document> {
       )}${append}`,
       text: document.text,
     });
-    invariant(res && res.data, "Data should be available");
+    invariant(res?.data, "Data should be available");
     const collection = this.getCollectionForDocument(document);
     if (collection) {
       collection.refresh();
@@ -613,7 +613,7 @@ export default class DocumentsStore extends BaseStore<Document> {
       }
     });
     const res = await client.post("/documents.import", formData);
-    invariant(res && res.data, "Data should be available");
+    invariant(res?.data, "Data should be available");
     this.addPolicies(res.policies);
     return this.add(res.data);
   };
@@ -680,7 +680,7 @@ export default class DocumentsStore extends BaseStore<Document> {
       id: document.id,
     });
     runInAction("Document#archive", () => {
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       document.updateFromJson(res.data);
       this.addPolicies(res.policies);
     });
@@ -704,7 +704,7 @@ export default class DocumentsStore extends BaseStore<Document> {
       collectionId: options.collectionId,
     });
     runInAction("Document#restore", () => {
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       document.updateFromJson(res.data);
       this.addPolicies(res.policies);
     });
@@ -720,7 +720,7 @@ export default class DocumentsStore extends BaseStore<Document> {
       id: document.id,
     });
     runInAction("Document#unpublish", () => {
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       document.updateFromJson(res.data);
       this.addPolicies(res.policies);
     });
diff --git a/app/stores/GroupMembershipsStore.ts b/app/stores/GroupMembershipsStore.ts
index 259f2ccb7..9c45face1 100644
--- a/app/stores/GroupMembershipsStore.ts
+++ b/app/stores/GroupMembershipsStore.ts
@@ -20,7 +20,7 @@ export default class GroupMembershipsStore extends BaseStore<GroupMembership> {
 
     try {
       const res = await client.post(`/groups.memberships`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       runInAction(`GroupMembershipsStore#fetchPage`, () => {
         res.data.users.forEach(this.rootStore.users.add);
         res.data.groupMemberships.forEach(this.add);
@@ -38,7 +38,7 @@ export default class GroupMembershipsStore extends BaseStore<GroupMembership> {
       id: groupId,
       userId,
     });
-    invariant(res && res.data, "Group Membership data should be available");
+    invariant(res?.data, "Group Membership data should be available");
     res.data.users.forEach(this.rootStore.users.add);
     res.data.groups.forEach(this.rootStore.groups.add);
 
@@ -52,7 +52,7 @@ export default class GroupMembershipsStore extends BaseStore<GroupMembership> {
       id: groupId,
       userId,
     });
-    invariant(res && res.data, "Group Membership data should be available");
+    invariant(res?.data, "Group Membership data should be available");
     this.remove(`${userId}-${groupId}`);
     runInAction(`GroupMembershipsStore#delete`, () => {
       res.data.groups.forEach(this.rootStore.groups.add);
diff --git a/app/stores/GroupsStore.ts b/app/stores/GroupsStore.ts
index a28635ce0..22c2cb700 100644
--- a/app/stores/GroupsStore.ts
+++ b/app/stores/GroupsStore.ts
@@ -26,7 +26,7 @@ export default class GroupsStore extends BaseStore<Group> {
 
     try {
       const res = await client.post(`/groups.list`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       runInAction(`GroupsStore#fetchPage`, () => {
         this.addPolicies(res.policies);
         res.data.groups.forEach(this.add);
diff --git a/app/stores/MembershipsStore.ts b/app/stores/MembershipsStore.ts
index df6bc9aff..2f15701f1 100644
--- a/app/stores/MembershipsStore.ts
+++ b/app/stores/MembershipsStore.ts
@@ -19,7 +19,7 @@ export default class MembershipsStore extends BaseStore<Membership> {
 
     try {
       const res = await client.post(`/collections.memberships`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       runInAction(`/collections.memberships`, () => {
         res.data.users.forEach(this.rootStore.users.add);
         res.data.memberships.forEach(this.add);
@@ -46,7 +46,7 @@ export default class MembershipsStore extends BaseStore<Membership> {
       userId,
       permission,
     });
-    invariant(res && res.data, "Membership data should be available");
+    invariant(res?.data, "Membership data should be available");
     res.data.users.forEach(this.rootStore.users.add);
 
     const memberships = res.data.memberships.map(this.add);
diff --git a/app/stores/PinsStore.ts b/app/stores/PinsStore.ts
index 41e1cb2c1..a756a6579 100644
--- a/app/stores/PinsStore.ts
+++ b/app/stores/PinsStore.ts
@@ -19,7 +19,7 @@ export default class PinsStore extends BaseStore<Pin> {
 
     try {
       const res = await client.post(`/pins.list`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       runInAction(`PinsStore#fetchPage`, () => {
         res.data.documents.forEach(this.rootStore.documents.add);
         res.data.pins.forEach(this.add);
diff --git a/app/stores/RevisionsStore.ts b/app/stores/RevisionsStore.ts
index 49295fd43..5ab1a16d1 100644
--- a/app/stores/RevisionsStore.ts
+++ b/app/stores/RevisionsStore.ts
@@ -53,7 +53,7 @@ export default class RevisionsStore extends BaseStore<Revision> {
 
     try {
       const res = await client.post("/revisions.list", options);
-      invariant(res && res.data, "Document revisions not available");
+      invariant(res?.data, "Document revisions not available");
       runInAction("RevisionsStore#fetchPage", () => {
         res.data.forEach(this.add);
         this.isLoaded = true;
diff --git a/app/stores/SharesStore.ts b/app/stores/SharesStore.ts
index e6c72e428..9ed6211e3 100644
--- a/app/stores/SharesStore.ts
+++ b/app/stores/SharesStore.ts
@@ -65,7 +65,7 @@ export default class SharesStore extends BaseStore<Share> {
       if (isUndefined(res)) {
         return;
       }
-      invariant(res && res.data, "Data should be available");
+      invariant(res?.data, "Data should be available");
       this.addPolicies(res.policies);
       return res.data.shares.map(this.add);
     } finally {
@@ -92,7 +92,7 @@ export default class SharesStore extends BaseStore<Share> {
     for (const parentId of parentIds) {
       const share = this.getByDocumentId(parentId);
 
-      if (share && share.includeChildDocuments && share.published) {
+      if (share?.includeChildDocuments && share.published) {
         return share;
       }
     }
diff --git a/app/stores/StarsStore.ts b/app/stores/StarsStore.ts
index d3bfe613e..2efc1f15f 100644
--- a/app/stores/StarsStore.ts
+++ b/app/stores/StarsStore.ts
@@ -17,7 +17,7 @@ export default class StarsStore extends BaseStore<Star> {
 
     try {
       const res = await client.post(`/stars.list`, params);
-      invariant(res && res.data, "Data not available");
+      invariant(res?.data, "Data not available");
       runInAction(`StarsStore#fetchPage`, () => {
         res.data.documents.forEach(this.rootStore.documents.add);
         res.data.stars.forEach(this.add);
diff --git a/app/stores/ToastsStore.ts b/app/stores/ToastsStore.ts
index 77ec8db92..81dc347a5 100644
--- a/app/stores/ToastsStore.ts
+++ b/app/stores/ToastsStore.ts
@@ -21,7 +21,7 @@ export default class ToastsStore {
     }
     const lastToast = this.toasts.get(this.lastToastId);
 
-    if (lastToast && lastToast.message === message) {
+    if (lastToast?.message === message) {
       this.toasts.set(this.lastToastId, {
         ...lastToast,
         reoccurring: lastToast.reoccurring ? ++lastToast.reoccurring : 1,
diff --git a/app/stores/UsersStore.ts b/app/stores/UsersStore.ts
index e7a785e46..55efe98bb 100644
--- a/app/stores/UsersStore.ts
+++ b/app/stores/UsersStore.ts
@@ -126,7 +126,7 @@ export default class UsersStore extends BaseStore<User> {
     const res = await client.post(`/users.invite`, {
       invites,
     });
-    invariant(res && res.data, "Data should be available");
+    invariant(res?.data, "Data should be available");
     runInAction(`invite`, () => {
       res.data.users.forEach(this.add);
       this.counts.invited += res.data.sent.length;
@@ -140,7 +140,7 @@ export default class UsersStore extends BaseStore<User> {
     const res = await client.post(`/users.count`, {
       teamId,
     });
-    invariant(res && res.data, "Data should be available");
+    invariant(res?.data, "Data should be available");
     this.counts = res.data.counts;
     return res.data;
   };
@@ -268,7 +268,7 @@ export default class UsersStore extends BaseStore<User> {
       id: user.id,
       to,
     });
-    invariant(res && res.data, "Data should be available");
+    invariant(res?.data, "Data should be available");
     runInAction(`UsersStore#${action}`, () => {
       this.addPolicies(res.policies);
       this.add(res.data);
diff --git a/app/utils/ApiClient.ts b/app/utils/ApiClient.ts
index 55441a5be..7a1a108c2 100644
--- a/app/utils/ApiClient.ts
+++ b/app/utils/ApiClient.ts
@@ -3,7 +3,7 @@ import invariant from "invariant";
 import { map, trim } from "lodash";
 import EDITOR_VERSION from "@shared/editor/version";
 import stores from "~/stores";
-import env from "~/env";
+import isHosted from "~/utils/isHosted";
 import download from "./download";
 import {
   AuthorizationError,
@@ -21,7 +21,6 @@ type Options = {
 };
 
 const fetchWithRetry = retry(fetch);
-const isHosted = env.DEPLOYMENT === "hosted";
 
 class ApiClient {
   baseUrl: string;
diff --git a/app/utils/isHosted.ts b/app/utils/isHosted.ts
new file mode 100644
index 000000000..05eeeee9b
--- /dev/null
+++ b/app/utils/isHosted.ts
@@ -0,0 +1,5 @@
+import env from "~/env";
+
+const isHosted = env.DEPLOYMENT === "hosted";
+
+export default isHosted;