diff --git a/app/assets/javascripts/Components/AccountMenu/AccountMenu.tsx b/app/assets/javascripts/Components/AccountMenu/AccountMenu.tsx
index 12198cefbef..400eff7d775 100644
--- a/app/assets/javascripts/Components/AccountMenu/AccountMenu.tsx
+++ b/app/assets/javascripts/Components/AccountMenu/AccountMenu.tsx
@@ -10,13 +10,7 @@ import { CreateAccount } from './CreateAccount'
 import { ConfirmPassword } from './ConfirmPassword'
 import { JSXInternal } from 'preact/src/jsx'
 import { ApplicationGroup } from '@/UIModels/ApplicationGroup'
-
-export enum AccountMenuPane {
-  GeneralMenu,
-  SignIn,
-  Register,
-  ConfirmPassword,
-}
+import { AccountMenuPane } from './AccountMenuPane'
 
 type Props = {
   appState: AppState
diff --git a/app/assets/javascripts/Components/AccountMenu/AccountMenuPane.ts b/app/assets/javascripts/Components/AccountMenu/AccountMenuPane.ts
new file mode 100644
index 00000000000..8e9c673a367
--- /dev/null
+++ b/app/assets/javascripts/Components/AccountMenu/AccountMenuPane.ts
@@ -0,0 +1,6 @@
+export enum AccountMenuPane {
+  GeneralMenu,
+  SignIn,
+  Register,
+  ConfirmPassword,
+}
diff --git a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
index 659cf87a117..6dcbf0f8862 100644
--- a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
+++ b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
@@ -4,7 +4,7 @@ import { AppState } from '@/UIModels/AppState'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { useCallback, useEffect, useRef, useState } from 'preact/hooks'
-import { AccountMenuPane } from './AccountMenu'
+import { AccountMenuPane } from './AccountMenuPane'
 import { Button } from '@/Components/Button/Button'
 import { Checkbox } from '@/Components/Checkbox/Checkbox'
 import { DecoratedPasswordInput } from '@/Components/Input/DecoratedPasswordInput'
diff --git a/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx b/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx
index 8b5e38456c8..ed47431ac48 100644
--- a/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx
+++ b/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx
@@ -3,7 +3,7 @@ import { AppState } from '@/UIModels/AppState'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { StateUpdater, useCallback, useEffect, useRef, useState } from 'preact/hooks'
-import { AccountMenuPane } from './AccountMenu'
+import { AccountMenuPane } from './AccountMenuPane'
 import { Button } from '@/Components/Button/Button'
 import { DecoratedInput } from '@/Components/Input/DecoratedInput'
 import { DecoratedPasswordInput } from '@/Components/Input/DecoratedPasswordInput'
diff --git a/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx b/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
index 8d41d281e8a..2e6ea136f0a 100644
--- a/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
+++ b/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
@@ -6,7 +6,7 @@ import { formatLastSyncDate } from '@/Components/Preferences/Panes/Account/Sync'
 import { SyncQueueStrategy } from '@standardnotes/snjs'
 import { STRING_GENERIC_SYNC_ERROR } from '@/Strings'
 import { useCallback, useMemo, useState } from 'preact/hooks'
-import { AccountMenuPane } from './AccountMenu'
+import { AccountMenuPane } from './AccountMenuPane'
 import { FunctionComponent } from 'preact'
 import { Menu } from '@/Components/Menu/Menu'
 import { MenuItem, MenuItemSeparator, MenuItemType } from '@/Components/Menu/MenuItem'
diff --git a/app/assets/javascripts/Components/AccountMenu/SignIn.tsx b/app/assets/javascripts/Components/AccountMenu/SignIn.tsx
index ebe5f6e9898..0b85a4b3aad 100644
--- a/app/assets/javascripts/Components/AccountMenu/SignIn.tsx
+++ b/app/assets/javascripts/Components/AccountMenu/SignIn.tsx
@@ -4,7 +4,7 @@ import { isDev } from '@/Utils'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { useCallback, useEffect, useRef, useState } from 'preact/hooks'
-import { AccountMenuPane } from './AccountMenu'
+import { AccountMenuPane } from './AccountMenuPane'
 import { Button } from '@/Components/Button/Button'
 import { Checkbox } from '@/Components/Checkbox/Checkbox'
 import { DecoratedInput } from '@/Components/Input/DecoratedInput'
diff --git a/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
index f6c8bb96ba7..24c08cc7d71 100644
--- a/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
+++ b/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
@@ -1,11 +1,6 @@
 import { Icon } from '@/Components/Icon/Icon'
 import { Menu } from '@/Components/Menu/Menu'
 import { MenuItem, MenuItemType } from '@/Components/Menu/MenuItem'
-import {
-  reloadFont,
-  transactionForAssociateComponentWithCurrentNote,
-  transactionForDisassociateComponentWithCurrentNote,
-} from '@/Components/NoteView/NoteView'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
 import { STRING_EDIT_LOCKED_ATTEMPT } from '@/Strings'
 import { WebApplication } from '@/UIModels/Application'
@@ -23,6 +18,11 @@ import { useCallback, useEffect, useState } from 'preact/hooks'
 import { EditorMenuItem, EditorMenuGroup } from '@/Components/NotesOptions/ChangeEditorOption'
 import { createEditorMenuGroups } from './createEditorMenuGroups'
 import { PLAIN_EDITOR_NAME } from '@/Constants'
+import {
+  transactionForAssociateComponentWithCurrentNote,
+  transactionForDisassociateComponentWithCurrentNote,
+} from '../NoteView/TransactionFunctions'
+import { reloadFont } from '../NoteView/FontFunctions'
 
 type ChangeEditorMenuProps = {
   application: WebApplication
diff --git a/app/assets/javascripts/Components/Footer/Footer.tsx b/app/assets/javascripts/Components/Footer/Footer.tsx
index 4a4a994c2f5..cc3a80f6bc3 100644
--- a/app/assets/javascripts/Components/Footer/Footer.tsx
+++ b/app/assets/javascripts/Components/Footer/Footer.tsx
@@ -11,12 +11,13 @@ import {
   STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON,
 } from '@/Strings'
 import { alertDialog, confirmDialog } from '@/Services/AlertService'
-import { AccountMenu, AccountMenuPane } from '@/Components/AccountMenu/AccountMenu'
+import { AccountMenu } from '@/Components/AccountMenu/AccountMenu'
 import { AppStateEvent, EventSource } from '@/UIModels/AppState'
 import { Icon } from '@/Components/Icon/Icon'
 import { QuickSettingsMenu } from '@/Components/QuickSettingsMenu/QuickSettingsMenu'
 import { SyncResolutionMenu } from '@/Components/SyncResolutionMenu/SyncResolutionMenu'
 import { Fragment } from 'preact'
+import { AccountMenuPane } from '../AccountMenu/AccountMenuPane'
 
 type Props = {
   application: WebApplication
diff --git a/app/assets/javascripts/Components/NoteView/FontFunctions.ts b/app/assets/javascripts/Components/NoteView/FontFunctions.ts
new file mode 100644
index 00000000000..d1aced819e5
--- /dev/null
+++ b/app/assets/javascripts/Components/NoteView/FontFunctions.ts
@@ -0,0 +1,9 @@
+export const reloadFont = (monospaceFont?: boolean) => {
+  const root = document.querySelector(':root') as HTMLElement
+  const propertyName = '--sn-stylekit-editor-font-family'
+  if (monospaceFont) {
+    root.style.setProperty(propertyName, 'var(--sn-stylekit-monospace-font)')
+  } else {
+    root.style.setProperty(propertyName, 'var(--sn-stylekit-sans-serif-font)')
+  }
+}
diff --git a/app/assets/javascripts/Components/NoteView/NoteView.tsx b/app/assets/javascripts/Components/NoteView/NoteView.tsx
index 74f9a53e092..2d19e8fa37e 100644
--- a/app/assets/javascripts/Components/NoteView/NoteView.tsx
+++ b/app/assets/javascripts/Components/NoteView/NoteView.tsx
@@ -9,10 +9,7 @@ import {
   SNNote,
   ComponentArea,
   PrefKey,
-  ComponentMutator,
   ComponentViewer,
-  TransactionalMutation,
-  ItemMutator,
   ProposedSecondsToDeferUILevelSessionExpirationDuringActiveInteraction,
   NoteViewController,
   PayloadEmitSource,
@@ -33,6 +30,11 @@ import { PanelSide, PanelResizer, PanelResizeType } from '@/Components/PanelResi
 import { ElementIds } from '@/ElementIDs'
 import { ChangeEditorButton } from '@/Components/ChangeEditor/ChangeEditorButton'
 import { AttachedFilesButton } from '@/Components/AttachedFilesPopover/AttachedFilesButton'
+import {
+  transactionForAssociateComponentWithCurrentNote,
+  transactionForDisassociateComponentWithCurrentNote,
+} from './TransactionFunctions'
+import { reloadFont } from './FontFunctions'
 
 const MINIMUM_STATUS_DURATION = 400
 const TEXTAREA_DEBOUNCE = 100
@@ -47,40 +49,6 @@ function sortAlphabetically(array: SNComponent[]): SNComponent[] {
   return array.sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1))
 }
 
-export const transactionForAssociateComponentWithCurrentNote = (component: SNComponent, note: SNNote) => {
-  const transaction: TransactionalMutation = {
-    itemUuid: component.uuid,
-    mutate: (m: ItemMutator) => {
-      const mutator = m as ComponentMutator
-      mutator.removeDisassociatedItemId(note.uuid)
-      mutator.associateWithItem(note.uuid)
-    },
-  }
-  return transaction
-}
-
-export const transactionForDisassociateComponentWithCurrentNote = (component: SNComponent, note: SNNote) => {
-  const transaction: TransactionalMutation = {
-    itemUuid: component.uuid,
-    mutate: (m: ItemMutator) => {
-      const mutator = m as ComponentMutator
-      mutator.removeAssociatedItemId(note.uuid)
-      mutator.disassociateWithItem(note.uuid)
-    },
-  }
-  return transaction
-}
-
-export const reloadFont = (monospaceFont?: boolean) => {
-  const root = document.querySelector(':root') as HTMLElement
-  const propertyName = '--sn-stylekit-editor-font-family'
-  if (monospaceFont) {
-    root.style.setProperty(propertyName, 'var(--sn-stylekit-monospace-font)')
-  } else {
-    root.style.setProperty(propertyName, 'var(--sn-stylekit-sans-serif-font)')
-  }
-}
-
 type State = {
   availableStackComponents: SNComponent[]
   editorComponentViewer?: ComponentViewer
diff --git a/app/assets/javascripts/Components/NoteView/TransactionFunctions.ts b/app/assets/javascripts/Components/NoteView/TransactionFunctions.ts
new file mode 100644
index 00000000000..8713bd1274e
--- /dev/null
+++ b/app/assets/javascripts/Components/NoteView/TransactionFunctions.ts
@@ -0,0 +1,25 @@
+import { SNComponent, SNNote, ComponentMutator, TransactionalMutation, ItemMutator } from '@standardnotes/snjs'
+
+export const transactionForAssociateComponentWithCurrentNote = (component: SNComponent, note: SNNote) => {
+  const transaction: TransactionalMutation = {
+    itemUuid: component.uuid,
+    mutate: (m: ItemMutator) => {
+      const mutator = m as ComponentMutator
+      mutator.removeDisassociatedItemId(note.uuid)
+      mutator.associateWithItem(note.uuid)
+    },
+  }
+  return transaction
+}
+
+export const transactionForDisassociateComponentWithCurrentNote = (component: SNComponent, note: SNNote) => {
+  const transaction: TransactionalMutation = {
+    itemUuid: component.uuid,
+    mutate: (m: ItemMutator) => {
+      const mutator = m as ComponentMutator
+      mutator.removeAssociatedItemId(note.uuid)
+      mutator.disassociateWithItem(note.uuid)
+    },
+  }
+  return transaction
+}
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx
index 1a6524673cf..4d40cb020de 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx
@@ -1,4 +1,3 @@
-import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenu'
 import { Button } from '@/Components/Button/Button'
 import { PreferencesGroup, PreferencesSegment, Text, Title } from '@/Components/Preferences/PreferencesComponents'
 import { WebApplication } from '@/UIModels/Application'
@@ -6,6 +5,7 @@ import { AppState } from '@/UIModels/AppState'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { AccountIllustration } from '@standardnotes/icons'
+import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane'
 
 export const Authentication: FunctionComponent<{
   application: WebApplication
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
index a6f28705ad5..00e47b2539d 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
@@ -3,7 +3,7 @@ import { LinkButton, Text } from '@/Components/Preferences/PreferencesComponents
 import { Button } from '@/Components/Button/Button'
 import { WebApplication } from '@/UIModels/Application'
 import { useState } from 'preact/hooks'
-import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowWrapper'
+import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowFunctions'
 
 export const NoSubscription: FunctionalComponent<{
   application: WebApplication
diff --git a/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx b/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
index fa33ffb2cee..0fa0cccd7d0 100644
--- a/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
+++ b/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
@@ -1,14 +1,14 @@
 import { Button } from '@/Components/Button/Button'
 import { WebApplication } from '@/UIModels/Application'
 import { AppState } from '@/UIModels/AppState'
-import { PurchaseFlowPane } from '@/UIModels/AppState/PurchaseFlowState'
+import { PurchaseFlowPane } from '@/UIModels/AppState/PurchaseFlowPane'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { useEffect, useRef, useState } from 'preact/hooks'
 import { FloatingLabelInput } from '@/Components/Input/FloatingLabelInput'
 import { isEmailValid } from '@/Utils'
-import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowWrapper'
 import { BlueDotIcon, CircleIcon, DiamondIcon, CreateAccountIllustration } from '@standardnotes/icons'
+import { loadPurchaseFlowUrl } from '../PurchaseFlowFunctions'
 
 type Props = {
   appState: AppState
diff --git a/app/assets/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx b/app/assets/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
index 59ca2280ded..a196f2cc8dc 100644
--- a/app/assets/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
+++ b/app/assets/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
@@ -1,14 +1,14 @@
 import { Button } from '@/Components/Button/Button'
 import { WebApplication } from '@/UIModels/Application'
 import { AppState } from '@/UIModels/AppState'
-import { PurchaseFlowPane } from '@/UIModels/AppState/PurchaseFlowState'
+import { PurchaseFlowPane } from '@/UIModels/AppState/PurchaseFlowPane'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { useEffect, useRef, useState } from 'preact/hooks'
 import { FloatingLabelInput } from '@/Components/Input/FloatingLabelInput'
 import { isEmailValid } from '@/Utils'
-import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowWrapper'
 import { BlueDotIcon, CircleIcon, DiamondIcon } from '@standardnotes/icons'
+import { loadPurchaseFlowUrl } from '../PurchaseFlowFunctions'
 
 type Props = {
   appState: AppState
diff --git a/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts b/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts
new file mode 100644
index 00000000000..0438ee1bec2
--- /dev/null
+++ b/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts
@@ -0,0 +1,27 @@
+import { WebApplication } from '@/UIModels/Application'
+import { getWindowUrlParams, isDesktopApplication } from '@/Utils'
+
+export const getPurchaseFlowUrl = async (application: WebApplication): Promise<string | undefined> => {
+  const currentUrl = window.location.origin
+  const successUrl = isDesktopApplication() ? 'standardnotes://' : currentUrl
+  if (application.noAccount()) {
+    return `${window.purchaseUrl}/offline?&success_url=${successUrl}`
+  }
+  const token = await application.getNewSubscriptionToken()
+  if (token) {
+    return `${window.purchaseUrl}?subscription_token=${token}&success_url=${successUrl}`
+  }
+  return undefined
+}
+
+export const loadPurchaseFlowUrl = async (application: WebApplication): Promise<boolean> => {
+  const url = await getPurchaseFlowUrl(application)
+  const params = getWindowUrlParams()
+  const period = params.get('period') ? `&period=${params.get('period')}` : ''
+  const plan = params.get('plan') ? `&plan=${params.get('plan')}` : ''
+  if (url) {
+    window.location.assign(`${url}${period}${plan}`)
+    return true
+  }
+  return false
+}
diff --git a/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx b/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx
index 2a6d615771b..2a88abbd2a5 100644
--- a/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx
+++ b/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx
@@ -1,6 +1,6 @@
 import { WebApplication } from '@/UIModels/Application'
 import { AppState } from '@/UIModels/AppState'
-import { PurchaseFlowPane } from '@/UIModels/AppState/PurchaseFlowState'
+import { PurchaseFlowPane } from '@/UIModels/AppState/PurchaseFlowPane'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { CreateAccount } from './Panes/CreateAccount'
diff --git a/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowWrapper.tsx b/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowWrapper.tsx
index 09eeb3f8baf..3c4b943cd46 100644
--- a/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowWrapper.tsx
+++ b/app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowWrapper.tsx
@@ -1,6 +1,5 @@
 import { WebApplication } from '@/UIModels/Application'
 import { AppState } from '@/UIModels/AppState'
-import { getWindowUrlParams, isDesktopApplication } from '@/Utils'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { PurchaseFlowView } from './PurchaseFlowView'
@@ -10,31 +9,6 @@ export type PurchaseFlowWrapperProps = {
   application: WebApplication
 }
 
-export const getPurchaseFlowUrl = async (application: WebApplication): Promise<string | undefined> => {
-  const currentUrl = window.location.origin
-  const successUrl = isDesktopApplication() ? 'standardnotes://' : currentUrl
-  if (application.noAccount()) {
-    return `${window.purchaseUrl}/offline?&success_url=${successUrl}`
-  }
-  const token = await application.getNewSubscriptionToken()
-  if (token) {
-    return `${window.purchaseUrl}?subscription_token=${token}&success_url=${successUrl}`
-  }
-  return undefined
-}
-
-export const loadPurchaseFlowUrl = async (application: WebApplication): Promise<boolean> => {
-  const url = await getPurchaseFlowUrl(application)
-  const params = getWindowUrlParams()
-  const period = params.get('period') ? `&period=${params.get('period')}` : ''
-  const plan = params.get('plan') ? `&plan=${params.get('plan')}` : ''
-  if (url) {
-    window.location.assign(`${url}${period}${plan}`)
-    return true
-  }
-  return false
-}
-
 export const PurchaseFlowWrapper: FunctionComponent<PurchaseFlowWrapperProps> = observer(
   ({ appState, application }) => {
     if (!appState.purchaseFlow.isOpen) {
diff --git a/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts b/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts
index 33b747bc92d..9baeca06c96 100644
--- a/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts
+++ b/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts
@@ -2,7 +2,7 @@ import { destroyAllObjectProperties, isDev } from '@/Utils'
 import { action, computed, makeObservable, observable, runInAction } from 'mobx'
 import { ApplicationEvent, ContentType, DeinitSource, SNNote, SNTag } from '@standardnotes/snjs'
 import { WebApplication } from '@/UIModels/Application'
-import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenu'
+import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane'
 import { AbstractState } from './AbstractState'
 
 type StructuredItemsCount = {
diff --git a/app/assets/javascripts/UIModels/AppState/AppState.ts b/app/assets/javascripts/UIModels/AppState/AppState.ts
index fcee9724c0a..92a630be2e1 100644
--- a/app/assets/javascripts/UIModels/AppState/AppState.ts
+++ b/app/assets/javascripts/UIModels/AppState/AppState.ts
@@ -30,17 +30,7 @@ import { FilePreviewModalState } from './FilePreviewModalState'
 import { AbstractState } from './AbstractState'
 import { SelectedItemsState } from './SelectedItemsState'
 import { ListableContentItem } from '@/Components/ContentListView/Types/ListableContentItem'
-
-export enum AppStateEvent {
-  TagChanged,
-  ActiveEditorChanged,
-  PanelResized,
-  EditorFocused,
-  BeganBackupDownload,
-  EndedBackupDownload,
-  WindowDidFocus,
-  WindowDidBlur,
-}
+import { AppStateEvent } from './AppStateEvent'
 
 export type PanelResizedData = {
   panel: string
diff --git a/app/assets/javascripts/UIModels/AppState/AppStateEvent.ts b/app/assets/javascripts/UIModels/AppState/AppStateEvent.ts
new file mode 100644
index 00000000000..7a459646341
--- /dev/null
+++ b/app/assets/javascripts/UIModels/AppState/AppStateEvent.ts
@@ -0,0 +1,10 @@
+export enum AppStateEvent {
+  TagChanged,
+  ActiveEditorChanged,
+  PanelResized,
+  EditorFocused,
+  BeganBackupDownload,
+  EndedBackupDownload,
+  WindowDidFocus,
+  WindowDidBlur,
+}
diff --git a/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts b/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts
index f413c5e8d0a..0e9014bb9c5 100644
--- a/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts
+++ b/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts
@@ -15,9 +15,10 @@ import {
   DisplayOptions,
 } from '@standardnotes/snjs'
 import { action, computed, makeObservable, observable, reaction, runInAction } from 'mobx'
-import { AppState, AppStateEvent } from '.'
 import { WebApplication } from '../Application'
 import { AbstractState } from './AbstractState'
+import { AppState } from './AppState'
+import { AppStateEvent } from './AppStateEvent'
 import { WebDisplayOptions } from './WebDisplayOptions'
 
 const MinNoteCellHeight = 51.0
diff --git a/app/assets/javascripts/UIModels/AppState/PurchaseFlowPane.ts b/app/assets/javascripts/UIModels/AppState/PurchaseFlowPane.ts
new file mode 100644
index 00000000000..664f5f5aa81
--- /dev/null
+++ b/app/assets/javascripts/UIModels/AppState/PurchaseFlowPane.ts
@@ -0,0 +1,4 @@
+export enum PurchaseFlowPane {
+  SignIn,
+  CreateAccount,
+}
diff --git a/app/assets/javascripts/UIModels/AppState/PurchaseFlowState.ts b/app/assets/javascripts/UIModels/AppState/PurchaseFlowState.ts
index e2a625b950e..faa587971a0 100644
--- a/app/assets/javascripts/UIModels/AppState/PurchaseFlowState.ts
+++ b/app/assets/javascripts/UIModels/AppState/PurchaseFlowState.ts
@@ -1,12 +1,8 @@
-import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowWrapper'
+import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowFunctions'
 import { action, makeObservable, observable } from 'mobx'
 import { WebApplication } from '../Application'
 import { AbstractState } from './AbstractState'
-
-export enum PurchaseFlowPane {
-  SignIn,
-  CreateAccount,
-}
+import { PurchaseFlowPane } from './PurchaseFlowPane'
 
 export class PurchaseFlowState extends AbstractState {
   isOpen = false
diff --git a/app/assets/javascripts/UIModels/AppState/index.ts b/app/assets/javascripts/UIModels/AppState/index.ts
index ec0d94421b2..b9f8688d6ef 100644
--- a/app/assets/javascripts/UIModels/AppState/index.ts
+++ b/app/assets/javascripts/UIModels/AppState/index.ts
@@ -1 +1,3 @@
-export { AppState, AppStateEvent, EventSource, PanelResizedData } from './AppState'
+export { AppState, EventSource, PanelResizedData } from './AppState'
+export * from './AppStateEvent'
+export * from './PurchaseFlowPane'
diff --git a/package.json b/package.json
index c74dd2e2f64..f8951ac287a 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
     "babel-loader": "^8.2.5",
+    "circular-dependency-plugin": "^5.2.2",
     "css-loader": "^6.7.1",
     "dotenv": "^16.0.0",
     "eslint": "^8.13.0",
diff --git a/webpack.config.js b/webpack.config.js
index be6da2f7693..12185cdf358 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path')
 const webpack = require('webpack')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const CircularDependencyPlugin = require('circular-dependency-plugin')
 const mergeWithEnvDefaults = require('./webpack-defaults')
 require('dotenv').config()
 
@@ -12,6 +13,19 @@ module.exports = (env) => {
       filename: './javascripts/app.js',
     },
     plugins: [
+      new CircularDependencyPlugin({
+        // exclude detection of files based on a RegExp
+        exclude: /a\.js|node_modules/,
+        // include specific files based on a RegExp
+        include: /app\/assets\/javascripts/,
+        // add errors to webpack instead of warnings
+        failOnError: true,
+        // allow import cycles that include an asyncronous import,
+        // e.g. via import(/* webpackMode: "weak" */ './file.js')
+        allowAsyncCycles: false,
+        // set the current working directory for displaying module paths
+        cwd: process.cwd(),
+      }),
       new webpack.DefinePlugin({
         __VERSION__: JSON.stringify(require('./package.json').version),
         __WEB__: JSON.stringify(env.platform === 'web'),
diff --git a/yarn.lock b/yarn.lock
index f5bff1409c0..60d4bc5ffea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3884,6 +3884,11 @@ cint@^8.2.1:
   resolved "https://registry.yarnpkg.com/cint/-/cint-8.2.1.tgz#70386b1b48e2773d0d63166a55aff94ef4456a12"
   integrity sha1-cDhrG0jidz0NYxZqVa/5TvRFahI=
 
+circular-dependency-plugin@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600"
+  integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==
+
 cjs-module-lexer@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"