@xyo-network/os-react-runtime 4.1.4 → 4.2.0-rc.2

package/dist/browser/modules/Dapp/Button/IconEx.d.ts

@@ -1,10 +1,12 @@
 import type { ButtonExProps } from '@xylabs/react-button';
 import type { DappIcon, DappName } from '@xyo-network/os-model';
 import React from 'react';
-export type DappProps = ButtonExProps & {
+import type { DappState } from '../modules/index.ts';
+export type DappIconButtonProps = ButtonExProps & {
     dappIcon?: DappIcon;
     dappIconSvg?: string;
     dappName?: DappName;
+    dappState?: DappState;
 };
-export declare const DappIconButton: React.FC<DappProps>;
+export declare const DappIconButton: React.FC<DappIconButtonProps>;
 //# sourceMappingURL=IconEx.d.ts.map

package/dist/browser/modules/Dapp/Button/IconEx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IconEx.d.ts","sourceRoot":"","sources":["../../../../../src/modules/Dapp/Button/IconEx.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,KAAiB,MAAM,OAAO,CAAA;AAYrC,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG;IACtC,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAmE9C,CAAA"}
+{"version":3,"file":"IconEx.d.ts","sourceRoot":"","sources":["../../../../../src/modules/Dapp/Button/IconEx.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,KAAK,EACV,QAAQ,EACR,QAAQ,EACT,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAiB,MAAM,OAAO,CAAA;AAKrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQpD,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAiExD,CAAA"}

package/dist/browser/modules/Dapp/Container.d.ts

@@ -1,9 +1,12 @@
+import type { DappIntent } from '@xyo-network/os-model';
 import type { RegisteredReactDappSet } from '@xyo-network/os-react-model';
 import React from 'react';
 export interface DappContainerProps {
+    currentIntent?: DappIntent;
     dappSet: RegisteredReactDappSet;
     xnsNetwork: string | undefined;
     xnsNodeUrl: string | undefined;
 }
 export declare const DappContainer: React.FC<DappContainerProps>;
+export declare const DappContainerMemo: React.NamedExoticComponent<DappContainerProps>;
 //# sourceMappingURL=Container.d.ts.map

package/dist/browser/modules/Dapp/Container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../../src/modules/Dapp/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,sBAAsB,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAStD,CAAA"}
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../../src/modules/Dapp/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAwB,MAAM,OAAO,CAAA;AAM5C,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,UAAU,CAAA;IAC1B,OAAO,EAAE,sBAAsB,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgCtD,CAAA;AAED,eAAO,MAAM,iBAAiB,gDAAsB,CAAA"}

package/dist/browser/modules/Dapp/Page/Row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Row.d.ts","sourceRoot":"","sources":["../../../../../src/modules/Dapp/Page/Row.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAkB,MAAM,OAAO,CAAA;AAMtC,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,gBAAgB,CAAA;IAC7B,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CA6B5C,CAAA;AAED,eAAO,MAAM,mBAAmB,ySAQ7B,CAAA"}
+{"version":3,"file":"Row.d.ts","sourceRoot":"","sources":["../../../../../src/modules/Dapp/Page/Row.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAkB,MAAM,OAAO,CAAA;AAOtC,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,gBAAgB,CAAA;IAC7B,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAuC5C,CAAA;AAED,eAAO,MAAM,mBAAmB,ySAQ7B,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/DappWindow.d.ts

@@ -1,9 +1,15 @@
+import type { DappIntent, XyOsContext } from '@xyo-network/os-model';
 import type { RegisteredReactDappSet } from '@xyo-network/os-react-model';
+import type { WalletInstance } from '@xyo-network/wallet-model';
 import React from 'react';
+import type { DappState } from './hooks/index.ts';
 export interface DappWindowProps {
+    context?: XyOsContext | null;
     dappSet?: RegisteredReactDappSet;
-    xnsNetwork: string | undefined;
-    xnsNodeUrl: string | undefined;
+    dappState?: DappState;
+    dappWallet?: WalletInstance;
+    intent?: DappIntent;
+    nodeCreateError?: Error;
 }
 /** A component that can load immediately, but delays node loading and dapp mounting till corresponding launch intent arrives */
 export declare const DappWindow: React.FC<DappWindowProps>;

package/dist/browser/modules/Dapp/modules/Window/DappWindow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DappWindow.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/Dapp/modules/Window/DappWindow.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAIzE,OAAO,KAAkB,MAAM,OAAO,CAAA;AActC,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,sBAAsB,CAAA;IAChC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,gIAAgI;AAChI,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA0HhD,CAAA"}
+{"version":3,"file":"DappWindow.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/Dapp/modules/Window/DappWindow.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAIzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAkB,MAAM,OAAO,CAAA;AAOtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAOjD,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC5B,OAAO,CAAC,EAAE,sBAAsB,CAAA;IAChC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,eAAe,CAAC,EAAE,KAAK,CAAA;CACxB;AAED,gIAAgI;AAChI,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwHhD,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/hooks/index.d.ts

@@ -1,6 +1,6 @@
+export * from './lib/index.ts';
 export * from './menu/index.ts';
 export * from './route/index.ts';
-export * from './useDappState.js';
 export * from './useDecomposeDappSet.js';
 export * from './useSkipLoadingScreen.js';
 export * from './useSyncOsRegisteredAccessInterfaces.js';

package/dist/browser/modules/Dapp/modules/Window/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/Dapp/modules/Window/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0CAA0C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/Dapp/modules/Window/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0CAA0C,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/hooks/lib/deriveDappState.d.ts

@@ -0,0 +1,8 @@
+import type { DappIntent, XyOsContext } from '@xyo-network/os-model';
+export interface DappState {
+    active: boolean;
+    minimized: boolean;
+    open: boolean;
+}
+export declare const deriveDappState: (intent?: DappIntent, context?: XyOsContext | null) => DappState;
+//# sourceMappingURL=deriveDappState.d.ts.map

package/dist/browser/modules/Dapp/modules/Window/hooks/lib/deriveDappState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deriveDappState.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/Dapp/modules/Window/hooks/lib/deriveDappState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGpE,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,OAAO,CAAA;CACd;AAED,eAAO,MAAM,eAAe,YAAa,UAAU,YAAY,WAAW,GAAG,IAAI,KAAG,SAUnF,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/hooks/lib/index.d.ts

@@ -1,2 +1,3 @@
-export * from './DappPathHelpers.js';
+export * from './DappPathHelpers.ts';
+export * from './deriveDappState.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/browser/modules/Dapp/modules/Window/hooks/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/Dapp/modules/Window/hooks/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/Dapp/modules/Window/hooks/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/os-react-runtime",
-  "version": "4.1.4",
+  "version": "4.2.0-rc.2",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -48,23 +48,23 @@
     "@xylabs/react-shared": "^5.3.14",
     "@xyo-network/archivist-indexeddb": "^3.6.6",
     "@xyo-network/archivist-model": "^3.6.6",
-    "@xyo-network/bios-browser": "^4.1.4",
-    "@xyo-network/bios-model": "^4.1.4",
+    "@xyo-network/bios-browser": "^4.2.0-rc.2",
+    "@xyo-network/bios-model": "^4.2.0-rc.2",
     "@xyo-network/diviner-boundwitness-indexeddb": "^3.6.6",
     "@xyo-network/diviner-model": "^3.6.6",
     "@xyo-network/diviner-payload-generic": "^3.6.6",
     "@xyo-network/diviner-payload-indexeddb": "^3.6.6",
     "@xyo-network/diviner-payload-model": "^3.6.6",
-    "@xyo-network/kernel": "^4.1.4",
-    "@xyo-network/kernel-model": "^4.1.4",
+    "@xyo-network/kernel": "^4.2.0-rc.2",
+    "@xyo-network/kernel-model": "^4.2.0-rc.2",
     "@xyo-network/module-event-emitter": "^3.6.6",
     "@xyo-network/module-events": "^3.6.6",
     "@xyo-network/module-factory-locator": "^3.6.6",
     "@xyo-network/node-model": "^3.6.6",
-    "@xyo-network/os-model": "^4.1.4",
-    "@xyo-network/os-react-debug": "^4.1.4",
-    "@xyo-network/os-react-model": "^4.1.4",
-    "@xyo-network/os-runtime": "^4.1.4",
+    "@xyo-network/os-model": "^4.2.0-rc.2",
+    "@xyo-network/os-react-debug": "^4.2.0-rc.2",
+    "@xyo-network/os-react-model": "^4.2.0-rc.2",
+    "@xyo-network/os-runtime": "^4.2.0-rc.2",
     "@xyo-network/payload-model": "^3.6.6",
     "@xyo-network/react-archivist": "^4.3.1",
     "@xyo-network/react-card": "^4.3.1",
@@ -112,5 +112,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "stableVersion": "4.1.4"
 }

package/src/helpers/index.ts

@@ -3,4 +3,3 @@ export * from './BrowserLocator.js'
 export * from './monitor/index.ts'
 export * from './NodePalettes.js'
 export * from './widget/index.ts'
-export * from './widgets/index.ts'

package/src/hooks/intent/useDappIntentListener.tsx

@@ -16,7 +16,9 @@ export const useDappIntentListener = (dappName?: string | null, targetMode = Dap
     const listener = ({ payloads }: ArchivistModuleEventData['inserted']) => {
       const filteredPayloads = payloads.filter(isDappIntentWithMeta)
       for (const payload of filteredPayloads) {
-        if (payload.targetDappId === dappName && payload.targetMode === targetMode) {
+        const allDapps = dappName === null && payload.targetMode === targetMode
+        const targetDapps = dappName === payload.targetDappId && payload.targetMode === targetMode
+        if (allDapps || targetDapps) {
           setIntentPayload(payload)
           switch (payload.intent) {
             case DappIntentTypes.Close: {

package/src/hooks/os/useDappContextCreator.tsx

@@ -1,5 +1,7 @@
 import { useAsyncEffect } from '@xylabs/react-async-effect'
-import type { RegisteredDapp, WindowDappNodeSet } from '@xyo-network/os-model'
+import type {
+  DappIntent, RegisteredDapp, WindowDappNodeSet,
+} from '@xyo-network/os-model'
 import { DappIntentTypes } from '@xyo-network/os-model'
 import { DappContextCreator, RunningDappCache } from '@xyo-network/os-runtime'
 import {
@@ -7,7 +9,6 @@ import {
 } from 'react'
 
 import { useXyOsUiContext } from '../../modules/index.ts'
-import { useDappIntentListener } from '../intent/index.ts'
 
 /**
  * Creates a dapp node for the provided dapp and name
@@ -18,6 +19,7 @@ export const useDappContextCreator = (
   xnsNodeUrl: string | undefined,
   xnsNetwork: string | undefined,
   dapp?: RegisteredDapp,
+  currentIntent?: DappIntent,
   allowedNames?: string[],
   createOnMount = false,
 ): WindowDappNodeSet & {
@@ -26,7 +28,8 @@ export const useDappContextCreator = (
   const context = useXyOsUiContext()
   const [windowDappNodeSet, setWindowDappNodeSet] = useState<WindowDappNodeSet>({ context: undefined, dappWallet: undefined })
   const [dappWindowNodeError, setDappWindowNodeError] = useState<Error>()
-  const { dappIntentType: intentType } = useDappIntentListener(dapp?.config.name)
+  // ensure the dapp is targeted by the current intent
+  const targetedDapp = !!(dapp && context && currentIntent?.targetDappId === dapp?.config.name)
 
   // Keep a ref of the windowDappNodeSet to use in effect hooks without needing it as a dependency
   const windowDappNodeSetRef = useRef<WindowDappNodeSet>(windowDappNodeSet)
@@ -35,7 +38,7 @@ export const useDappContextCreator = (
   }, [windowDappNodeSet])
 
   const createNode = useCallback(async () => {
-    if (dapp && context) {
+    if (targetedDapp) {
       try {
         const windowDappNodeSet = await RunningDappCache.findOrCreate(dapp, context, allowedNames ?? [], xnsNodeUrl, xnsNetwork)
         setWindowDappNodeSet(windowDappNodeSet)
@@ -43,7 +46,7 @@ export const useDappContextCreator = (
         setDappWindowNodeError(e as Error)
       }
     }
-  }, [dapp, context, allowedNames])
+  }, [dapp, currentIntent, context, allowedNames])
 
   useEffect(() => {
     if (createOnMount) {
@@ -57,24 +60,27 @@ export const useDappContextCreator = (
   useAsyncEffect(
 
     async () => {
-      switch (intentType) {
-        case DappIntentTypes.Launch: {
-          await createNode()
-          break
-        }
-        case DappIntentTypes.Close: {
-          if (windowDappNodeSetRef.current.context) {
-            // In case a cached dapp was closed, clear its Dapp Archivist to allow for a fresh start upon next launch
-            await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context)
-            setWindowDappNodeSet({ context: null, dappWallet: undefined })
+      // unless the dapp was passed, do nothing
+      if (targetedDapp) {
+        switch (currentIntent?.intent) {
+          case DappIntentTypes.Launch: {
+            await createNode()
+            break
+          }
+          case DappIntentTypes.Close: {
+            if (windowDappNodeSetRef.current.context) {
+              // In case a cached dapp was closed, clear its Dapp Archivist to allow for a fresh start upon next launch
+              await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context)
+              setWindowDappNodeSet({ context: null, dappWallet: undefined })
+            }
+            break
           }
-          break
+          case DappIntentTypes.Minimize:
+          // do nothing
         }
-        case DappIntentTypes.Minimize:
-        // do nothing
       }
     },
-    [createNode, intentType],
+    [createNode, currentIntent],
   )
 
   return {

package/src/modules/Dapp/Button/IconEx.tsx

@@ -2,14 +2,18 @@
 import { Circle } from '@mui/icons-material'
 import type { ButtonExProps } from '@xylabs/react-button'
 import { FlexCol } from '@xylabs/react-flexbox'
-import type { DappIcon, DappName } from '@xyo-network/os-model'
+import type {
+  DappIcon,
+  DappName,
+} from '@xyo-network/os-model'
 import { DappIntentTypes } from '@xyo-network/os-model'
 import { DappIntentCaller, XyOsMonitor } from '@xyo-network/os-runtime'
 import React, { useRef } from 'react'
 
 import { RenderHtml } from '../../../components/index.ts'
-import { useDappIntentListener, useSendDappIntent } from '../../../hooks/index.ts'
+import { useSendDappIntent } from '../../../hooks/index.ts'
 import { DEFAULT_ICON_SIZE } from '../lib/index.ts'
+import type { DappState } from '../modules/index.ts'
 import { useLaunchPoint } from './hooks/index.ts'
 import { DappLaunchFrame } from './LaunchFrame.js'
 import { decomposeProps } from './lib/index.ts'
@@ -17,36 +21,35 @@ import {
   StyledDappIconButtonEx, StyledDappName, StyledDefaultDappIcon,
 } from './StyledComponents.js'
 
-export type DappProps = ButtonExProps & {
+export type DappIconButtonProps = ButtonExProps & {
   dappIcon?: DappIcon
   dappIconSvg?: string
   dappName?: DappName
+  dappState?: DappState
 }
 
-export const DappIconButton: React.FC<DappProps> = ({
-  children, dappIcon, dappIconSvg, dappName, ...props
+export const DappIconButton: React.FC<DappIconButtonProps> = ({
+  children, dappIcon, dappIconSvg, dappName, dappState, ...props
 }) => {
   const {
     DappIconSize, color, nonSxProps, sx,
   } = decomposeProps(dappIcon, props)
   const iconSize = DEFAULT_ICON_SIZE
 
+  const { active, minimized } = dappState ?? {}
+
   // Functions to invoke Dapp intents
   const sendIntent = useSendDappIntent()
 
-  // Current state of the dapp based off intents
-  const { dappIntentType: intentType } = useDappIntentListener(dappName)
-
   // Use the DappIconButton to calculate the launch point for the DappWindow
   const iconButtonRef = useRef<HTMLSpanElement>(null)
   const { left: launchLeft, top: launchTop } = useLaunchPoint(iconButtonRef)
 
-  const minimized = intentType === DappIntentTypes.Minimize
   const MiddleEllipsisFunction = (str: DappName | undefined) => {
     if (str && str.length > 25) {
-      console.log(str)
-      console.log(str.slice(0, 15))
-      console.log(str.slice(-10, str.length - 10 + str.length))
+      // console.log(str)
+      // console.log(str.slice(0, 15))
+      // console.log(str.slice(-10, str.length - 10 + str.length))
       return str.slice(0, 15) + '...' + str.slice(-7, str.length - 7 + str.length)
     }
     return str
@@ -59,7 +62,7 @@ export const DappIconButton: React.FC<DappProps> = ({
 
   return (
     <FlexCol alignItems="stretch" justifyContent="stretch">
-      <DappLaunchFrame id="dapp-launch-frame" open={intentType === DappIntentTypes.Launch} launchLeft={launchLeft} launchTop={launchTop}>
+      <DappLaunchFrame id="dapp-launch-frame" open={!!active} launchLeft={launchLeft} launchTop={launchTop}>
         {children}
       </DappLaunchFrame>
       <span

package/src/modules/Dapp/Container.tsx

@@ -1,22 +1,50 @@
+import type { DappIntent } from '@xyo-network/os-model'
 import type { RegisteredReactDappSet } from '@xyo-network/os-react-model'
-import React from 'react'
+import React, { memo, useMemo } from 'react'
 
+import { useDappContextCreator } from '../../hooks/index.ts'
 import { DappIconButton } from './Button/index.ts'
-import { DappWindow } from './modules/Window/index.ts'
+import { DappWindow, deriveDappState } from './modules/index.ts'
 
 export interface DappContainerProps {
+  currentIntent?: DappIntent
   dappSet: RegisteredReactDappSet
   xnsNetwork: string | undefined
   xnsNodeUrl: string | undefined
 }
 
 export const DappContainer: React.FC<DappContainerProps> = ({
-  dappSet, xnsNodeUrl, xnsNetwork,
+  currentIntent, dappSet, xnsNodeUrl, xnsNetwork,
 }) => {
   const { dapp, dappIcon } = dappSet
+
+  const {
+    dappWallet, context, nodeCreateError,
+  } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp, currentIntent)
+
+  const dappState = useMemo(() => {
+    if (currentIntent?.targetDappId === dapp.config.name) {
+      return deriveDappState(currentIntent, context)
+    }
+  }, [currentIntent, context, dapp])
+
   return (
-    <DappIconButton dappIcon={dappIcon} dappIconSvg={dapp.params.iconSvg} dappName={dapp?.config.name}>
-      <DappWindow dappSet={dappSet} xnsNodeUrl={xnsNodeUrl} xnsNetwork={xnsNetwork} />
+    <DappIconButton
+      dappIcon={dappIcon}
+      dappIconSvg={dapp.params.iconSvg}
+      dappName={dapp?.config.name}
+      dappState={dappState}
+    >
+      <DappWindow
+        context={context}
+        dappSet={dappSet}
+        dappState={dappState}
+        dappWallet={dappWallet}
+        intent={currentIntent}
+        nodeCreateError={nodeCreateError}
+      />
     </DappIconButton>
   )
 }
+
+export const DappContainerMemo = memo(DappContainer)

package/src/modules/Dapp/Page/Row.tsx

@@ -6,8 +6,9 @@ import type { InstallationType } from '@xyo-network/os-model'
 import type { RegisteredReactDappSet } from '@xyo-network/os-react-model'
 import React, { useMemo } from 'react'
 
+import { useDappIntentListener } from '../../../hooks/index.ts'
 import { DappInstallTypeFilters } from '../../../utils/index.ts'
-import { DappContainer } from '../Container.js'
+import { DappContainerMemo } from '../Container.tsx'
 import { DividerChip } from './DividerChip.js'
 
 export interface DappsRowProps {
@@ -22,6 +23,8 @@ export const DappsRow: React.FC<DappsRowProps> = ({
   chipLabel, installType, registeredDappsSet, xnsNetwork, xnsNodeUrl,
 }) => {
   const filteredRegisteredDappSets = useMemo(() => DappInstallTypeFilters[installType](registeredDappsSet), [installType, registeredDappsSet])
+  const { intentPayload } = useDappIntentListener(null)
+
   return (
     <>
       <Divider
@@ -39,7 +42,15 @@ export const DappsRow: React.FC<DappsRowProps> = ({
             <Fade in={!!filteredRegisteredDappSets?.length} timeout={1000}>
               <StyledGridContainer>
                 {filteredRegisteredDappSets?.map(
-                  (dappSet, index) => <DappContainer key={index} dappSet={dappSet as RegisteredReactDappSet} xnsNodeUrl={xnsNodeUrl} xnsNetwork={xnsNetwork} />,
+                  (dappSet, index) => (
+                    <DappContainerMemo
+                      currentIntent={intentPayload}
+                      key={index}
+                      dappSet={dappSet as RegisteredReactDappSet}
+                      xnsNodeUrl={xnsNodeUrl}
+                      xnsNetwork={xnsNetwork}
+                    />
+                  ),
                 )}
               </StyledGridContainer>
             </Fade>

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

@@ -1,50 +1,53 @@
 /* eslint-disable @eslint-react/no-array-index-key */
 import { ErrorBoundary, ErrorRender } from '@xylabs/react-error'
 import { FlexCol } from '@xylabs/react-flexbox'
+import type { DappIntent, XyOsContext } from '@xyo-network/os-model'
 import type { RegisteredReactDappSet } from '@xyo-network/os-react-model'
 import { NameTransforms } from '@xyo-network/os-runtime'
 import { NodeProvider } from '@xyo-network/react-node'
 import { WalletProvider } from '@xyo-network/react-wallet'
+import type { WalletInstance } from '@xyo-network/wallet-model'
 import React, { useMemo } from 'react'
 import { Helmet } from 'react-helmet'
 
-import { useDappContextCreator, useDappIntentListener } from '../../../../hooks/index.ts'
 import { XyOsUiContextProvider } from '../../../XyOsUi/index.ts'
 import { DappAccessFlexbox } from '../access-interface/index.ts'
 import { DappBar } from './AppBar.js'
 import { DappChrome } from './Chrome.js'
+import type { DappState } from './hooks/index.ts'
 import {
-  dappState, decomposeDappSet, useDappMenu, useManageDappBasedOffRoute, useSyncOsRegisteredAccessInterfaces,
+  decomposeDappSet, useDappMenu, useManageDappBasedOffRoute, useSyncOsRegisteredAccessInterfaces,
 } from './hooks/index.ts'
 import { DappLoadingFlexbox } from './LoadingFlexbox.js'
 import { DappBottomNavigation, DappMenuDrawer } from './menu/index.ts'
 
 export interface DappWindowProps {
+  context?: XyOsContext | null
   dappSet?: RegisteredReactDappSet
-  xnsNetwork: string | undefined
-  xnsNodeUrl: string | undefined
+  dappState?: DappState
+  dappWallet?: WalletInstance
+  intent?: DappIntent
+  nodeCreateError?: Error
 }
 
 /** A component that can load immediately, but delays node loading and dapp mounting till corresponding launch intent arrives */
 export const DappWindow: React.FC<DappWindowProps> = ({
-  dappSet, xnsNodeUrl, xnsNetwork,
+  context, dappSet, dappState, dappWallet, intent, nodeCreateError,
 }) => {
   const {
-    DappComponent, dapp, name, scrollable = true, version,
+    DappComponent, name, scrollable = true, version,
   } = decomposeDappSet(dappSet)
-  const {
-    dappWallet, context, nodeCreateError,
-  } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp)
-  const { dappIntentType: intentType, intentPayload } = useDappIntentListener(name)
+
   const {
     active, minimized, open,
-  } = dappState(intentType, context)
+  } = dappState ?? {}
 
   const TypedDappComponent = useMemo(() => DappComponent as React.FC<{
     name?: string
   }>, [])
 
-  const errors = useManageDappBasedOffRoute(intentPayload, name, context)
+  // TODO - see if we can move this outside of the DappWindow component
+  const errors = useManageDappBasedOffRoute(intent, name, context)
   useSyncOsRegisteredAccessInterfaces(context)
 
   const {
@@ -99,7 +102,7 @@ export const DappWindow: React.FC<DappWindowProps> = ({
             />
           )}
           /* Ensure that loading goes away when error occurs */
-          splashScreen={resolvedError ? null : <DappLoadingFlexbox minimize={minimized} name={name} open={open} />}
+          splashScreen={resolvedError ? null : <DappLoadingFlexbox minimize={!!minimized} name={name} open={!!open} />}
         >
           {resolvedError || errors?.length > 0
             ? (

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

@@ -1,6 +1,6 @@
+export * from './lib/index.ts'
 export * from './menu/index.ts'
 export * from './route/index.ts'
-export * from './useDappState.js'
 export * from './useDecomposeDappSet.js'
 export * from './useSkipLoadingScreen.js'
 export * from './useSyncOsRegisteredAccessInterfaces.js'

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

@@ -0,0 +1,20 @@
+import type { DappIntent, XyOsContext } from '@xyo-network/os-model'
+import { DappIntentTypes } from '@xyo-network/os-model'
+
+export interface DappState {
+  active: boolean
+  minimized: boolean
+  open: boolean
+}
+
+export const deriveDappState = (intent?: DappIntent, context?: XyOsContext | null): DappState => {
+  const minimized = intent?.intent === DappIntentTypes.Minimize
+  const open = intent?.intent === DappIntentTypes.Launch
+  const active = !!(context && open)
+
+  return {
+    active,
+    minimized,
+    open,
+  }
+}

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

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

package/dist/browser/helpers/widgets/UpperWidgetTrayLayout.d.ts

@@ -1,6 +0,0 @@
-import type { WidgetTrayLayout } from '@xyo-network/os-model';
-/**
- * NOTE: Hardcoded widget tray layout and hashes are of the widget config payloads located within the dapp's payloads
- */
-export declare const UpperWidgetTrayLayout: WidgetTrayLayout;
-//# sourceMappingURL=UpperWidgetTrayLayout.d.ts.map

package/dist/browser/helpers/widgets/UpperWidgetTrayLayout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"UpperWidgetTrayLayout.d.ts","sourceRoot":"","sources":["../../../../src/helpers/widgets/UpperWidgetTrayLayout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAG7D;;GAEG;AAEH,eAAO,MAAM,qBAAqB,EAAE,gBAYnC,CAAA"}

package/dist/browser/helpers/widgets/index.d.ts

@@ -1,2 +0,0 @@
-export * from './UpperWidgetTrayLayout.js';
-//# sourceMappingURL=index.d.ts.map

package/dist/browser/helpers/widgets/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/helpers/widgets/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/hooks/useDappState.d.ts

@@ -1,8 +0,0 @@
-import type { XyOsContext } from '@xyo-network/os-model';
-import { DappIntentTypes } from '@xyo-network/os-model';
-export declare const dappState: (intentType?: DappIntentTypes, context?: XyOsContext | null) => {
-    active: boolean | null | undefined;
-    minimized: boolean;
-    open: boolean;
-};
-//# sourceMappingURL=useDappState.d.ts.map

package/dist/browser/modules/Dapp/modules/Window/hooks/useDappState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useDappState.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/Dapp/modules/Window/hooks/useDappState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,eAAO,MAAM,SAAS,gBAAiB,eAAe,YAAY,WAAW,GAAG,IAAI;;;;CAUnF,CAAA"}

package/src/helpers/widgets/UpperWidgetTrayLayout.ts

@@ -1,20 +0,0 @@
-import type { WidgetTrayLayout } from '@xyo-network/os-model'
-import { WidgetTrayLayoutSchema } from '@xyo-network/os-model'
-
-/**
- * NOTE: Hardcoded widget tray layout and hashes are of the widget config payloads located within the dapp's payloads
- */
-
-export const UpperWidgetTrayLayout: WidgetTrayLayout = {
-  label: 'Lower Widget Tray Layout',
-  layout: [
-    { dappId: 'TimeClock', mode: 'FlatClock' },
-    {
-      configHash: 'bb0ea5701c20e86d77b1a369f77d17658df62572d54f1f1aafdf15e3c29e3b3b', dappId: 'Markets', mode: 'PriceWidget',
-    },
-    {
-      configHash: 'ea8afca9d4a9b0843035e3722d9f6400058a1eab71996b8e4e20e2449662e2bf', dappId: 'Markets', mode: 'PriceWidget',
-    },
-  ],
-  schema: WidgetTrayLayoutSchema,
-}

package/src/helpers/widgets/index.ts

@@ -1 +0,0 @@
-export * from './UpperWidgetTrayLayout.js'

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

@@ -1,14 +0,0 @@
-import type { XyOsContext } from '@xyo-network/os-model'
-import { DappIntentTypes } from '@xyo-network/os-model'
-
-export const dappState = (intentType?: DappIntentTypes, context?: XyOsContext | null) => {
-  const minimized = intentType === DappIntentTypes.Minimize
-  const open = intentType === DappIntentTypes.Launch
-  const active = context && open
-
-  return {
-    active,
-    minimized,
-    open,
-  }
-}