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

package/dist/browser/index.mjs

@@ -167,84 +167,7 @@ import { FlexCol as FlexCol13 } from "@xylabs/react-flexbox";
 import React33 from "react";
 
 // src/modules/Dapp/Container.tsx
-import React26 from "react";
-
-// src/modules/Dapp/Button/hooks/useLaunchPoint.tsx
-import { useLayoutEffect, useState as useState2 } from "react";
-
-// src/utils/DappInstallTypeFilters.ts
-import { isInstalledDappSet, isPreInstalledDappSet, isUnInstalledDappSet } from "@xyo-network/os-model";
-var DappInstallTypeFilters = {
-  installed(registeredDappSets) {
-    return registeredDappSets && registeredDappSets?.length > 0 ? registeredDappSets?.filter(isInstalledDappSet).sort((a2, b) => a2.dapp.config.name.toUpperCase() < b.dapp.config.name.toUpperCase() ? -1 : 1) : void 0;
-  },
-  preInstalled(registeredDappSets) {
-    return registeredDappSets && registeredDappSets?.length > 0 ? registeredDappSets?.filter(isPreInstalledDappSet).sort((a2, b) => a2.dapp.config.name.toUpperCase() < b.dapp.config.name.toUpperCase() ? -1 : 1) : void 0;
-  },
-  uninstalled(registeredDappSets) {
-    return registeredDappSets && registeredDappSets?.length > 0 ? registeredDappSets.filter(isUnInstalledDappSet).sort((a2, b) => a2.dapp.config.name.toUpperCase() < b.dapp.config.name.toUpperCase() ? -1 : 1) : void 0;
-  }
-};
-
-// src/utils/getApiDomain.ts
-var getApiDomain = /* @__PURE__ */ __name((localHost, apiDomain) => {
-  if (apiDomain !== void 0) {
-    return apiDomain;
-  }
-  if (localHost) {
-    return "http://localhost:8080";
-  }
-  if (location.hostname.startsWith("beta")) {
-    return "https://beta.archivist.xyo.network";
-  }
-  return "https://archivist.xyo.network";
-}, "getApiDomain");
-
-// src/utils/useOnWindowResize.tsx
-import { useEffect as useEffect2, useState } from "react";
-var useOnWindowResize = /* @__PURE__ */ __name(() => {
-  const [resized, setResized] = useState();
-  useEffect2(() => {
-    const onResize = /* @__PURE__ */ __name((event) => {
-      setResized(event);
-    }, "onResize");
-    globalThis.addEventListener("resize", onResize, false);
-    return () => {
-      globalThis.removeEventListener("resize", onResize);
-    };
-  }, []);
-  return resized;
-}, "useOnWindowResize");
-
-// src/modules/Dapp/Button/hooks/useLaunchPoint.tsx
-var useLaunchPoint = /* @__PURE__ */ __name((spanRef) => {
-  const [coordinates, setCoordinates] = useState2({
-    left: 0,
-    top: 0
-  });
-  const resized = useOnWindowResize();
-  useLayoutEffect(() => {
-    const rect = spanRef.current?.getBoundingClientRect() ?? null;
-    if (rect) {
-      const { width, height, left, top } = rect;
-      setCoordinates({
-        left: left + width / 2,
-        top: top + height / 2
-      });
-    }
-  }, [
-    spanRef,
-    resized
-  ]);
-  return coordinates;
-}, "useLaunchPoint");
-
-// src/modules/Dapp/Button/IconEx.tsx
-import { Circle } from "@mui/icons-material";
-import { FlexCol as FlexCol2 } from "@xylabs/react-flexbox";
-import { DappIntentTypes as DappIntentTypes5 } from "@xyo-network/os-model";
-import { DappIntentCaller as DappIntentCaller2, XyOsMonitor as XyOsMonitor2 } from "@xyo-network/os-runtime";
-import React7, { useRef as useRef3 } from "react";
+import React26, { memo, useMemo as useMemo13 } from "react";
 
 // src/hooks/access-requests/useBuildDappAccessRequestResource.ts
 import { usePromise } from "@xylabs/react-promise";
@@ -289,9 +212,9 @@ var ResourceHooks = class {
 };
 
 // src/hooks/useCleanup.tsx
-import { useEffect as useEffect3 } from "react";
+import { useEffect as useEffect2 } from "react";
 var useCleanUpResource = /* @__PURE__ */ __name((resource) => {
-  useEffect3(() => {
+  useEffect2(() => {
     return () => {
       resource?.cleanupListeners();
     };
@@ -355,7 +278,7 @@ var DappAccessRequestResourceHooks = new ResourceHooks(useBuildDappAccessRequest
 // src/hooks/bios/useBios.ts
 import { usePromise as usePromise2 } from "@xylabs/react-promise";
 import { boot } from "@xyo-network/bios-browser";
-import { useEffect as useEffect4 } from "react";
+import { useEffect as useEffect3 } from "react";
 var biosBoot;
 var useBios = /* @__PURE__ */ __name(() => {
   const [biosExternalInterface, biosError] = usePromise2(async () => {
@@ -363,7 +286,7 @@ var useBios = /* @__PURE__ */ __name(() => {
     biosBoot = boot();
     return await biosBoot;
   }, []);
-  useEffect4(() => {
+  useEffect3(() => {
     if (biosError) throw biosError;
   }, [
     biosError
@@ -374,7 +297,7 @@ var useBios = /* @__PURE__ */ __name(() => {
 // src/hooks/bios/useKernel.ts
 import { usePromise as usePromise3 } from "@xylabs/react-promise";
 import { Kernel } from "@xyo-network/kernel";
-import { useEffect as useEffect5 } from "react";
+import { useEffect as useEffect4 } from "react";
 var kernelBoot;
 var useKernel = /* @__PURE__ */ __name((locator, params) => {
   const bios = useBios();
@@ -394,7 +317,7 @@ var useKernel = /* @__PURE__ */ __name((locator, params) => {
   }, [
     bios
   ]);
-  useEffect5(() => {
+  useEffect4(() => {
     if (kernelError) throw kernelError;
   }, [
     kernelError
@@ -445,16 +368,18 @@ var useClearIntents = /* @__PURE__ */ __name(() => {
 // src/hooks/intent/useDappIntentListener.tsx
 import { DappIntentTypes, DappMode, isDappIntentWithMeta } from "@xyo-network/os-model";
 import { useWeakArchivistFromNode as useWeakArchivistFromNode2 } from "@xyo-network/react-archivist";
-import { useEffect as useEffect6, useState as useState3 } from "react";
+import { useEffect as useEffect5, useState } from "react";
 var useDappIntentListener = /* @__PURE__ */ __name((dappName, targetMode = DappMode.Window) => {
-  const [dappIntentType, setDappIntentType] = useState3(DappIntentTypes.Close);
-  const [intentPayload, setIntentPayload] = useState3();
+  const [dappIntentType, setDappIntentType] = useState(DappIntentTypes.Close);
+  const [intentPayload, setIntentPayload] = useState();
   const [intentArchivist] = useWeakArchivistFromNode2("IntentArchivist");
-  useEffect6(() => {
+  useEffect5(() => {
     const listener = /* @__PURE__ */ __name(({ payloads }) => {
       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: {
@@ -493,11 +418,11 @@ var useDappIntentListener = /* @__PURE__ */ __name((dappName, targetMode = DappM
 
 // src/hooks/intent/useDappIntentListener2.tsx
 import { DappIntentTypes as DappIntentTypes2, DappMode as DappMode2 } from "@xyo-network/os-model";
-import { useEffect as useEffect7, useState as useState4 } from "react";
+import { useEffect as useEffect6, useState as useState2 } from "react";
 var useDappIntentListener2 = /* @__PURE__ */ __name((dappName, sourceMode = DappMode2.Window) => {
   const { latestDappIntent } = DappIntentResourceHooks.useResourceViewsFromProvidedNode();
-  const [dappIntentType, setDappIntentType] = useState4(DappIntentTypes2.Close);
-  useEffect7(() => {
+  const [dappIntentType, setDappIntentType] = useState2(DappIntentTypes2.Close);
+  useEffect6(() => {
     if (sourceMode === DappMode2.Window) {
       for (const payload of latestDappIntent ?? []) {
         if (payload.targetDappId === dappName) {
@@ -706,23 +631,23 @@ var NameServiceRegistrationHooks = new ResourceHooks(useBuildNameServiceRegistra
 import { useAsyncEffect as useAsyncEffect2 } from "@xylabs/react-async-effect";
 import { DappIntentTypes as DappIntentTypes4 } from "@xyo-network/os-model";
 import { DappContextCreator, RunningDappCache } from "@xyo-network/os-runtime";
-import { useCallback as useCallback3, useEffect as useEffect8, useRef, useState as useState5 } from "react";
-var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp, allowedNames, createOnMount = false) => {
+import { useCallback as useCallback3, useEffect as useEffect7, useRef, useState as useState3 } from "react";
+var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp, currentIntent, allowedNames, createOnMount = false) => {
   const context = useXyOsUiContext();
-  const [windowDappNodeSet, setWindowDappNodeSet] = useState5({
+  const [windowDappNodeSet, setWindowDappNodeSet] = useState3({
     context: void 0,
     dappWallet: void 0
   });
-  const [dappWindowNodeError, setDappWindowNodeError] = useState5();
-  const { dappIntentType: intentType } = useDappIntentListener(dapp?.config.name);
+  const [dappWindowNodeError, setDappWindowNodeError] = useState3();
+  const targetedDapp = !!(dapp && context && currentIntent?.targetDappId === dapp?.config.name);
   const windowDappNodeSetRef = useRef(windowDappNodeSet);
-  useEffect8(() => {
+  useEffect7(() => {
     windowDappNodeSetRef.current = windowDappNodeSet;
   }, [
     windowDappNodeSet
   ]);
   const createNode = useCallback3(async () => {
-    if (dapp && context) {
+    if (targetedDapp) {
       try {
         const windowDappNodeSet2 = await RunningDappCache.findOrCreate(dapp, context, allowedNames ?? [], xnsNodeUrl, xnsNetwork);
         setWindowDappNodeSet(windowDappNodeSet2);
@@ -732,10 +657,11 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     }
   }, [
     dapp,
+    currentIntent,
     context,
     allowedNames
   ]);
-  useEffect8(() => {
+  useEffect7(() => {
     if (createOnMount) {
       void (async () => {
         await createNode();
@@ -746,26 +672,28 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     createNode
   ]);
   useAsyncEffect2(async () => {
-    switch (intentType) {
-      case DappIntentTypes4.Launch: {
-        await createNode();
-        break;
-      }
-      case DappIntentTypes4.Close: {
-        if (windowDappNodeSetRef.current.context) {
-          await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context);
-          setWindowDappNodeSet({
-            context: null,
-            dappWallet: void 0
-          });
+    if (targetedDapp) {
+      switch (currentIntent?.intent) {
+        case DappIntentTypes4.Launch: {
+          await createNode();
+          break;
+        }
+        case DappIntentTypes4.Close: {
+          if (windowDappNodeSetRef.current.context) {
+            await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context);
+            setWindowDappNodeSet({
+              context: null,
+              dappWallet: void 0
+            });
+          }
+          break;
         }
-        break;
+        case DappIntentTypes4.Minimize:
       }
-      case DappIntentTypes4.Minimize:
     }
   }, [
     createNode,
-    intentType
+    currentIntent
   ]);
   return {
     ...windowDappNodeSet,
@@ -775,11 +703,11 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
 
 // src/hooks/os/useDappRegistrationResults.tsx
 import { EventBusPubSubConnection } from "@xyo-network/os-runtime";
-import { useEffect as useEffect9, useState as useState6 } from "react";
+import { useEffect as useEffect8, useState as useState4 } from "react";
 var useDappRegistrationResults = /* @__PURE__ */ __name(() => {
   const context = useXyOsUiContext();
-  const [registeredDappSetResults, setRegisteredDappSetResults] = useState6();
-  useEffect9(() => {
+  const [registeredDappSetResults, setRegisteredDappSetResults] = useState4();
+  useEffect8(() => {
     const listener = /* @__PURE__ */ __name(() => {
       setRegisteredDappSetResults(context?.dappRegistrationResults);
     }, "listener");
@@ -1089,34 +1017,11 @@ var WidgetCaller = class extends OsCallerBase {
   }
 };
 
-// src/helpers/widgets/UpperWidgetTrayLayout.ts
-import { WidgetTrayLayoutSchema } from "@xyo-network/os-model";
-var UpperWidgetTrayLayout = {
-  label: "Lower Widget Tray Layout",
-  layout: [
-    {
-      dappId: "TimeClock",
-      mode: "FlatClock"
-    },
-    {
-      configHash: "bb0ea5701c20e86d77b1a369f77d17658df62572d54f1f1aafdf15e3c29e3b3b",
-      dappId: "Markets",
-      mode: "PriceWidget"
-    },
-    {
-      configHash: "ea8afca9d4a9b0843035e3722d9f6400058a1eab71996b8e4e20e2449662e2bf",
-      dappId: "Markets",
-      mode: "PriceWidget"
-    }
-  ],
-  schema: WidgetTrayLayoutSchema
-};
-
 // src/hooks/os/useWidgetDapps.tsx
 var useWidgetDapps = /* @__PURE__ */ __name((registeredDapps, widgetTrayLayout) => {
   const context = useXyOsUiContext();
   return usePromise8(async () => {
-    if (registeredDapps && context && widgetTrayLayout) {
+    if (registeredDapps && registeredDapps.length > 0 && context && widgetTrayLayout) {
       const caller = new WidgetCaller(context, registeredDapps, widgetTrayLayout);
       return await caller.buildWidgetComponents();
     }
@@ -1167,11 +1072,11 @@ var useDappIntentCaller = /* @__PURE__ */ __name((xyOsContext) => {
 }, "useDappIntentCaller");
 
 // src/hooks/useDebugClick.tsx
-import { useCallback as useCallback4, useEffect as useEffect10, useRef as useRef2, useState as useState7 } from "react";
+import { useCallback as useCallback4, useEffect as useEffect9, useRef as useRef2, useState as useState5 } from "react";
 import { useNavigate as useNavigate2, useSearchParams } from "react-router-dom";
 var useDebugClick = /* @__PURE__ */ __name(() => {
   const [params, setParams] = useSearchParams();
-  const [debugOpen, setDebugOpen] = useState7(false);
+  const [debugOpen, setDebugOpen] = useState5(false);
   const openFromClick = useRef2(false);
   const closeFromClick = useRef2(false);
   const initialized = useRef2(false);
@@ -1196,7 +1101,7 @@ var useDebugClick = /* @__PURE__ */ __name(() => {
   }, [
     navigate
   ]);
-  useEffect10(() => {
+  useEffect9(() => {
     const initialOpen = openFromClick.current && !closeFromClick.current && params.has("debug");
     const backButtonClicked = openFromClick.current && !closeFromClick.current && !params.has("debug");
     if (initialOpen) {
@@ -1255,13 +1160,13 @@ import { useMemo as useMemo7 } from "react";
 // src/hooks/useStackReady.tsx
 import { assertEx as assertEx5 } from "@xylabs/assert";
 import { EventBusPubSubConnection as EventBusPubSubConnection2 } from "@xyo-network/os-runtime";
-import { useEffect as useEffect11, useState as useState8 } from "react";
+import { useEffect as useEffect10, useState as useState6 } from "react";
 var useStackReady = /* @__PURE__ */ __name((stackReadyEvent, stackName, context) => {
   const providedContext = useXyOsUiContext();
-  const [stackReady, setStackReady] = useState8({
+  const [stackReady, setStackReady] = useState6({
     ready: false
   });
-  useEffect11(() => {
+  useEffect10(() => {
     const derivedContext = context ?? providedContext;
     const listener = /* @__PURE__ */ __name(() => {
       if (!derivedContext) throw new Error("no context found");
@@ -1375,6 +1280,83 @@ var useTabs = /* @__PURE__ */ __name(() => {
   ];
 }, "useTabs");
 
+// src/modules/Dapp/Button/hooks/useLaunchPoint.tsx
+import { useLayoutEffect, useState as useState8 } from "react";
+
+// src/utils/DappInstallTypeFilters.ts
+import { isInstalledDappSet, isPreInstalledDappSet, isUnInstalledDappSet } from "@xyo-network/os-model";
+var DappInstallTypeFilters = {
+  installed(registeredDappSets) {
+    return registeredDappSets && registeredDappSets?.length > 0 ? registeredDappSets?.filter(isInstalledDappSet).sort((a2, b) => a2.dapp.config.name.toUpperCase() < b.dapp.config.name.toUpperCase() ? -1 : 1) : void 0;
+  },
+  preInstalled(registeredDappSets) {
+    return registeredDappSets && registeredDappSets?.length > 0 ? registeredDappSets?.filter(isPreInstalledDappSet).sort((a2, b) => a2.dapp.config.name.toUpperCase() < b.dapp.config.name.toUpperCase() ? -1 : 1) : void 0;
+  },
+  uninstalled(registeredDappSets) {
+    return registeredDappSets && registeredDappSets?.length > 0 ? registeredDappSets.filter(isUnInstalledDappSet).sort((a2, b) => a2.dapp.config.name.toUpperCase() < b.dapp.config.name.toUpperCase() ? -1 : 1) : void 0;
+  }
+};
+
+// src/utils/getApiDomain.ts
+var getApiDomain = /* @__PURE__ */ __name((localHost, apiDomain) => {
+  if (apiDomain !== void 0) {
+    return apiDomain;
+  }
+  if (localHost) {
+    return "http://localhost:8080";
+  }
+  if (location.hostname.startsWith("beta")) {
+    return "https://beta.archivist.xyo.network";
+  }
+  return "https://archivist.xyo.network";
+}, "getApiDomain");
+
+// src/utils/useOnWindowResize.tsx
+import { useEffect as useEffect11, useState as useState7 } from "react";
+var useOnWindowResize = /* @__PURE__ */ __name(() => {
+  const [resized, setResized] = useState7();
+  useEffect11(() => {
+    const onResize = /* @__PURE__ */ __name((event) => {
+      setResized(event);
+    }, "onResize");
+    globalThis.addEventListener("resize", onResize, false);
+    return () => {
+      globalThis.removeEventListener("resize", onResize);
+    };
+  }, []);
+  return resized;
+}, "useOnWindowResize");
+
+// src/modules/Dapp/Button/hooks/useLaunchPoint.tsx
+var useLaunchPoint = /* @__PURE__ */ __name((spanRef) => {
+  const [coordinates, setCoordinates] = useState8({
+    left: 0,
+    top: 0
+  });
+  const resized = useOnWindowResize();
+  useLayoutEffect(() => {
+    const rect = spanRef.current?.getBoundingClientRect() ?? null;
+    if (rect) {
+      const { width, height, left, top } = rect;
+      setCoordinates({
+        left: left + width / 2,
+        top: top + height / 2
+      });
+    }
+  }, [
+    spanRef,
+    resized
+  ]);
+  return coordinates;
+}, "useLaunchPoint");
+
+// src/modules/Dapp/Button/IconEx.tsx
+import { Circle } from "@mui/icons-material";
+import { FlexCol as FlexCol2 } from "@xylabs/react-flexbox";
+import { DappIntentTypes as DappIntentTypes5 } from "@xyo-network/os-model";
+import { DappIntentCaller as DappIntentCaller2, XyOsMonitor as XyOsMonitor2 } from "@xyo-network/os-runtime";
+import React7, { useRef as useRef3 } from "react";
+
 // src/modules/Dapp/lib/DefaultIconSize.ts
 var DEFAULT_ICON_SIZE = 84;
 
@@ -1525,19 +1507,15 @@ var StyledDefaultDappIcon = styled(TypographyEx, {
 }));
 
 // src/modules/Dapp/Button/IconEx.tsx
-var DappIconButton = /* @__PURE__ */ __name(({ children, dappIcon, dappIconSvg, dappName, ...props }) => {
+var DappIconButton = /* @__PURE__ */ __name(({ children, dappIcon, dappIconSvg, dappName, dappState, ...props }) => {
   const { DappIconSize, color, nonSxProps, sx } = decomposeProps(dappIcon, props);
   const iconSize = DEFAULT_ICON_SIZE;
+  const { active, minimized } = dappState ?? {};
   const sendIntent = useSendDappIntent();
-  const { dappIntentType: intentType } = useDappIntentListener(dappName);
   const iconButtonRef = useRef3(null);
   const { left: launchLeft, top: launchTop } = useLaunchPoint(iconButtonRef);
-  const minimized = intentType === DappIntentTypes5.Minimize;
   const MiddleEllipsisFunction = /* @__PURE__ */ __name((str) => {
     if (str && str.length > 25) {
-      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;
@@ -1553,7 +1531,7 @@ var DappIconButton = /* @__PURE__ */ __name(({ children, dappIcon, dappIconSvg,
     justifyContent: "stretch"
   }, /* @__PURE__ */ React7.createElement(DappLaunchFrame, {
     id: "dapp-launch-frame",
-    open: intentType === DappIntentTypes5.Launch,
+    open: !!active,
     launchLeft,
     launchTop
   }, children), /* @__PURE__ */ React7.createElement("span", {
@@ -1589,45 +1567,182 @@ var DappIconButton = /* @__PURE__ */ __name(({ children, dappIcon, dappIconSvg,
   }))));
 }, "DappIconButton");
 
+// src/modules/Dapp/modules/access-interface/components/Dialog.tsx
+import { ArrowForward } from "@mui/icons-material";
+import { Alert, Button, Dialog, DialogActions, DialogContent, DialogTitle, Typography as Typography2 } from "@mui/material";
+import { ErrorRender } from "@xylabs/react-error";
+import { FlexCol as FlexCol3, FlexRow as FlexRow2 } from "@xylabs/react-flexbox";
+import { RegisteredNames } from "@xyo-network/os-model";
+import { AccessNodeQueries } from "@xyo-network/os-runtime";
+import React8, { useState as useState9 } from "react";
+var DappAccessDialog = /* @__PURE__ */ __name(({ accessRequest, children, dappNode, registeredDappAccess, ...props }) => {
+  const [error, setError] = useState9();
+  const [noPayloadsInserted, setNoPayloadsInserted] = useState9(false);
+  const onClose = /* @__PURE__ */ __name(() => {
+    setNoPayloadsInserted(false);
+    props.onClose?.({}, "escapeKeyDown");
+  }, "onClose");
+  const handleAllow = /* @__PURE__ */ __name(() => {
+    if (accessRequest && registeredDappAccess && dappNode) {
+      try {
+        switch (registeredDappAccess.name) {
+          case RegisteredNames: {
+            const accessNodeQueries = new AccessNodeQueries(dappNode, accessRequest, registeredDappAccess);
+            accessNodeQueries.run().then((payloads) => {
+              if (payloads.length === 0) {
+                setNoPayloadsInserted(true);
+              } else {
+                onClose();
+              }
+              return;
+            }).catch((e) => {
+              setError(e);
+            });
+          }
+          default: {
+            const message = `no helper for interface ${registeredDappAccess.name} found`;
+            console.error(message);
+            setError(new Error(message));
+          }
+        }
+      } catch (e) {
+        console.error(e);
+        setError(e);
+      }
+    } else {
+      setError(new Error("No registered dapp access or dappNode found"));
+    }
+  }, "handleAllow");
+  return /* @__PURE__ */ React8.createElement(Dialog, props, /* @__PURE__ */ React8.createElement(DialogTitle, null, "Message from XYO OS"), /* @__PURE__ */ React8.createElement(DialogContent, {
+    dividers: true,
+    sx: {
+      display: "flex",
+      flexDirection: "column",
+      gap: 3
+    }
+  }, /* @__PURE__ */ React8.createElement(ErrorRender, {
+    error,
+    scope: "DappAccessDialog"
+  }), /* @__PURE__ */ React8.createElement(FlexCol3, {
+    gap: 1
+  }, /* @__PURE__ */ React8.createElement(Typography2, {
+    variant: "subtitle2"
+  }, "dApp to dApp Access Request"), /* @__PURE__ */ React8.createElement(FlexRow2, {
+    gap: 1
+  }, /* @__PURE__ */ React8.createElement(Typography2, {
+    fontSize: 16
+  }, /* @__PURE__ */ React8.createElement("strong", null, accessRequest?.requestingDappId), "\xA0"), /* @__PURE__ */ React8.createElement(ArrowForward, null), /* @__PURE__ */ React8.createElement(Typography2, {
+    fontSize: 16
+  }, /* @__PURE__ */ React8.createElement("strong", null, registeredDappAccess?.registeringDappId))))), /* @__PURE__ */ React8.createElement(DialogContent, {
+    dividers: true,
+    sx: {
+      display: "flex",
+      flexDirection: "column",
+      gap: 3
+    }
+  }, /* @__PURE__ */ React8.createElement(FlexCol3, {
+    gap: 1
+  }, /* @__PURE__ */ React8.createElement(Typography2, null, /* @__PURE__ */ React8.createElement("strong", null, accessRequest?.requestingDappId), " ", "dApp would like to access your", /* @__PURE__ */ React8.createElement("strong", null, registeredDappAccess?.name), " ", "from", " ", /* @__PURE__ */ React8.createElement("strong", null, registeredDappAccess?.registeringDappId), " ", "dApp")), noPayloadsInserted ? /* @__PURE__ */ React8.createElement(Alert, {
+    severity: "warning"
+  }, registeredDappAccess?.name, " ", "Access Request did not find payloads to insert") : null), children ? /* @__PURE__ */ React8.createElement(DialogContent, {
+    dividers: true
+  }, children) : null, /* @__PURE__ */ React8.createElement(DialogActions, null, /* @__PURE__ */ React8.createElement(Button, {
+    variant: "outlined",
+    onClick: onClose
+  }, "Cancel"), /* @__PURE__ */ React8.createElement(Button, {
+    variant: "contained",
+    onClick: handleAllow
+  }, "Allow")));
+}, "DappAccessDialog");
+
+// src/modules/Dapp/modules/access-interface/components/Flexbox.tsx
+import { ErrorRender as ErrorRender2 } from "@xylabs/react-error";
+import React9 from "react";
+
+// src/modules/Dapp/modules/access-interface/hooks/useDialogState.tsx
+import { usePromise as usePromise10 } from "@xylabs/react-promise";
+import { isRegisteredDappAccess, RegisteredNames as RegisteredNames2 } from "@xyo-network/os-model";
+import { useState as useState10 } from "react";
+var useDialogState = /* @__PURE__ */ __name((context) => {
+  const dappCaller = useDappCaller();
+  const { accessRequests } = DappAccessRequestResourceHooks.resourceViewsFromContext(context);
+  const [openAccessDialog, setOpenAccessDialog] = useState10(false);
+  const [registeredInterface, setRegisteredInterface] = useState10();
+  const [, allowAccessDialogError] = usePromise10(async () => {
+    const accessRequest = accessRequests?.[0];
+    if (accessRequest && context && dappCaller) {
+      setOpenAccessDialog(true);
+      const payload = await dappCaller.getRegisteredDappAccessByName(RegisteredNames2);
+      setRegisteredInterface(isRegisteredDappAccess(payload) ? payload : void 0);
+    }
+  }, [
+    accessRequests,
+    dappCaller,
+    context
+  ]);
+  return {
+    accessRequests,
+    allowAccessDialogError,
+    openAccessDialog,
+    registeredInterface,
+    setOpenAccessDialog
+  };
+}, "useDialogState");
+
+// src/modules/Dapp/modules/access-interface/components/Flexbox.tsx
+var DappAccessFlexbox = /* @__PURE__ */ __name(({ context }) => {
+  const { accessRequests, allowAccessDialogError, openAccessDialog, registeredInterface, setOpenAccessDialog } = useDialogState(context);
+  return /* @__PURE__ */ React9.createElement(DappAccessDialog, {
+    accessRequest: accessRequests?.[0],
+    dappNode: context,
+    open: openAccessDialog,
+    onClose: /* @__PURE__ */ __name(() => setOpenAccessDialog(false), "onClose"),
+    registeredDappAccess: registeredInterface
+  }, allowAccessDialogError ? /* @__PURE__ */ React9.createElement(ErrorRender2, {
+    error: allowAccessDialogError,
+    scope: "DappAccessFlexbox"
+  }) : null);
+}, "DappAccessFlexbox");
+
 // src/modules/Dapp/modules/Window/AppBar.tsx
 import { BugReport, CloseRounded, RemoveRounded } from "@mui/icons-material";
-import { AppBar, Box as Box2, Divider, IconButton as IconButton2, Toolbar, Tooltip as Tooltip2, Typography as Typography2 } from "@mui/material";
+import { AppBar, Box as Box2, Divider, IconButton as IconButton2, Toolbar, Tooltip as Tooltip2, Typography as Typography3 } from "@mui/material";
 import { FlexGrowRow as FlexGrowRow2 } from "@xylabs/react-flexbox";
 import { DarkModeIconButtonForColorScheme } from "@xylabs/react-invertible-theme";
 import { DappIntentTypes as DappIntentTypes6 } from "@xyo-network/os-model";
 import { DappIntentCaller as DappIntentCaller3 } from "@xyo-network/os-runtime";
-import React9 from "react";
+import React11 from "react";
 
 // src/modules/Dapp/Debug/Dialog.tsx
-import { Dialog, DialogActions, DialogContent } from "@mui/material";
+import { Dialog as Dialog2, DialogActions as DialogActions2, DialogContent as DialogContent2 } from "@mui/material";
 import { ButtonEx as ButtonEx4 } from "@xylabs/react-button";
-import { FlexCol as FlexCol3 } from "@xylabs/react-flexbox";
+import { FlexCol as FlexCol4 } from "@xylabs/react-flexbox";
 import { NodeProvider } from "@xyo-network/react-node";
-import React8, { lazy, Suspense } from "react";
+import React10, { lazy, Suspense } from "react";
 var Debug = /* @__PURE__ */ lazy(() => import(
   /* webpackChunkName: "Debug" */
   "@xyo-network/os-react-debug"
 ));
-var LazyDebug = /* @__PURE__ */ __name(() => /* @__PURE__ */ React8.createElement(Suspense, {
-  fallback: /* @__PURE__ */ React8.createElement(FlexCol3, null)
-}, /* @__PURE__ */ React8.createElement(FlexCol3, null), /* @__PURE__ */ React8.createElement(Debug, {
+var LazyDebug = /* @__PURE__ */ __name(() => /* @__PURE__ */ React10.createElement(Suspense, {
+  fallback: /* @__PURE__ */ React10.createElement(FlexCol4, null)
+}, /* @__PURE__ */ React10.createElement(FlexCol4, null), /* @__PURE__ */ React10.createElement(Debug, {
   height: "100%"
 })), "LazyDebug");
 var DebugDialog = /* @__PURE__ */ __name(({ closeDebug, debugOpen, ...props }) => {
-  return /* @__PURE__ */ React8.createElement(Dialog, {
+  return /* @__PURE__ */ React10.createElement(Dialog2, {
     open: debugOpen,
     onClose: closeDebug,
     fullScreen: true,
     ...props
-  }, /* @__PURE__ */ React8.createElement(DialogContent, null, /* @__PURE__ */ React8.createElement(LazyDebug, null)), /* @__PURE__ */ React8.createElement(DialogActions, null, /* @__PURE__ */ React8.createElement(ButtonEx4, {
+  }, /* @__PURE__ */ React10.createElement(DialogContent2, null, /* @__PURE__ */ React10.createElement(LazyDebug, null)), /* @__PURE__ */ React10.createElement(DialogActions2, null, /* @__PURE__ */ React10.createElement(ButtonEx4, {
     variant: "outlined",
     onClick: closeDebug
   }, "Close")));
 }, "DebugDialog");
 var DebugDialogWithNode = /* @__PURE__ */ __name(({ closeDebug, debugOpen, context, ...props }) => {
-  return /* @__PURE__ */ React8.createElement(NodeProvider, {
+  return /* @__PURE__ */ React10.createElement(NodeProvider, {
     node: context?.root
-  }, /* @__PURE__ */ React8.createElement(DebugDialog, {
+  }, /* @__PURE__ */ React10.createElement(DebugDialog, {
     closeDebug,
     debugOpen,
     ...props
@@ -1636,7 +1751,7 @@ var DebugDialogWithNode = /* @__PURE__ */ __name(({ closeDebug, debugOpen, conte
 
 // src/modules/Dapp/modules/Window/AppBar.tsx
 var EmptyDappBarForPadding = /* @__PURE__ */ __name((props) => {
-  return /* @__PURE__ */ React9.createElement(AppBar, {
+  return /* @__PURE__ */ React11.createElement(AppBar, {
     color: "primary",
     sx: {
       flexDirection: "row"
@@ -1649,7 +1764,7 @@ var EmptyDappBarForPadding = /* @__PURE__ */ __name((props) => {
 var DappBar = /* @__PURE__ */ __name(({ title, context, name, ...props }) => {
   const sendIntent = useSendDappIntent();
   const { closeDebug, debugOpen, openDebug } = useDebugClick();
-  return /* @__PURE__ */ React9.createElement(AppBar, {
+  return /* @__PURE__ */ React11.createElement(AppBar, {
     elevation: 0,
     color: "transparent",
     sx: {
@@ -1659,21 +1774,21 @@ var DappBar = /* @__PURE__ */ __name(({ title, context, name, ...props }) => {
     component: "div",
     position: "sticky",
     ...props
-  }, /* @__PURE__ */ React9.createElement(Toolbar, {
+  }, /* @__PURE__ */ React11.createElement(Toolbar, {
     disableGutters: true,
     sx: {
       paddingX: 2
     }
-  }, /* @__PURE__ */ React9.createElement(Typography2, {
+  }, /* @__PURE__ */ React11.createElement(Typography3, {
     noWrap: true,
     variant: "h6",
     letterSpacing: "-1px"
-  }, title)), /* @__PURE__ */ React9.createElement(FlexGrowRow2, null), /* @__PURE__ */ React9.createElement(Toolbar, {
+  }, title)), /* @__PURE__ */ React11.createElement(FlexGrowRow2, null), /* @__PURE__ */ React11.createElement(Toolbar, {
     disableGutters: true,
     sx: {
       paddingX: 2
     }
-  }, /* @__PURE__ */ React9.createElement(IconButton2, {
+  }, /* @__PURE__ */ React11.createElement(IconButton2, {
     onClick: openDebug,
     sx: {
       display: {
@@ -1681,7 +1796,7 @@ var DappBar = /* @__PURE__ */ __name(({ title, context, name, ...props }) => {
         xs: "flex"
       }
     }
-  }, /* @__PURE__ */ React9.createElement(BugReport, null)), /* @__PURE__ */ React9.createElement(Tooltip2, {
+  }, /* @__PURE__ */ React11.createElement(BugReport, null)), /* @__PURE__ */ React11.createElement(Tooltip2, {
     title: "Toggle Light/Dark Mode",
     sx: {
       display: {
@@ -1689,9 +1804,9 @@ var DappBar = /* @__PURE__ */ __name(({ title, context, name, ...props }) => {
         xs: "flex"
       }
     }
-  }, /* @__PURE__ */ React9.createElement(Box2, null, /* @__PURE__ */ React9.createElement(DarkModeIconButtonForColorScheme, {
+  }, /* @__PURE__ */ React11.createElement(Box2, null, /* @__PURE__ */ React11.createElement(DarkModeIconButtonForColorScheme, {
     defaultLightModeColor: "warning"
-  }))), /* @__PURE__ */ React9.createElement(Divider, {
+  }))), /* @__PURE__ */ React11.createElement(Divider, {
     orientation: "vertical",
     flexItem: true,
     sx: {
@@ -1701,19 +1816,19 @@ var DappBar = /* @__PURE__ */ __name(({ title, context, name, ...props }) => {
       },
       m: 1
     }
-  }), /* @__PURE__ */ React9.createElement(Tooltip2, {
+  }), /* @__PURE__ */ React11.createElement(Tooltip2, {
     title: "Minimize"
-  }, /* @__PURE__ */ React9.createElement(IconButton2, {
+  }, /* @__PURE__ */ React11.createElement(IconButton2, {
     onClick: /* @__PURE__ */ __name(async () => await sendIntent?.(DappIntentCaller3.buildIntent(DappIntentCaller3.OsDappName, DappIntentTypes6.Minimize, name)), "onClick")
-  }, /* @__PURE__ */ React9.createElement(RemoveRounded, {
+  }, /* @__PURE__ */ React11.createElement(RemoveRounded, {
     htmlColor: "inherit"
-  }))), /* @__PURE__ */ React9.createElement(Tooltip2, {
+  }))), /* @__PURE__ */ React11.createElement(Tooltip2, {
     title: "Close"
-  }, /* @__PURE__ */ React9.createElement(IconButton2, {
+  }, /* @__PURE__ */ React11.createElement(IconButton2, {
     onClick: /* @__PURE__ */ __name(async () => await sendIntent?.(DappIntentCaller3.buildIntent(DappIntentCaller3.OsDappName, DappIntentTypes6.Close, name)), "onClick")
-  }, /* @__PURE__ */ React9.createElement(CloseRounded, {
+  }, /* @__PURE__ */ React11.createElement(CloseRounded, {
     htmlColor: "inherit"
-  })))), /* @__PURE__ */ React9.createElement(DebugDialogWithNode, {
+  })))), /* @__PURE__ */ React11.createElement(DebugDialogWithNode, {
     closeDebug,
     debugOpen,
     context
@@ -1722,21 +1837,21 @@ var DappBar = /* @__PURE__ */ __name(({ title, context, name, ...props }) => {
 
 // src/modules/Dapp/modules/Window/Chrome.tsx
 import { useMediaQuery } from "@mui/material";
-import { FlexCol as FlexCol4, FlexGrowCol, FlexRow as FlexRow2 } from "@xylabs/react-flexbox";
-import React10 from "react";
+import { FlexCol as FlexCol5, FlexGrowCol, FlexRow as FlexRow3 } from "@xylabs/react-flexbox";
+import React12 from "react";
 var DappChromeSmall = /* @__PURE__ */ __name(({ appBar, children, screenMenu, splashScreen, ...props }) => {
-  return /* @__PURE__ */ React10.createElement(FlexCol4, {
+  return /* @__PURE__ */ React12.createElement(FlexCol5, {
     alignItems: "stretch",
     id: "dapp-chrome-container-small",
     ...props
-  }, splashScreen, /* @__PURE__ */ React10.createElement(FlexGrowCol, {
+  }, splashScreen, /* @__PURE__ */ React12.createElement(FlexGrowCol, {
     alignItems: "stretch",
     id: "dapp-chrome-small",
     justifyContent: "start",
     sx: {
       background: /* @__PURE__ */ __name((theme) => theme.palette.background.default, "background")
     }
-  }, appBar, /* @__PURE__ */ React10.createElement(FlexGrowCol, {
+  }, appBar, /* @__PURE__ */ React12.createElement(FlexGrowCol, {
     sx: {
       overflowY: "auto"
     },
@@ -1744,18 +1859,18 @@ var DappChromeSmall = /* @__PURE__ */ __name(({ appBar, children, screenMenu, sp
   }, children), screenMenu));
 }, "DappChromeSmall");
 var DappChromeLarge = /* @__PURE__ */ __name(({ appBar, children, screenMenu, splashScreen, ...props }) => {
-  return /* @__PURE__ */ React10.createElement(FlexRow2, {
+  return /* @__PURE__ */ React12.createElement(FlexRow3, {
     alignItems: "stretch",
     id: "dapp-chrome-container-large",
     ...props
-  }, splashScreen, screenMenu, /* @__PURE__ */ React10.createElement(FlexGrowCol, {
+  }, splashScreen, screenMenu, /* @__PURE__ */ React12.createElement(FlexGrowCol, {
     alignItems: "stretch",
     id: "dapp-chrome-large",
     justifyContent: "start",
     sx: {
       background: /* @__PURE__ */ __name((theme) => theme.palette.background.default, "background")
     }
-  }, appBar, /* @__PURE__ */ React10.createElement(FlexGrowCol, {
+  }, appBar, /* @__PURE__ */ React12.createElement(FlexGrowCol, {
     sx: {
       overflowY: "auto"
     },
@@ -1765,26 +1880,26 @@ var DappChromeLarge = /* @__PURE__ */ __name(({ appBar, children, screenMenu, sp
 }, "DappChromeLarge");
 var DappChrome = /* @__PURE__ */ __name(({ largeScreenMenu, smallScreenMenu, ...props }) => {
   const isMedium = useMediaQuery((theme) => theme.breakpoints.up("md"));
-  return isMedium ? /* @__PURE__ */ React10.createElement(DappChromeLarge, {
+  return isMedium ? /* @__PURE__ */ React12.createElement(DappChromeLarge, {
     screenMenu: largeScreenMenu,
     ...props
-  }) : /* @__PURE__ */ React10.createElement(DappChromeSmall, {
+  }) : /* @__PURE__ */ React12.createElement(DappChromeSmall, {
     screenMenu: smallScreenMenu,
     ...props
   });
 }, "DappChrome");
 
 // src/modules/Dapp/modules/Window/components/DefaultComingSoon/DefaultComingSoon.tsx
-import { alpha as alpha3, Card as Card2, CardContent as CardContent3, Chip, Container, Divider as Divider2, Typography as Typography4, useTheme as useTheme5 } from "@mui/material";
-import { FlexGrowCol as FlexGrowCol3, FlexRow as FlexRow5 } from "@xylabs/react-flexbox";
-import React14 from "react";
+import { alpha as alpha3, Card as Card2, CardContent as CardContent3, Chip, Container, Divider as Divider2, Typography as Typography5, useTheme as useTheme5 } from "@mui/material";
+import { FlexGrowCol as FlexGrowCol3, FlexRow as FlexRow6 } from "@xylabs/react-flexbox";
+import React16 from "react";
 
 // src/modules/Dapp/modules/Window/components/DefaultComingSoon/InstallButtonSection.tsx
 import { ButtonEx as ButtonEx5 } from "@xylabs/react-button";
-import { FlexRow as FlexRow3 } from "@xylabs/react-flexbox";
-import React11 from "react";
+import { FlexRow as FlexRow4 } from "@xylabs/react-flexbox";
+import React13 from "react";
 var InstallButtonSection = /* @__PURE__ */ __name(({ installLink = "", notificationLink = "https://xyo.network/newsletter", ...props }) => {
-  return /* @__PURE__ */ React11.createElement(FlexRow3, {
+  return /* @__PURE__ */ React13.createElement(FlexRow4, {
     width: "100%",
     gap: 1,
     sx: {
@@ -1795,12 +1910,12 @@ var InstallButtonSection = /* @__PURE__ */ __name(({ installLink = "", notificat
       }
     },
     ...props
-  }, /* @__PURE__ */ React11.createElement(ButtonEx5, {
+  }, /* @__PURE__ */ React13.createElement(ButtonEx5, {
     fullWidth: true,
     variant: "contained",
     disabled: true,
     href: installLink
-  }, "Install"), /* @__PURE__ */ React11.createElement(ButtonEx5, {
+  }, "Install"), /* @__PURE__ */ React13.createElement(ButtonEx5, {
     fullWidth: true,
     variant: "outlined",
     href: notificationLink,
@@ -1810,18 +1925,18 @@ var InstallButtonSection = /* @__PURE__ */ __name(({ installLink = "", notificat
 
 // src/modules/Dapp/modules/Window/components/DefaultComingSoon/SummarySection.tsx
 import { VerifiedRounded } from "@mui/icons-material";
-import { Card, CardContent as CardContent2, Typography as Typography3, useTheme as useTheme4 } from "@mui/material";
-import { FlexGrowCol as FlexGrowCol2, FlexGrowRow as FlexGrowRow4, FlexRow as FlexRow4 } from "@xylabs/react-flexbox";
-import React13 from "react";
+import { Card, CardContent as CardContent2, Typography as Typography4, useTheme as useTheme4 } from "@mui/material";
+import { FlexGrowCol as FlexGrowCol2, FlexGrowRow as FlexGrowRow4, FlexRow as FlexRow5 } from "@xylabs/react-flexbox";
+import React15 from "react";
 
 // src/modules/Dapp/modules/Window/components/DefaultComingSoon/DeveloperLinkSection.tsx
 import { useTheme as useTheme3 } from "@mui/material";
 import { FlexGrowRow as FlexGrowRow3 } from "@xylabs/react-flexbox";
 import { LinkEx } from "@xylabs/react-link";
-import React12 from "react";
+import React14 from "react";
 var DeveloperLinkSection = /* @__PURE__ */ __name(({ developerLink = "https://xylabs.com", ...props }) => {
   const theme = useTheme3();
-  return /* @__PURE__ */ React12.createElement(FlexGrowRow3, {
+  return /* @__PURE__ */ React14.createElement(FlexGrowRow3, {
     gap: 1,
     sx: {
       alignItems: "flex-start",
@@ -1831,7 +1946,7 @@ var DeveloperLinkSection = /* @__PURE__ */ __name(({ developerLink = "https://xy
       }
     },
     ...props
-  }, /* @__PURE__ */ React12.createElement(LinkEx, {
+  }, /* @__PURE__ */ React14.createElement(LinkEx, {
     color: theme.palette.info.main,
     href: developerLink,
     target: "_blank"
@@ -1841,18 +1956,18 @@ var DeveloperLinkSection = /* @__PURE__ */ __name(({ developerLink = "https://xy
 // src/modules/Dapp/modules/Window/components/DefaultComingSoon/SummarySection.tsx
 var SummarySection = /* @__PURE__ */ __name(({ name, dappIconSvg, version = "1.0", developerLink = "https://xylabs.com" }) => {
   const theme = useTheme4();
-  return /* @__PURE__ */ React13.createElement(Card, {
+  return /* @__PURE__ */ React15.createElement(Card, {
     sx: {
       width: "100%"
     }
-  }, /* @__PURE__ */ React13.createElement(CardContent2, null, /* @__PURE__ */ React13.createElement(FlexRow4, {
+  }, /* @__PURE__ */ React15.createElement(CardContent2, null, /* @__PURE__ */ React15.createElement(FlexRow5, {
     gap: 3,
     alignItems: "flex-start",
     sx: {
       flexDirection: "column",
       width: "100%"
     }
-  }, /* @__PURE__ */ React13.createElement(FlexGrowRow4, {
+  }, /* @__PURE__ */ React15.createElement(FlexGrowRow4, {
     sx: {
       gap: {
         md: 2,
@@ -1860,16 +1975,16 @@ var SummarySection = /* @__PURE__ */ __name(({ name, dappIconSvg, version = "1.0
       }
     },
     alignItems: "flex-start"
-  }, /* @__PURE__ */ React13.createElement(Card, {
+  }, /* @__PURE__ */ React15.createElement(Card, {
     elevation: 0,
     variant: "outlined"
-  }, /* @__PURE__ */ React13.createElement(CardContent2, null, dappIconSvg ? /* @__PURE__ */ React13.createElement(RenderHtml, {
+  }, /* @__PURE__ */ React15.createElement(CardContent2, null, dappIconSvg ? /* @__PURE__ */ React15.createElement(RenderHtml, {
     htmlString: dappIconSvg
-  }) : null)), /* @__PURE__ */ React13.createElement(FlexGrowCol2, {
+  }) : null)), /* @__PURE__ */ React15.createElement(FlexGrowCol2, {
     alignItems: "flex-start"
-  }, /* @__PURE__ */ React13.createElement(FlexGrowCol2, {
+  }, /* @__PURE__ */ React15.createElement(FlexGrowCol2, {
     alignItems: "flex-start"
-  }, /* @__PURE__ */ React13.createElement(Typography3, {
+  }, /* @__PURE__ */ React15.createElement(Typography4, {
     sx: {
       fontSize: {
         md: theme.typography.h1.fontSize,
@@ -1877,20 +1992,20 @@ var SummarySection = /* @__PURE__ */ __name(({ name, dappIconSvg, version = "1.0
       }
     },
     fontWeight: theme.typography.fontWeightBold
-  }, name), /* @__PURE__ */ React13.createElement(Typography3, {
+  }, name), /* @__PURE__ */ React15.createElement(Typography4, {
     gutterBottom: true,
     variant: "subtitle2"
-  }, "Version:", " ", version)), /* @__PURE__ */ React13.createElement(FlexGrowRow4, {
+  }, "Version:", " ", version)), /* @__PURE__ */ React15.createElement(FlexGrowRow4, {
     gap: 0.5,
     alignItems: "center",
     justifyContent: "center"
-  }, /* @__PURE__ */ React13.createElement(VerifiedRounded, {
+  }, /* @__PURE__ */ React15.createElement(VerifiedRounded, {
     color: "success",
     fontSize: "small"
-  }), /* @__PURE__ */ React13.createElement(Typography3, {
+  }), /* @__PURE__ */ React15.createElement(Typography4, {
     variant: "body1",
     color: theme.palette.success.main
-  }, "XY Labs")), developerLink ? /* @__PURE__ */ React13.createElement(DeveloperLinkSection, {
+  }, "XY Labs")), developerLink ? /* @__PURE__ */ React15.createElement(DeveloperLinkSection, {
     developerLink
   }) : null)))));
 }, "SummarySection");
@@ -1901,7 +2016,7 @@ var defaultDescription = [
 ];
 var DefaultComingSoon = /* @__PURE__ */ __name(({ children, desc = defaultDescription, developerLink = "https://xylabs.com", name, dappIconSvg, version }) => {
   const theme = useTheme5();
-  return /* @__PURE__ */ React14.createElement(Container, {
+  return /* @__PURE__ */ React16.createElement(Container, {
     maxWidth: "md",
     sx: {
       minHeight: "100%",
@@ -1909,40 +2024,40 @@ var DefaultComingSoon = /* @__PURE__ */ __name(({ children, desc = defaultDescri
       paddingTop: 2,
       width: "100%"
     }
-  }, version ? null : /* @__PURE__ */ React14.createElement(FlexRow5, {
+  }, version ? null : /* @__PURE__ */ React16.createElement(FlexRow6, {
     width: "100%",
     paddingBottom: 2
-  }, /* @__PURE__ */ React14.createElement(Chip, {
+  }, /* @__PURE__ */ React16.createElement(Chip, {
     label: "This app is not yet publicly available on xyOS",
     sx: {
       backgroundColor: alpha3(theme.palette.info.main, 0.2),
       color: theme.palette.info.main,
       width: "100%"
     }
-  })), /* @__PURE__ */ React14.createElement(FlexGrowCol3, {
+  })), /* @__PURE__ */ React16.createElement(FlexGrowCol3, {
     width: "100%",
     alignItems: "flex-start",
     minHeight: "100%"
-  }, /* @__PURE__ */ React14.createElement(FlexGrowCol3, {
+  }, /* @__PURE__ */ React16.createElement(FlexGrowCol3, {
     width: "100%",
     alignItems: "stretch",
     justifyContent: "flex-start",
     gap: 2
-  }, /* @__PURE__ */ React14.createElement(SummarySection, {
+  }, /* @__PURE__ */ React16.createElement(SummarySection, {
     dappIconSvg,
     name,
     version,
     developerLink
-  }), /* @__PURE__ */ React14.createElement(InstallButtonSection, null), /* @__PURE__ */ React14.createElement(Divider2, {
+  }), /* @__PURE__ */ React16.createElement(InstallButtonSection, null), /* @__PURE__ */ React16.createElement(Divider2, {
     flexItem: true
-  }), /* @__PURE__ */ React14.createElement(Card2, null, /* @__PURE__ */ React14.createElement(CardContent3, null, /* @__PURE__ */ React14.createElement(FlexGrowCol3, {
+  }), /* @__PURE__ */ React16.createElement(Card2, null, /* @__PURE__ */ React16.createElement(CardContent3, null, /* @__PURE__ */ React16.createElement(FlexGrowCol3, {
     justifyContent: "flex-start",
     alignItems: "flex-start"
-  }, /* @__PURE__ */ React14.createElement(Typography4, {
+  }, /* @__PURE__ */ React16.createElement(Typography5, {
     variant: "h6",
     gutterBottom: true
   }, "Learn more about", " ", name), desc?.map((paragraph, index) => {
-    return /* @__PURE__ */ React14.createElement(Typography4, {
+    return /* @__PURE__ */ React16.createElement(Typography5, {
       gutterBottom: true,
       paddingBottom: 1,
       key: index,
@@ -2011,147 +2126,6 @@ var XyOsUi = class extends XyOs {
   }
 };
 
-// src/modules/Dapp/modules/access-interface/components/Dialog.tsx
-import { ArrowForward } from "@mui/icons-material";
-import { Alert, Button, Dialog as Dialog2, DialogActions as DialogActions2, DialogContent as DialogContent2, DialogTitle, Typography as Typography5 } from "@mui/material";
-import { ErrorRender } from "@xylabs/react-error";
-import { FlexCol as FlexCol5, FlexRow as FlexRow6 } from "@xylabs/react-flexbox";
-import { RegisteredNames } from "@xyo-network/os-model";
-import { AccessNodeQueries } from "@xyo-network/os-runtime";
-import React15, { useState as useState9 } from "react";
-var DappAccessDialog = /* @__PURE__ */ __name(({ accessRequest, children, dappNode, registeredDappAccess, ...props }) => {
-  const [error, setError] = useState9();
-  const [noPayloadsInserted, setNoPayloadsInserted] = useState9(false);
-  const onClose = /* @__PURE__ */ __name(() => {
-    setNoPayloadsInserted(false);
-    props.onClose?.({}, "escapeKeyDown");
-  }, "onClose");
-  const handleAllow = /* @__PURE__ */ __name(() => {
-    if (accessRequest && registeredDappAccess && dappNode) {
-      try {
-        switch (registeredDappAccess.name) {
-          case RegisteredNames: {
-            const accessNodeQueries = new AccessNodeQueries(dappNode, accessRequest, registeredDappAccess);
-            accessNodeQueries.run().then((payloads) => {
-              if (payloads.length === 0) {
-                setNoPayloadsInserted(true);
-              } else {
-                onClose();
-              }
-              return;
-            }).catch((e) => {
-              setError(e);
-            });
-          }
-          default: {
-            const message = `no helper for interface ${registeredDappAccess.name} found`;
-            console.error(message);
-            setError(new Error(message));
-          }
-        }
-      } catch (e) {
-        console.error(e);
-        setError(e);
-      }
-    } else {
-      setError(new Error("No registered dapp access or dappNode found"));
-    }
-  }, "handleAllow");
-  return /* @__PURE__ */ React15.createElement(Dialog2, props, /* @__PURE__ */ React15.createElement(DialogTitle, null, "Message from XYO OS"), /* @__PURE__ */ React15.createElement(DialogContent2, {
-    dividers: true,
-    sx: {
-      display: "flex",
-      flexDirection: "column",
-      gap: 3
-    }
-  }, /* @__PURE__ */ React15.createElement(ErrorRender, {
-    error,
-    scope: "DappAccessDialog"
-  }), /* @__PURE__ */ React15.createElement(FlexCol5, {
-    gap: 1
-  }, /* @__PURE__ */ React15.createElement(Typography5, {
-    variant: "subtitle2"
-  }, "dApp to dApp Access Request"), /* @__PURE__ */ React15.createElement(FlexRow6, {
-    gap: 1
-  }, /* @__PURE__ */ React15.createElement(Typography5, {
-    fontSize: 16
-  }, /* @__PURE__ */ React15.createElement("strong", null, accessRequest?.requestingDappId), "\xA0"), /* @__PURE__ */ React15.createElement(ArrowForward, null), /* @__PURE__ */ React15.createElement(Typography5, {
-    fontSize: 16
-  }, /* @__PURE__ */ React15.createElement("strong", null, registeredDappAccess?.registeringDappId))))), /* @__PURE__ */ React15.createElement(DialogContent2, {
-    dividers: true,
-    sx: {
-      display: "flex",
-      flexDirection: "column",
-      gap: 3
-    }
-  }, /* @__PURE__ */ React15.createElement(FlexCol5, {
-    gap: 1
-  }, /* @__PURE__ */ React15.createElement(Typography5, null, /* @__PURE__ */ React15.createElement("strong", null, accessRequest?.requestingDappId), " ", "dApp would like to access your", /* @__PURE__ */ React15.createElement("strong", null, registeredDappAccess?.name), " ", "from", " ", /* @__PURE__ */ React15.createElement("strong", null, registeredDappAccess?.registeringDappId), " ", "dApp")), noPayloadsInserted ? /* @__PURE__ */ React15.createElement(Alert, {
-    severity: "warning"
-  }, registeredDappAccess?.name, " ", "Access Request did not find payloads to insert") : null), children ? /* @__PURE__ */ React15.createElement(DialogContent2, {
-    dividers: true
-  }, children) : null, /* @__PURE__ */ React15.createElement(DialogActions2, null, /* @__PURE__ */ React15.createElement(Button, {
-    variant: "outlined",
-    onClick: onClose
-  }, "Cancel"), /* @__PURE__ */ React15.createElement(Button, {
-    variant: "contained",
-    onClick: handleAllow
-  }, "Allow")));
-}, "DappAccessDialog");
-
-// src/modules/Dapp/modules/access-interface/components/Flexbox.tsx
-import { ErrorRender as ErrorRender2 } from "@xylabs/react-error";
-import React16 from "react";
-
-// src/modules/Dapp/modules/access-interface/hooks/useDialogState.tsx
-import { usePromise as usePromise10 } from "@xylabs/react-promise";
-import { isRegisteredDappAccess, RegisteredNames as RegisteredNames2 } from "@xyo-network/os-model";
-import { useState as useState10 } from "react";
-var useDialogState = /* @__PURE__ */ __name((context) => {
-  const dappCaller = useDappCaller();
-  const { accessRequests } = DappAccessRequestResourceHooks.resourceViewsFromContext(context);
-  const [openAccessDialog, setOpenAccessDialog] = useState10(false);
-  const [registeredInterface, setRegisteredInterface] = useState10();
-  const [, allowAccessDialogError] = usePromise10(async () => {
-    const accessRequest = accessRequests?.[0];
-    if (accessRequest && context && dappCaller) {
-      setOpenAccessDialog(true);
-      const payload = await dappCaller.getRegisteredDappAccessByName(RegisteredNames2);
-      setRegisteredInterface(isRegisteredDappAccess(payload) ? payload : void 0);
-    }
-  }, [
-    accessRequests,
-    dappCaller,
-    context
-  ]);
-  return {
-    accessRequests,
-    allowAccessDialogError,
-    openAccessDialog,
-    registeredInterface,
-    setOpenAccessDialog
-  };
-}, "useDialogState");
-
-// src/modules/Dapp/modules/access-interface/components/Flexbox.tsx
-var DappAccessFlexbox = /* @__PURE__ */ __name(({ context }) => {
-  const { accessRequests, allowAccessDialogError, openAccessDialog, registeredInterface, setOpenAccessDialog } = useDialogState(context);
-  return /* @__PURE__ */ React16.createElement(DappAccessDialog, {
-    accessRequest: accessRequests?.[0],
-    dappNode: context,
-    open: openAccessDialog,
-    onClose: /* @__PURE__ */ __name(() => setOpenAccessDialog(false), "onClose"),
-    registeredDappAccess: registeredInterface
-  }, allowAccessDialogError ? /* @__PURE__ */ React16.createElement(ErrorRender2, {
-    error: allowAccessDialogError,
-    scope: "DappAccessFlexbox"
-  }) : null);
-}, "DappAccessFlexbox");
-
-// src/modules/Dapp/modules/Window/hooks/menu/useDappMenu.tsx
-import { useEffect as useEffect12, useRef as useRef4, useState as useState11 } from "react";
-import { useNavigate as useNavigate4, useParams as useParams2 } from "react-router-dom";
-
 // src/modules/Dapp/modules/Window/hooks/lib/DappPathHelpers.ts
 import { NameTransforms as NameTransforms2 } from "@xyo-network/os-runtime";
 var DappPathHelpers = {
@@ -2180,6 +2154,23 @@ var DappPathHelpers = {
   }
 };
 
+// src/modules/Dapp/modules/Window/hooks/lib/deriveDappState.ts
+import { DappIntentTypes as DappIntentTypes7 } from "@xyo-network/os-model";
+var deriveDappState = /* @__PURE__ */ __name((intent) => {
+  const minimized = intent?.intent === DappIntentTypes7.Minimize;
+  const active = intent?.intent === DappIntentTypes7.Launch;
+  const closed = intent?.intent === DappIntentTypes7.Close;
+  return {
+    active,
+    closed,
+    minimized
+  };
+}, "deriveDappState");
+
+// src/modules/Dapp/modules/Window/hooks/menu/useDappMenu.tsx
+import { useEffect as useEffect12, useRef as useRef4, useState as useState11 } from "react";
+import { useNavigate as useNavigate4, useParams as useParams2 } from "react-router-dom";
+
 // src/modules/Dapp/modules/Window/hooks/useDappMenuResourceValues.tsx
 import { useMemo as useMemo10 } from "react";
 var useDappMenuDependencies = /* @__PURE__ */ __name((context) => {
@@ -2302,7 +2293,7 @@ var useManageDappInjectableParamsFromRoute = /* @__PURE__ */ __name((context) =>
 
 // src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappIntentRequest.tsx
 import { useAtomicPromise, usePromise as usePromise12 } from "@xylabs/react-promise";
-import { DappIntentTypes as DappIntentTypes7, isDappIntent } from "@xyo-network/os-model";
+import { DappIntentTypes as DappIntentTypes8, isDappIntent } from "@xyo-network/os-model";
 import { DappIntentCaller as DappIntentCaller4 } from "@xyo-network/os-runtime";
 import { useEffect as useEffect13, useState as useState12 } from "react";
 var useManageDappIntentRequest = /* @__PURE__ */ __name((context, dappId) => {
@@ -2323,7 +2314,7 @@ var useManageDappIntentRequest = /* @__PURE__ */ __name((context, dappId) => {
   useAtomicPromise("manageDappIntent", async () => {
     if (context && intentPayload?.targetDappId && dappId && sendIntent) {
       try {
-        const minimizeIntent = DappIntentCaller4.buildIntent(DappIntentCaller4.OsDappName, DappIntentTypes7.Minimize, dappId);
+        const minimizeIntent = DappIntentCaller4.buildIntent(DappIntentCaller4.OsDappName, DappIntentTypes8.Minimize, dappId);
         await sendIntent(minimizeIntent);
         await sendIntent(intentPayload);
       } catch (e) {
@@ -2416,77 +2407,49 @@ var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
 
 // src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappStateFromRoute.tsx
 import { usePromise as usePromise14 } from "@xylabs/react-promise";
-import { DappIntentTypes as DappIntentTypes8 } from "@xyo-network/os-model";
+import { DappIntentTypes as DappIntentTypes9 } from "@xyo-network/os-model";
 import { DappIntentCaller as DappIntentCaller5, NameTransforms as NameTransforms3 } from "@xyo-network/os-runtime";
-import { useNavigationType, useParams as useParams5 } from "react-router-dom";
-var useManageDappStateFromRoute = /* @__PURE__ */ __name((intentPayload, dappName) => {
+import { useRef as useRef6 } from "react";
+import { useParams as useParams5 } from "react-router-dom";
+var useManageDappStateFromRoute = /* @__PURE__ */ __name((intentPayload) => {
   const params = useParams5();
   const { dappName: dappNameParam } = params;
   const sendIntent = useSendDappIntent();
-  const navigationType = useNavigationType();
   const intentCaller = useDappIntentCaller();
+  const dappNameParamRef = useRef6();
+  const intentRef = useRef6();
   usePromise14(async () => {
-    const launched = intentPayload?.intent === DappIntentTypes8.Launch;
-    if (launched && dappNameParam === void 0 && sendIntent && navigationType === "POP") {
-      const closeIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes8.Close, dappName);
+    const launched = intentPayload?.intent === DappIntentTypes9.Launch;
+    const dappNameParamRemoved = !!dappNameParamRef.current && dappNameParam === void 0;
+    if (launched && dappNameParamRemoved && sendIntent) {
+      const closeIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes9.Close);
       await sendIntent(closeIntent);
     }
+    dappNameParamRef.current = dappNameParam;
   }, [
-    dappName,
     dappNameParam,
     intentPayload,
-    navigationType,
     sendIntent
   ]);
   usePromise14(async () => {
-    if (dappNameParam && dappName && sendIntent && intentCaller) {
+    if (dappNameParam && sendIntent && intentCaller) {
       const dappNameParamDeSlugged = new NameTransforms3(dappNameParam).deSlug();
-      const notLaunched = intentPayload?.intent !== DappIntentTypes8.Launch;
-      const paramMatchesDappName = dappNameParamDeSlugged === dappName;
-      if (notLaunched && paramMatchesDappName) {
-        const latestIntent = await intentCaller.latestIntent();
-        const existing = latestIntent && latestIntent.targetDappId === dappNameParamDeSlugged;
-        if (!existing) {
-          const launchIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes8.Launch, dappNameParamDeSlugged);
-          await sendIntent(launchIntent);
-          return;
-        }
+      const autoLaunchNeeded = intentRef.current === void 0 && dappNameParam;
+      if (autoLaunchNeeded) {
+        const launchIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes9.Launch, dappNameParamDeSlugged);
+        await sendIntent(launchIntent);
+        intentRef.current = launchIntent;
+        return;
       }
     }
   }, [
     dappNameParam,
-    dappName,
     sendIntent,
     intentCaller,
     intentPayload?.intent
   ]);
 }, "useManageDappStateFromRoute");
 
-// src/modules/Dapp/modules/Window/hooks/route/useManageDappBasedOffRoute.tsx
-var useManageDappBasedOffRoute = /* @__PURE__ */ __name((intentPayload, dappName, context) => {
-  const handleIntentError = useManageDappIntentRequest(context, dappName);
-  useManageDappStateFromRoute(intentPayload, dappName);
-  useManageDappPathFromRoute(context, dappName);
-  const injectableErrors = useManageDappInjectableParamsFromRoute(context);
-  return [
-    ...injectableErrors,
-    handleIntentError
-  ];
-}, "useManageDappBasedOffRoute");
-
-// src/modules/Dapp/modules/Window/hooks/useDappState.tsx
-import { DappIntentTypes as DappIntentTypes9 } from "@xyo-network/os-model";
-var dappState = /* @__PURE__ */ __name((intentType, context) => {
-  const minimized = intentType === DappIntentTypes9.Minimize;
-  const open = intentType === DappIntentTypes9.Launch;
-  const active = context && open;
-  return {
-    active,
-    minimized,
-    open
-  };
-}, "dappState");
-
 // src/modules/Dapp/modules/Window/NodeManifest.tsx
 import { usePromise as usePromise15 } from "@xylabs/react-promise";
 import { useProvidedNode } from "@xyo-network/react-node";
@@ -3165,16 +3128,20 @@ var DappMenuDrawer = /* @__PURE__ */ __name(({ activePath, context, iconSvg, nam
 }, "DappMenuDrawer");
 
 // src/modules/Dapp/modules/Window/DappWindow.tsx
-var DappWindow = /* @__PURE__ */ __name(({ dappSet, xnsNodeUrl, xnsNetwork }) => {
-  const { DappComponent, dapp, 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);
+var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWallet, errors, nodeCreateError }) => {
+  const { DappComponent, name, scrollable = true, version } = decomposeDappSet(dappSet);
+  const { active, minimized } = dappState ?? {};
   const TypedDappComponent = useMemo12(() => DappComponent, []);
-  const errors = useManageDappBasedOffRoute(intentPayload, name, context);
   useSyncOsRegisteredAccessInterfaces(context);
+  useManageDappPathFromRoute(context, name);
+  useManageDappInjectableParamsFromRoute(context);
   const { activePath, error: menuError, menuConfig, menuItemsVisible, onPathChange } = useDappMenu(context, name);
-  const resolvedError = nodeCreateError || menuError;
+  const resolvedErrors = [
+    nodeCreateError,
+    menuError,
+    ...errors ?? []
+  ].filter(Boolean);
+  const hasErrors = resolvedErrors.length > 0;
   return /* @__PURE__ */ React25.createElement(React25.Fragment, null, active ? /* @__PURE__ */ React25.createElement(Helmet, null, /* @__PURE__ */ React25.createElement("title", null, activePath ? `${new NameTransforms4(activePath).deSlug()} | ` : "", " ", name, " ", "dApp")) : null, /* @__PURE__ */ React25.createElement(ErrorBoundary, null, /* @__PURE__ */ React25.createElement(DappChrome, {
     appBar: /* @__PURE__ */ React25.createElement(React25.Fragment, null, /* @__PURE__ */ React25.createElement(DappBar, {
       context,
@@ -3184,7 +3151,7 @@ var DappWindow = /* @__PURE__ */ __name(({ dappSet, xnsNodeUrl, xnsNetwork }) =>
     })),
     height: "100dvh",
     width: "100dvw",
-    largeScreenMenu: /* @__PURE__ */ React25.createElement(DappMenuDrawer, {
+    largeScreenMenu: active && /* @__PURE__ */ React25.createElement(DappMenuDrawer, {
       context,
       name,
       version,
@@ -3193,7 +3160,7 @@ var DappWindow = /* @__PURE__ */ __name(({ dappSet, xnsNodeUrl, xnsNetwork }) =>
       menuConfig,
       menuItems: menuItemsVisible
     }),
-    smallScreenMenu: /* @__PURE__ */ React25.createElement(DappBottomNavigation, {
+    smallScreenMenu: active && /* @__PURE__ */ React25.createElement(DappBottomNavigation, {
       activePath,
       onPathChange,
       menuConfig,
@@ -3203,20 +3170,17 @@ var DappWindow = /* @__PURE__ */ __name(({ dappSet, xnsNodeUrl, xnsNetwork }) =>
       }
     }),
     /* Ensure that loading goes away when error occurs */
-    splashScreen: resolvedError ? null : /* @__PURE__ */ React25.createElement(DappLoadingFlexbox, {
-      minimize: minimized,
+    splashScreen: hasErrors ? null : /* @__PURE__ */ React25.createElement(DappLoadingFlexbox, {
+      minimize: !!minimized,
       name,
-      open
+      open: !!active
     })
-  }, resolvedError || errors?.length > 0 ? /* @__PURE__ */ React25.createElement(FlexCol10, {
+  }, hasErrors ? /* @__PURE__ */ React25.createElement(FlexCol10, {
     padding: 2
-  }, resolvedError ? /* @__PURE__ */ React25.createElement(ErrorRender3, {
-    error: resolvedError,
-    scope: "DappWindow"
-  }) : null, errors.map((error, index) => /* @__PURE__ */ React25.createElement(ErrorRender3, {
-    key: index,
+  }, resolvedErrors?.map((error) => /* @__PURE__ */ React25.createElement(ErrorRender3, {
+    key: error?.message,
     error,
-    scope: "DappWindowErrors"
+    scope: "DappWindow"
   }))) : null, /* @__PURE__ */ React25.createElement(WalletProvider, {
     rootWallet: dappWallet
   }, context === null ? null : /* @__PURE__ */ React25.createElement(XyOsUiContextProvider, {
@@ -3242,18 +3206,32 @@ var DappWindow = /* @__PURE__ */ __name(({ dappSet, xnsNodeUrl, xnsNetwork }) =>
 }, "DappWindow");
 
 // src/modules/Dapp/Container.tsx
-var DappContainer = /* @__PURE__ */ __name(({ dappSet, xnsNodeUrl, xnsNetwork }) => {
+var DappContainer = /* @__PURE__ */ __name(({ currentIntent, dappSet, xnsNodeUrl, xnsNetwork }) => {
   const { dapp, dappIcon } = dappSet;
+  const { dappWallet, context, nodeCreateError } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp, currentIntent);
+  const dappState = useMemo13(() => {
+    if (currentIntent?.targetDappId === dapp.config.name) {
+      return deriveDappState(currentIntent);
+    }
+  }, [
+    currentIntent,
+    dapp
+  ]);
   return /* @__PURE__ */ React26.createElement(DappIconButton, {
     dappIcon,
     dappIconSvg: dapp.params.iconSvg,
-    dappName: dapp?.config.name
+    dappName: dapp?.config.name,
+    dappState
   }, /* @__PURE__ */ React26.createElement(DappWindow, {
+    context,
     dappSet,
-    xnsNodeUrl,
-    xnsNetwork
+    dappState,
+    dappWallet,
+    intent: currentIntent,
+    nodeCreateError
   }));
 }, "DappContainer");
+var DappContainerMemo = /* @__PURE__ */ memo(DappContainer);
 
 // src/modules/Dapp/ContainerFlexbox.tsx
 import { Container as Container2 } from "@mui/material";
@@ -3274,7 +3252,7 @@ var ContainerFlexbox = /* @__PURE__ */ __name(({ children, containerProps, scrol
 
 // src/modules/Dapp/Page/Row.tsx
 import { Divider as Divider4, Fade as Fade2, styled as styled5 } from "@mui/material";
-import React29, { useMemo as useMemo13 } from "react";
+import React29, { useMemo as useMemo14 } from "react";
 
 // src/modules/Dapp/Page/DividerChip.tsx
 import { Chip as Chip2, CircularProgress } from "@mui/material";
@@ -3297,8 +3275,8 @@ var DividerChip = /* @__PURE__ */ __name(({ registeredDapps, ...props }) => {
 }, "DividerChip");
 
 // src/modules/Dapp/Page/Row.tsx
-var DappsRow = /* @__PURE__ */ __name(({ chipLabel, installType, registeredDappsSet, xnsNetwork, xnsNodeUrl }) => {
-  const filteredRegisteredDappSets = useMemo13(() => DappInstallTypeFilters[installType](registeredDappsSet), [
+var DappsRow = /* @__PURE__ */ __name(({ chipLabel, currentIntent, installType, registeredDappsSet, xnsNetwork, xnsNodeUrl }) => {
+  const filteredRegisteredDappSets = useMemo14(() => DappInstallTypeFilters[installType](registeredDappsSet), [
     installType,
     registeredDappsSet
   ]);
@@ -3314,8 +3292,9 @@ var DappsRow = /* @__PURE__ */ __name(({ chipLabel, installType, registeredDapps
   })), filteredRegisteredDappSets?.length ? /* @__PURE__ */ React29.createElement(Fade2, {
     in: !!filteredRegisteredDappSets?.length,
     timeout: 1e3
-  }, /* @__PURE__ */ React29.createElement(StyledGridContainer, null, filteredRegisteredDappSets?.map((dappSet, index) => /* @__PURE__ */ React29.createElement(DappContainer, {
-    key: index,
+  }, /* @__PURE__ */ React29.createElement(StyledGridContainer, null, filteredRegisteredDappSets?.map((dappSet) => /* @__PURE__ */ React29.createElement(DappContainerMemo, {
+    currentIntent,
+    key: dappSet.dapp.config.name,
     dappSet,
     xnsNodeUrl,
     xnsNetwork
@@ -3337,11 +3316,11 @@ var StyledGridContainer = styled5("div", {
 import { SignalCellularAltOutlined } from "@mui/icons-material";
 import { Tooltip as Tooltip5, useTheme as useTheme8 } from "@mui/material";
 import { useColorSchemeEx as useColorSchemeEx3 } from "@xylabs/react-invertible-theme";
-import React30, { useMemo as useMemo16 } from "react";
+import React30, { useMemo as useMemo17 } from "react";
 
 // src/modules/network/hooks/useOsNetwork.tsx
 import { OsPubSubNetworkReadyEvent } from "@xyo-network/os-runtime";
-import { useMemo as useMemo14 } from "react";
+import { useMemo as useMemo15 } from "react";
 
 // src/modules/network/hooks/lib/createNetworkState.ts
 import { assertEx as assertEx8 } from "@xylabs/assert";
@@ -3369,7 +3348,7 @@ var createNetworkState = /* @__PURE__ */ __name((stackReady) => {
 var useOsNetwork = /* @__PURE__ */ __name(() => {
   const context = useXyOsUiContext();
   const stackReady = useStackReady(OsPubSubNetworkReadyEvent, "osPubSubNetworkStack", context);
-  const networkState = useMemo14(() => {
+  const networkState = useMemo15(() => {
     return createNetworkState(stackReady);
   }, [
     context,
@@ -3380,11 +3359,11 @@ var useOsNetwork = /* @__PURE__ */ __name(() => {
 
 // src/modules/network/hooks/useXyoPublicNetwork.tsx
 import { OsXyoPublicNetworkReadyEvent } from "@xyo-network/os-runtime";
-import { useMemo as useMemo15 } from "react";
+import { useMemo as useMemo16 } from "react";
 var useXyoPublicNetwork = /* @__PURE__ */ __name(() => {
   const context = useXyOsUiContext();
   const stackReady = useStackReady(OsXyoPublicNetworkReadyEvent, "xyoPublicNetworkStack", context);
-  const networkState = useMemo15(() => {
+  const networkState = useMemo16(() => {
     return createNetworkState(stackReady);
   }, [
     context,
@@ -3464,7 +3443,7 @@ var NetworkLoadingIndicator = /* @__PURE__ */ __name(({ highContrast }) => {
   const successColor = highContrast ? highContrastSuccessColor : theme.palette.success.main;
   const highContrastErrorColor = darkMode ? theme.palette.success.dark : theme.palette.error.main;
   const errorColor = highContrast ? highContrastErrorColor : theme.palette.error.main;
-  const NetworkComponent = useMemo16(() => {
+  const NetworkComponent = useMemo17(() => {
     if (networkReady) {
       const connectionReady = true;
       return connectionReady ? () => /* @__PURE__ */ React30.createElement(Tooltip5, {
@@ -4025,7 +4004,7 @@ var WidgetCardExamples = /* @__PURE__ */ __name(() => {
 // src/DappPathSwitcher.tsx
 import { animated as animated3, useTransition } from "@react-spring/web";
 import { ErrorRender as ErrorRender4 } from "@xylabs/react-error";
-import React42 from "react";
+import React42, { useMemo as useMemo18 } from "react";
 var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent }) => {
   const transitions = useTransition(activePath, {
     enter: {
@@ -4043,7 +4022,18 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
   });
   const possibleZIndex = pathToComponent?.findIndex((item) => item.path === activePath);
   const zIndex = possibleZIndex !== -1 && possibleZIndex !== void 0 ? possibleZIndex : 1;
-  return /* @__PURE__ */ React42.createElement(React42.Fragment, null, transitions((transitionProps, activePath2) => /* @__PURE__ */ React42.createElement(animated3.div, {
+  const activeComponent = useMemo18(() => {
+    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePath === componentPath);
+    const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== void 0 ? pathToComponent[activeIndex] : void 0;
+    return activeItem ? activeItem.component : /* @__PURE__ */ React42.createElement(ErrorRender4, {
+      error: new Error(`No component found for path: ${activePath}`),
+      scope: "DappPathSwitcher"
+    });
+  }, [
+    activePath,
+    pathToComponent
+  ]);
+  return /* @__PURE__ */ React42.createElement(React42.Fragment, null, transitions((transitionProps) => /* @__PURE__ */ React42.createElement(animated3.div, {
     style: {
       ...transitionProps,
       alignItems: "stretch",
@@ -4059,14 +4049,7 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
       top: 0,
       zIndex
     }
-  }, (() => {
-    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePath2 === componentPath);
-    const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== void 0 ? pathToComponent[activeIndex] : void 0;
-    return activeItem ? activeItem.component : /* @__PURE__ */ React42.createElement(ErrorRender4, {
-      error: new Error(`No component found for path: ${activePath2}`),
-      scope: "DappPathSwitcher"
-    });
-  })())));
+  }, activeComponent)));
 }, "DappPathSwitcher");
 
 // src/dapps/shared/accounts/components/AnimatedComponents/GenericAnimations/ShiftAnimation.tsx
@@ -4436,10 +4419,10 @@ import React52 from "react";
 
 // src/dapps/shared/table/head/hooks/useVisibleColumns.tsx
 import { useMediaQuery as useMediaQuery2 } from "@mui/material";
-import { useMemo as useMemo17 } from "react";
+import { useMemo as useMemo19 } from "react";
 var useVisibleColumns = /* @__PURE__ */ __name((tableHeadCells) => {
   const isMedium = useMediaQuery2((theme) => theme.breakpoints.down("lg"));
-  const VisibleTableCells = useMemo17(() => {
+  const VisibleTableCells = useMemo19(() => {
     return isMedium ? tableHeadCells.filter((cell) => cell.showOnMobile) : tableHeadCells;
   }, [
     isMedium,
@@ -4518,7 +4501,7 @@ var NextIteratorFlexbox = /* @__PURE__ */ __name(({ next: changePage, loading, .
 
 // src/settings/Theme/ThemeProvider.tsx
 import { InvertibleMuiThemeProvider } from "@xylabs/react-invertible-theme";
-import React54, { useMemo as useMemo18 } from "react";
+import React54, { useMemo as useMemo20 } from "react";
 
 // src/settings/Theme/ThemeCssVars.ts
 import { alpha as alpha9, createTheme, darken as darken2, lighten } from "@mui/material";
@@ -4813,7 +4796,7 @@ var ThemeCssVars = createTheme({
 
 // src/settings/Theme/ThemeProvider.tsx
 var AppOsThemeProvider = /* @__PURE__ */ __name(({ children }) => {
-  const initialValue = useMemo18(() => {
+  const initialValue = useMemo20(() => {
     const validValues = [
       "light",
       "dark"
@@ -4856,11 +4839,13 @@ export {
   DappChrome,
   DappChromeLarge,
   DappContainer,
+  DappContainerMemo,
   DappInstallTypeFilters,
   DappIntentResourceHooks,
   DappMenuDrawer,
   DappMenuResourceHooks,
   DappPage,
+  DappPathHelpers,
   DappPathSwitcher,
   DappTitle,
   DappWindow,
@@ -4894,7 +4879,6 @@ export {
   TableHeadEx,
   TwoToneBulletPoint,
   TwoToneBulletPointList,
-  UpperWidgetTrayLayout,
   WidgetCaller,
   WidgetCard,
   WidgetCardExamples,
@@ -4903,8 +4887,8 @@ export {
   XyOsUi,
   XyOsUiContext,
   XyOsUiContextProvider,
-  dappState,
   decomposeDappSet,
+  deriveDappState,
   detectCustomer,
   getApiDomain,
   getNodePaletteByNameCode,
@@ -4928,6 +4912,7 @@ export {
   useDappIntentListener2,
   useDappMenu,
   useDappMenuCaller,
+  useDappMenuDependencies,
   useDappRegistrationResults,
   useDappRegistry,
   useDappSeedPhraseRepository,
@@ -4936,7 +4921,6 @@ export {
   useExposedNode,
   useIntentResourceViews,
   useKernel,
-  useManageDappBasedOffRoute,
   useManageDappInjectableParamsFromRoute,
   useManageDappIntentRequest,
   useManageDappPathFromRoute,