@xyo-network/os-react-runtime 5.0.5 → 5.0.7

package/src/modules/Dapp/lib/DappState.ts

@@ -0,0 +1,5 @@
+export interface DappState {
+  active: boolean
+  closed: boolean
+  minimized: boolean
+}

package/src/modules/Dapp/{modules/Window/hooks/lib → lib}/deriveDappState.ts

@@ -1,11 +1,7 @@
 import type { DappIntent } from '@xyo-network/os-model'
 import { DappIntentTypes } from '@xyo-network/os-model'
 
-export interface DappState {
-  active: boolean
-  closed: boolean
-  minimized: boolean
-}
+import type { DappState } from './DappState.ts'
 
 export const deriveDappState = (intent?: DappIntent): DappState => {
   const minimized = intent?.intent === DappIntentTypes.Minimize

package/src/modules/Dapp/lib/index.ts

@@ -1 +1,3 @@
-export * from './DefaultIconSize.js'
+export * from './DappState.ts'
+export * from './DefaultIconSize.ts'
+export * from './deriveDappState.ts'

package/src/modules/Dapp/modules/Window/AppBar.tsx

@@ -9,7 +9,7 @@ import {
   AppBar, Box, Divider, IconButton, Toolbar, Tooltip, Typography,
 } from '@mui/material'
 import { FlexGrowRow } from '@xylabs/react-flexbox'
-import { DarkModeIconButtonForColorScheme } from '@xylabs/react-invertible-theme'
+import { ColorSchemeButton } from '@xylabs/react-theme'
 import type {
   DappName, DappVersion, XyOsContext,
 } from '@xyo-network/os-model'
@@ -17,8 +17,9 @@ import { DappIntentTypes } from '@xyo-network/os-model'
 import { DappIntentCaller } from '@xyo-network/os-runtime'
 import React from 'react'
 
-import { useDebugClick, useSendDappIntent } from '../../../../hooks/index.ts'
+import { useSendDappIntent } from '../../../intent/index.ts'
 import { DebugDialogWithNode } from '../../Debug/index.ts'
+import { useDebugClick } from './hooks/index.ts'
 
 export interface DappBarProps extends AppBarProps {
   context?: XyOsContext | null
@@ -82,7 +83,7 @@ export const DappBar: React.FC<DappBarProps> = ({
           sx={{ display: { md: 'none', xs: 'flex' } }}
         >
           <Box>
-            <DarkModeIconButtonForColorScheme defaultLightModeColor="warning" />
+            <ColorSchemeButton />
           </Box>
         </Tooltip>
         <Divider

package/src/modules/Dapp/modules/Window/Rendered.tsx

@@ -9,9 +9,9 @@ import { XyOsUiContextProvider } from '../../../XyOsUi/index.ts'
 import { DappAccessFlexbox } from '../access-interface/index.ts'
 import { DappBar } from './AppBar.tsx'
 import { DappChrome } from './Chrome.tsx'
+import { DappBottomNavigation, DappMenuDrawer } from './components/index.ts'
 import { useDecomposeDapp } from './hooks/index.ts'
 import { DappLoadingFlexbox } from './LoadingFlexbox.tsx'
-import { DappBottomNavigation, DappMenuDrawer } from './menu/index.ts'
 import type { DappWindowProps } from './types/index.ts'
 
 /** A pure component that can render a dapp via props only */

package/src/modules/Dapp/modules/Window/components/DefaultComingSoon/SummarySection.tsx

@@ -8,7 +8,7 @@ import {
 import type { DappName, DappVersion } from '@xyo-network/os-model'
 import React from 'react'
 
-import { RenderHtml } from '../../../../../../components/index.ts'
+import { RenderHtml } from '../../../../RenderHtml.tsx'
 import { DeveloperLinkSection } from './DeveloperLinkSection.js'
 
 export interface SummarySectionProps {

package/src/modules/Dapp/modules/Window/components/index.ts

@@ -1 +1,2 @@
 export * from './DefaultComingSoon/index.ts'
+export * from './menu/index.ts'

package/src/modules/Dapp/modules/Window/{menu → components/menu}/BottomMenuArea.tsx

@@ -14,8 +14,8 @@ import {
 } from '@mui/material'
 import { RotationAnimation } from '@xylabs/react-animation'
 import { FlexCol, FlexRow } from '@xylabs/react-flexbox'
-import { DarkModeIconButtonForColorScheme } from '@xylabs/react-invertible-theme'
 import { LinkEx } from '@xylabs/react-link'
+import { ColorSchemeButton } from '@xylabs/react-theme'
 import React, { useState } from 'react'
 
 import { XyoOSLogoWhite } from './img/index.ts'
@@ -74,7 +74,7 @@ export const BottomMenuArea: React.FC<BottomMenuAreaProps> = ({ openDebug, backg
             </Tooltip>
             <Tooltip title="Toggle Light/Dark Mode">
               <span>
-                <DarkModeIconButtonForColorScheme defaultLightModeColor="warning" />
+                <ColorSchemeButton />
               </span>
             </Tooltip>
           </Toolbar>

package/src/modules/Dapp/modules/Window/{menu → components/menu}/Drawer.tsx

@@ -22,9 +22,9 @@ import type {
 import { XyOsMonitor } from '@xyo-network/os-runtime'
 import React, { useEffect, useState } from 'react'
 
-import { RenderHtml } from '../../../../../components/index.ts'
-import { useDebugClick } from '../../../../../hooks/index.ts'
-import { DebugDialogWithNode } from '../../../Debug/index.ts'
+import { DebugDialogWithNode } from '../../../../Debug/index.ts'
+import { RenderHtml } from '../../../../RenderHtml.tsx'
+import { useDebugClick } from '../../hooks/index.ts'
 import { BottomMenuArea } from './BottomMenuArea.tsx'
 import { StyledListItemButton, StyledMenuIconWrapSpan } from './StyledListItems.tsx'
 

package/src/modules/Dapp/modules/Window/hooks/index.ts

@@ -1,7 +1,8 @@
 export * from './lib/index.ts'
 export * from './menu/index.ts'
 export * from './route/index.ts'
-export * from './useDappMenuResourceValues.tsx'
+export * from './useDebugClick.ts'
 export * from './useDecomposeDapp.tsx'
+export * from './useExposedNode.ts'
 export * from './useSkipLoadingScreen.js'
 export * from './useSyncOsRegisteredAccessInterfaces.js'

package/src/modules/Dapp/modules/Window/hooks/lib/index.ts

@@ -1,2 +1,2 @@
 export * from './DappPathHelpers.ts'
-export * from './deriveDappState.ts'
+export * from './detectCustomer.ts'

package/src/modules/Dapp/modules/Window/hooks/menu/index.ts

@@ -1 +1,5 @@
-export * from './useDappMenu.js'
+export * from './useAddDappMenuItems.ts'
+export * from './useBuildDappMenuResource.ts'
+export * from './useDappMenu.ts'
+export * from './useDappMenuCaller.ts'
+export * from './useDappMenuDependencies.ts'

package/src/{hooks/menu/useAddDappMenuItems.tsx → modules/Dapp/modules/Window/hooks/menu/useAddDappMenuItems.ts}

@@ -1,9 +1,9 @@
 import { usePromise } from '@xylabs/react-promise'
 import type { Payload } from '@xyo-network/payload-model'
 
-import { useXyOsUiContext } from '../../modules/index.ts'
-import { DappMenuResourceHooks } from './useBuildDappMenuResource.js'
-import { useDappMenuCaller } from './useDappMenuCaller.js'
+import { useXyOsUiContext } from '../../../../../XyOsUi/index.ts'
+import { DappMenuResourceHooks } from './useBuildDappMenuResource.ts'
+import { useDappMenuCaller } from './useDappMenuCaller.ts'
 
 export const useAddDappMenuItems = (payloads: Payload[]) => {
   const xyOs = useXyOsUiContext()

package/src/{hooks → modules/Dapp/modules/Window/hooks}/menu/useBuildDappMenuResource.ts

@@ -3,9 +3,9 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import type { DappMenuResourceViews } from '@xyo-network/os-runtime'
 import { DappMenuResource } from '@xyo-network/os-runtime'
 
-import { ResourceHooks } from '../ResourceHooks.js'
-import { useCleanUpResource } from '../useCleanup.js'
-import { useSyncExternalPayloadStore } from '../useSyncExternalPayloadStore.js'
+import {
+  ResourceHooks, useCleanUpResource, useSyncExternalPayloadStore,
+} from '../../../../../resource/index.ts'
 
 export const useBuildDappMenuResource = (xyOsContext?: XyOsContext | null) => {
   const resource = usePromise(async () => {

package/src/modules/Dapp/modules/Window/hooks/menu/{useDappMenu.tsx → useDappMenu.ts}

@@ -7,7 +7,7 @@ import { useNavigate, useParams } from 'react-router-dom'
 
 import type { DappMenuProperties } from '../../types/index.ts'
 import { DappPathHelpers } from '../lib/index.ts'
-import { useDappMenuDependencies } from '../useDappMenuResourceValues.tsx'
+import { useDappMenuDependencies } from './useDappMenuDependencies.ts'
 
 /**
  * Use the passed in dapp Node to resolve menu related modules and return the menu related items

package/src/{hooks/menu/useDappMenuCaller.tsx → modules/Dapp/modules/Window/hooks/menu/useDappMenuCaller.ts}

@@ -3,7 +3,7 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import { DappMenuCaller } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useXyOsUiContext } from '../../modules/index.ts'
+import { useXyOsUiContext } from '../../../../../XyOsUi/index.ts'
 
 type DappMenuCallerHookOptions = {
   ignoreProvidedNode?: boolean

package/src/modules/Dapp/modules/Window/hooks/{useDappMenuResourceValues.tsx → menu/useDappMenuDependencies.ts}

@@ -1,7 +1,7 @@
 import type { XyOsContext } from '@xyo-network/os-model'
 import { useMemo } from 'react'
 
-import { DappMenuResourceHooks } from '../../../../../hooks/index.ts'
+import { DappMenuResourceHooks } from './useBuildDappMenuResource.ts'
 
 export const useDappMenuDependencies = (context?: XyOsContext | null) => {
   const {

package/src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappIntentRequest.tsx

@@ -8,7 +8,8 @@ import { asOptionalDappIntent, DappIntentTypes } from '@xyo-network/os-model'
 import { DappIntentCaller } from '@xyo-network/os-runtime'
 import { useEffect, useState } from 'react'
 
-import { useDappCaller, useSendDappIntent } from '../../../../../../../hooks/index.ts'
+import { useSendDappIntent } from '../../../../../../intent/index.ts'
+import { useDappCaller } from '../../../../../useDappCaller.ts'
 
 // React to new intents inserted into the dapp archivist
 export const useManageDappIntentRequest = (context?: XyOsContext | null, dappId?: DappId) => {

package/src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappPathFromRoute.tsx

@@ -5,9 +5,8 @@ import {
 } from 'react'
 import { useNavigate, useParams } from 'react-router-dom'
 
-import { useDappMenuCaller } from '../../../../../../../hooks/index.ts'
 import { DappPathHelpers } from '../../lib/index.ts'
-import { useDappMenuDependencies } from '../../useDappMenuResourceValues.js'
+import { useDappMenuCaller, useDappMenuDependencies } from '../../menu/index.ts'
 
 /**
  * Update the menu archivist based off changes in the the `path` route param

package/src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappStateFromRoute.tsx

@@ -5,7 +5,7 @@ import { DappIntentCaller, NameTransforms } from '@xyo-network/os-runtime'
 import { useRef } from 'react'
 import { useParams } from 'react-router-dom'
 
-import { useDappIntentCaller, useSendDappIntent } from '../../../../../../../hooks/index.ts'
+import { useDappIntentCaller, useSendDappIntent } from '../../../../../../intent/index.ts'
 
 /** Launch or close the dapp based off changes to the `dappName` route param */
 export const useManageDappStateFromRoute = (intentPayload?: DappIntent) => {

package/src/{hooks → modules/Dapp/modules/Window/hooks}/useExposedNode.ts

@@ -1,4 +1,4 @@
-import { useXyOsUiContext } from '../modules/index.ts'
+import { useXyOsUiContext } from '../../../../XyOsUi/index.ts'
 
 export const useExposedNode = () => {
   const xyOS = useXyOsUiContext()

package/src/modules/Dapp/modules/Window/hooks/useSkipLoadingScreen.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import { useSearchParams } from 'react-router-dom'
 
-import { detectCustomer } from '../../../../../hooks/index.ts'
+import { detectCustomer } from './lib/index.ts'
 
 const PARAMS_TO_TARGET = ['username', 'utm_source'] as const
 

package/src/modules/Dapp/modules/Window/hooks/useSyncOsRegisteredAccessInterfaces.tsx

@@ -3,7 +3,7 @@ import type { ArchivistModuleEventData } from '@xyo-network/archivist-model'
 import type { XyOsContext } from '@xyo-network/os-model'
 import { useWeakArchivistFromNode } from '@xyo-network/react-archivist'
 
-import { useDappCaller } from '../../../../../hooks/index.ts'
+import { useDappCaller } from '../../../useDappCaller.ts'
 
 /**
  * Syncs the registered access interfaces from the Os with the DappArchivist

package/src/modules/Dapp/modules/Window/index.ts

@@ -3,6 +3,5 @@ export * from './Chrome.tsx'
 export * from './components/index.ts'
 export * from './DappWindow.tsx'
 export * from './hooks/index.ts'
-export * from './menu/index.ts'
 export * from './Rendered.tsx'
 export * from './types/index.ts'

package/src/modules/Dapp/modules/Window/types/DappWindowProps.ts

@@ -1,7 +1,7 @@
 import type { RegisteredReactDapp, XyOsUiContext } from '@xyo-network/os-react-model'
 import type { WalletInstance } from '@xyo-network/wallet-model'
 
-import type { DappState } from '../hooks/index.ts'
+import type { DappState } from '../../../lib/index.ts'
 import type { DappMenuProperties } from './DappMenuProperties.ts'
 
 export interface DappWindowProps {

package/src/modules/Dapp/modules/access-interface/hooks/useDialogState.tsx

@@ -3,7 +3,8 @@ import type { RegisteredDappAccess, XyOsContext } from '@xyo-network/os-model'
 import { isRegisteredDappAccess, RegisteredNames } from '@xyo-network/os-model'
 import { useState } from 'react'
 
-import { DappAccessRequestResourceHooks, useDappCaller } from '../../../../../hooks/index.ts'
+import { DappAccessRequestResourceHooks } from '../../../../access-requests/index.ts'
+import { useDappCaller } from '../../../useDappCaller.ts'
 
 export const useDialogState = (context?: XyOsContext | null) => {
   const dappCaller = useDappCaller()

package/src/{hooks/useDappCaller.tsx → modules/Dapp/useDappCaller.ts}

@@ -2,7 +2,7 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import { DappCaller } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useXyOsUiContext } from '../modules/index.ts'
+import { useXyOsUiContext } from '../XyOsUi/index.ts'
 
 export const useDappCaller = (context?: XyOsContext | null) => {
   const xyOs = useXyOsUiContext()

package/src/{hooks → modules/access-requests}/NameServiceRegistrationHooks.ts

@@ -3,9 +3,9 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import type { XnsRegistrationsViews } from '@xyo-network/os-runtime'
 import { XnsRegistrationsResource } from '@xyo-network/os-runtime'
 
-import { ResourceHooks } from './ResourceHooks.ts'
-import { useCleanUpResource } from './useCleanup.tsx'
-import { useSyncExternalPayloadStore } from './useSyncExternalPayloadStore.tsx'
+import {
+  ResourceHooks, useCleanUpResource, useSyncExternalPayloadStore,
+} from '../resource/index.ts'
 
 export const useBuildNameServiceRegistrationsResource = (context?: XyOsContext | null, pathPrefix?: string) => {
   const result = usePromise(async () => {

package/src/modules/access-requests/index.ts

@@ -0,0 +1,2 @@
+export * from './NameServiceRegistrationHooks.ts'
+export * from './useBuildDappAccessRequestResource.ts'

package/src/{hooks → modules}/access-requests/useBuildDappAccessRequestResource.ts

@@ -3,9 +3,9 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import type { DappAccessRequestViews } from '@xyo-network/os-runtime'
 import { DappAccessRequestResource } from '@xyo-network/os-runtime'
 
-import { ResourceHooks } from '../ResourceHooks.ts'
-import { useCleanUpResource } from '../useCleanup.tsx'
-import { useSyncExternalPayloadStore } from '../useSyncExternalPayloadStore.tsx'
+import {
+  ResourceHooks, useCleanUpResource, useSyncExternalPayloadStore,
+} from '../resource/index.ts'
 
 export const useBuildDappAccessRequestResource = (context?: XyOsContext | null) => {
   const resource = usePromise(async () => {

package/src/modules/bios/index.ts

@@ -0,0 +1 @@
+export * from './hooks/index.ts'

package/src/modules/dapps/accounts/components/AnimatedComponents/GenericAnimations/index.ts

@@ -0,0 +1 @@
+export { ShiftAnimation } from './ShiftAnimation.tsx'

package/src/{dapps/shared → modules/dapps}/accounts/components/AnimatedComponents/IconAnimations/TwoToneBulletPointList.tsx

@@ -2,7 +2,7 @@ import { FlexCol, FlexGrowRow } from '@xylabs/react-flexbox'
 import type { ReactNode } from 'react'
 import React from 'react'
 
-import { TwoToneBulletPoint } from './TwoToneBulletPoint.js'
+import { TwoToneBulletPoint } from './TwoToneBulletPoint.tsx'
 
 export interface TwoToneBulletPointListProps {
   list: ReactNode[]

package/src/modules/dapps/accounts/components/AnimatedComponents/IconAnimations/index.ts

@@ -0,0 +1,2 @@
+export { TwoToneBulletPoint } from './TwoToneBulletPoint.tsx'
+export { TwoToneBulletPointList } from './TwoToneBulletPointList.tsx'

package/src/modules/dapps/accounts/components/InputFields/index.ts

@@ -0,0 +1,3 @@
+export * from './CoinbaseEmail.tsx'
+export * from './PrimaryCryptowallet.tsx'
+export * from './SecondaryCryptowallet.tsx'

package/src/{dapps/shared → modules/dapps}/accounts/components/PaymentMethods.tsx

@@ -3,8 +3,8 @@ import type { FlexBoxProps } from '@xylabs/react-flexbox'
 import { FormGroupCreditCardProvider } from '@xyo-network/react-form-credit-card'
 import React from 'react'
 
-import { DappPage } from '../../../../DappPage.js'
-import { AccountCard } from './AccountCard.js'
+import { DappPage } from '../../../Dapp/index.ts'
+import { AccountCard } from './AccountCard.tsx'
 import {
   CoinbaseEmailInput, PrimaryCryptoWalletInput, SecondaryCryptoWalletInput,
 } from './InputFields/index.ts'

package/src/{dapps/shared → modules/dapps}/accounts/components/index.ts

@@ -1,3 +1,3 @@
 export * from './AnimatedComponents/index.ts'
 export * from './InputFields/index.ts'
-export * from './PaymentMethods.js'
+export * from './PaymentMethods.tsx'

package/src/modules/dapps/accounts/hooks/index.ts

@@ -0,0 +1 @@
+export * from './useAccountArchivist.ts'

package/src/modules/dapps/accounts/icon/index.ts

@@ -0,0 +1 @@
+export * from './Icon.tsx'

package/src/{dapps/shared → modules/dapps}/accounts/index.ts

@@ -1,2 +1,3 @@
 export * from './components/index.ts'
+export * from './hooks/index.ts'
 export * from './models/index.ts'

package/src/modules/dapps/accounts/models/index.ts

@@ -0,0 +1 @@
+export * from './CreditCardInput.ts'

package/src/modules/dapps/name-service/index.ts

@@ -0,0 +1 @@
+export * from './DomainIcon.tsx'

package/src/{dapps/shared → modules/dapps}/table/head/Payload.ts

@@ -2,7 +2,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import type { TableHeadCell as TableHeadCellFields } from '@xyo-network/react-table'
 
-import { TableHeadCellSchema } from './Schema.js'
+import { TableHeadCellSchema } from './Schema.ts'
 
 export type TableHeadCell = Payload<TableHeadCellFields & {
   tooltip?: string

package/src/{dapps/shared → modules/dapps}/table/head/components/Head.tsx

@@ -6,8 +6,8 @@ import {
 import React from 'react'
 
 import { useVisibleColumns } from '../hooks/index.ts'
-import type { TableHeadCell } from '../Payload.js'
-import { StyledTableRowHeader } from './StyledTableRowHeader.js'
+import type { TableHeadCell } from '../Payload.ts'
+import { StyledTableRowHeader } from './StyledTableRowHeader.tsx'
 
 interface TableHeadExProps extends TableHeadProps {
   payloads: TableHeadCell[]

package/src/modules/dapps/table/head/components/index.ts

@@ -0,0 +1 @@
+export * from './Head.tsx'

package/src/modules/dapps/table/head/hooks/index.ts

@@ -0,0 +1 @@
+export * from './useVisibleColumns.tsx'

package/src/{dapps/shared → modules/dapps}/table/head/hooks/useVisibleColumns.tsx

@@ -2,7 +2,7 @@ import type { Theme } from '@mui/material'
 import { useMediaQuery } from '@mui/material'
 import { useMemo } from 'react'
 
-import type { TableHeadCell } from '../Payload.js'
+import type { TableHeadCell } from '../Payload.ts'
 
 export const useVisibleColumns = (tableHeadCells: TableHeadCell[]): [TableHeadCell[], boolean] => {
   const isMedium = useMediaQuery((theme: Theme) => theme.breakpoints.down('lg'))

package/src/{dapps/shared → modules/dapps}/table/head/index.ts

@@ -1,4 +1,4 @@
 export * from './components/index.ts'
 export * from './hooks/index.ts'
-export * from './Payload.js'
-export * from './Schema.js'
+export * from './Payload.ts'
+export * from './Schema.ts'

package/src/modules/dapps/table/index.ts

@@ -0,0 +1,2 @@
+export * from './head/index.ts'
+export * from './NextIteratorFlexbox.tsx'

package/src/modules/index.ts

@@ -1,4 +1,12 @@
+export * from './access-requests/index.ts'
+export * from './bios/index.ts'
 export * from './Dapp/index.ts'
+export * from './dapps/index.ts'
+export * from './intent/index.ts'
 export * from './LoadingOsLogo/index.ts'
 export * from './network/index.ts'
+export * from './os/index.ts'
+export * from './resource/index.ts'
+export * from './stack/index.ts'
+export * from './widgets/index.ts'
 export * from './XyOsUi/index.ts'

package/src/{hooks → modules/intent}/DappIntentResourceHooks.ts

@@ -3,9 +3,9 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import type { DappIntentViews } from '@xyo-network/os-runtime'
 import { DappIntentResource } from '@xyo-network/os-runtime'
 
-import { ResourceHooks } from './ResourceHooks.ts'
-import { useCleanUpResource } from './useCleanup.tsx'
-import { useSyncExternalPayloadStore } from './useSyncExternalPayloadStore.tsx'
+import {
+  ResourceHooks, useCleanUpResource, useSyncExternalPayloadStore,
+} from '../resource/index.ts'
 
 export const useBuildIntentResource = (context?: XyOsContext | null) => {
   const resource = usePromise(async () => {

package/src/modules/intent/index.ts

@@ -0,0 +1,7 @@
+export * from './DappIntentResourceHooks.ts'
+export * from './useClearIntents.ts'
+export * from './useDappIntentCaller.ts'
+export * from './useDappIntentListener.ts'
+export * from './useDappIntentListener2.ts'
+export * from './useNavigateIntent.ts'
+export * from './useSendDappIntent.ts'

package/src/{hooks/useDappIntentCaller.tsx → modules/intent/useDappIntentCaller.ts}

@@ -3,7 +3,7 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import { DappIntentCaller } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useXyOsUiContext } from '../modules/index.ts'
+import { useXyOsUiContext } from '../XyOsUi/index.ts'
 
 export const useDappIntentCaller = (xyOsContext?: XyOsContext | null) => {
   const xyOs = useXyOsUiContext()

package/src/{hooks/intent/useDappIntentListener2.tsx → modules/intent/useDappIntentListener2.ts}

@@ -2,7 +2,7 @@
 import { DappIntentTypes, DappMode } from '@xyo-network/os-model'
 import { useEffect, useState } from 'react'
 
-import { DappIntentResourceHooks } from '../DappIntentResourceHooks.js'
+import { DappIntentResourceHooks } from './DappIntentResourceHooks.ts'
 
 /**
  * Note: This is a modified version of the original useDappIntentListener hook.

package/src/modules/network/hooks/lib/createNetworkState.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 
-import type { StackReady } from '../../../../hooks/index.ts'
+import type { StackReady } from '../../../../interfaces/index.ts'
 import type { NetworkState } from './NetworkState.ts'
 
 const defaultNetworkState: NetworkState = {

package/src/modules/network/hooks/useOsNetwork.tsx

@@ -1,7 +1,7 @@
 import { OsPubSubNetworkReadyEvent } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useStackReady } from '../../../hooks/index.ts'
+import { useStackReady } from '../../stack/index.ts'
 import { useXyOsUiContext } from '../../XyOsUi/index.ts'
 import { createNetworkState, type NetworkState } from './lib/index.ts'
 

package/src/modules/network/hooks/useXyoPublicNetwork.tsx

@@ -1,7 +1,7 @@
 import { OsXyoPublicNetworkReadyEvent } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useStackReady } from '../../../hooks/index.ts'
+import { useStackReady } from '../../stack/index.ts'
 import { useXyOsUiContext } from '../../XyOsUi/index.ts'
 import { createNetworkState, type NetworkState } from './lib/index.ts'
 

package/src/modules/os/hooks/index.ts

@@ -0,0 +1,8 @@
+export * from './useDappContextCreator.ts'
+export * from './useDappRegistrationResults.ts'
+export * from './useDappRegistry.ts'
+export * from './useDappSeedPhraseRepository.ts'
+export * from './useOsSettingsCaller.ts'
+export * from './usePhraseFile.ts'
+export * from './useTabs.ts'
+export * from './useWidgetDapps.ts'

package/src/{hooks/os/useDappContextCreator.tsx → modules/os/hooks/useDappContextCreator.ts}

@@ -8,7 +8,7 @@ import {
   useCallback, useEffect, useRef, useState,
 } from 'react'
 
-import { useXyOsUiContext } from '../../modules/index.ts'
+import { useXyOsUiContext } from '../../XyOsUi/index.ts'
 
 /**
  * Creates a dapp node for the provided dapp and name

package/src/{hooks/os/useDappRegistrationResults.tsx → modules/os/hooks/useDappRegistrationResults.ts}

@@ -3,7 +3,7 @@ import type { DappRegistrationResults, EventBusPubSubConnectionRequest } from '@
 import { EventBusPubSubConnection } from '@xyo-network/os-runtime'
 import { useEffect, useState } from 'react'
 
-import { useXyOsUiContext } from '../../modules/index.ts'
+import { useXyOsUiContext } from '../../XyOsUi/index.ts'
 
 export const useDappRegistrationResults = () => {
   const context = useXyOsUiContext()

package/src/{hooks/os/useDappRegistry.tsx → modules/os/hooks/useDappRegistry.ts}

@@ -1,7 +1,7 @@
 import { DappRegistry } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useDappSeedPhraseRepository } from './useDappSeedPhraseRepository.js'
+import { useDappSeedPhraseRepository } from './useDappSeedPhraseRepository.ts'
 
 let _dappRegistry: DappRegistry
 

package/src/{hooks/os/useDappSeedPhraseRepository.tsx → modules/os/hooks/useDappSeedPhraseRepository.ts}

@@ -1,7 +1,7 @@
 import { DappSeedPhraseRepository } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useXyOsUiContext } from '../../modules/index.ts'
+import { useXyOsUiContext } from '../../XyOsUi/index.ts'
 
 let _dappWalletRepository: DappSeedPhraseRepository
 

package/src/{hooks/useOsSettingsCaller.tsx → modules/os/hooks/useOsSettingsCaller.ts}

@@ -3,8 +3,8 @@ import type { XyOsContext } from '@xyo-network/os-model'
 import { OsSettingsCaller, OsSettingsReadyEvent } from '@xyo-network/os-runtime'
 import { useMemo } from 'react'
 
-import { useXyOsUiContext } from '../modules/index.ts'
-import { useStackReady } from './useStackReady.tsx'
+import { useStackReady } from '../../stack/index.ts'
+import { useXyOsUiContext } from '../../XyOsUi/index.ts'
 
 export const useOsSettingsCaller = (context?: XyOsContext | null) => {
   const providedContext = useXyOsUiContext()