@xyo-network/os-react-runtime 7.2.1 → 7.3.1

package/dist/browser/index.mjs

@@ -37,8 +37,8 @@ import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
 import { IndexedDbBoundWitnessDiviner } from "@xyo-network/diviner-boundwitness-indexeddb";
 import { GenericPayloadDiviner } from "@xyo-network/diviner-payload-generic";
 import { IndexedDbPayloadDiviner } from "@xyo-network/diviner-payload-indexeddb";
-import { ModuleFactoryLocator } from "@xyo-network/module-factory-locator";
 import { asSchema } from "@xyo-network/payload-model";
+import { ModuleFactoryLocator } from "@xyo-network/sdk-js";
 var GenericPayloadDivinerTags = {
   "network.xyo.generic.payload.diviner": "GenericPayloadDiviner"
 };
@@ -73,78 +73,96 @@ var XyOsBrowserMonitor = class extends XyOsMonitor {
 };
 
 // src/img/backgrounds/index.ts
-import { default as default2 } from "./candy-dark@3x-N2S7K4QB.webp";
-import { default as default3 } from "./candy-light@3x-WKECMFRP.webp";
-import { default as default4 } from "./candyApple-dark@3x-HGSPETPR.webp";
-import { default as default5 } from "./candyApple-light@3x-OWA5XNTF.webp";
-import { default as default6 } from "./moss-dark@3x-HV35CF34.webp";
-import { default as default7 } from "./moss-light@3x-UH4AJQR5.webp";
-import { default as default8 } from "./ocean-dark@3x-LDW7E4ZL.webp";
-import { default as default9 } from "./ocean-light@3x-FP7M2MO7.webp";
-import { default as default10 } from "./peachYogurt-dark@3x-UWHJTY5O.webp";
-import { default as default11 } from "./peachYogurt-light@3x-X7Y7NU2Y.webp";
-import { default as default12 } from "./sherbet-dark@3x-UAIXX4RP.webp";
-import { default as default13 } from "./sherbet-light@3x-2Q2EFFWE.webp";
-import { default as default14 } from "./spring-dark@3x-XU3GBWBF.webp";
-import { default as default15 } from "./spring-light@3x-EFV3QMVY.webp";
-import { default as default16 } from "./sunset-dark@3x-F25FUK74.webp";
-import { default as default17 } from "./sunset-light@3x-B5T3EVGS.webp";
-import { default as default18 } from "./xyo-dark@3x-N62LIF7V.webp";
-import { default as default19 } from "./xyo-light@3x-5S6CF5P4.webp";
+import candyDarkImport from "./candy-dark@3x-N2S7K4QB.webp";
+import candyLightImport from "./candy-light@3x-WKECMFRP.webp";
+import candyAppleDarkImport from "./candyApple-dark@3x-HGSPETPR.webp";
+import candyAppleLightImport from "./candyApple-light@3x-OWA5XNTF.webp";
+import mossDarkImport from "./moss-dark@3x-HV35CF34.webp";
+import mossLightImport from "./moss-light@3x-UH4AJQR5.webp";
+import oceanDarkImport from "./ocean-dark@3x-LDW7E4ZL.webp";
+import oceanLightImport from "./ocean-light@3x-FP7M2MO7.webp";
+import peachYogurtDarkImport from "./peachYogurt-dark@3x-UWHJTY5O.webp";
+import peachYogurtLightImport from "./peachYogurt-light@3x-X7Y7NU2Y.webp";
+import sherbetDarkImport from "./sherbet-dark@3x-UAIXX4RP.webp";
+import sherbetLightImport from "./sherbet-light@3x-2Q2EFFWE.webp";
+import springDarkImport from "./spring-dark@3x-XU3GBWBF.webp";
+import springLightImport from "./spring-light@3x-EFV3QMVY.webp";
+import sunsetDarkImport from "./sunset-dark@3x-F25FUK74.webp";
+import sunsetLightImport from "./sunset-light@3x-B5T3EVGS.webp";
+import xyoDarkImport from "./xyo-dark@3x-N62LIF7V.webp";
+import xyoLightImport from "./xyo-light@3x-5S6CF5P4.webp";
+var candyDark = candyDarkImport;
+var candyLight = candyLightImport;
+var candyAppleDark = candyAppleDarkImport;
+var candyAppleLight = candyAppleLightImport;
+var mossDark = mossDarkImport;
+var mossLight = mossLightImport;
+var oceanDark = oceanDarkImport;
+var oceanLight = oceanLightImport;
+var peachYogurtDark = peachYogurtDarkImport;
+var peachYogurtLight = peachYogurtLightImport;
+var sherbetDark = sherbetDarkImport;
+var sherbetLight = sherbetLightImport;
+var springDark = springDarkImport;
+var springLight = springLightImport;
+var sunsetDark = sunsetDarkImport;
+var sunsetLight = sunsetLightImport;
+var xyoDark = xyoDarkImport;
+var xyoLight = xyoLightImport;
 
 // src/helpers/NodePalettes.ts
 var OsPalettes = {
   candy: {
-    darkModeWallpaper: default2,
-    lightModeWallpaper: default3,
+    darkModeWallpaper: candyDark,
+    lightModeWallpaper: candyLight,
     nameCode: "candy",
     readableName: "Candy"
   },
   candyApple: {
-    darkModeWallpaper: default4,
-    lightModeWallpaper: default5,
+    darkModeWallpaper: candyAppleDark,
+    lightModeWallpaper: candyAppleLight,
     nameCode: "candyApple",
     readableName: "Candy Apple"
   },
   moss: {
-    darkModeWallpaper: default6,
-    lightModeWallpaper: default7,
+    darkModeWallpaper: mossDark,
+    lightModeWallpaper: mossLight,
     nameCode: "moss",
     readableName: "Moss"
   },
   ocean: {
-    darkModeWallpaper: default8,
-    lightModeWallpaper: default9,
+    darkModeWallpaper: oceanDark,
+    lightModeWallpaper: oceanLight,
     nameCode: "ocean",
     readableName: "Ocean"
   },
   peachYogurt: {
-    darkModeWallpaper: default10,
-    lightModeWallpaper: default11,
+    darkModeWallpaper: peachYogurtDark,
+    lightModeWallpaper: peachYogurtLight,
     nameCode: "peachYogurt",
     readableName: "Peach Yogurt"
   },
   sherbet: {
-    darkModeWallpaper: default12,
-    lightModeWallpaper: default13,
+    darkModeWallpaper: sherbetDark,
+    lightModeWallpaper: sherbetLight,
     nameCode: "sherbet",
     readableName: "Sherbet"
   },
   spring: {
-    darkModeWallpaper: default14,
-    lightModeWallpaper: default15,
+    darkModeWallpaper: springDark,
+    lightModeWallpaper: springLight,
     nameCode: "spring",
     readableName: "Spring"
   },
   sunset: {
-    darkModeWallpaper: default16,
-    lightModeWallpaper: default17,
+    darkModeWallpaper: sunsetDark,
+    lightModeWallpaper: sunsetLight,
     nameCode: "sunset",
     readableName: "Sunset"
   },
   xyo: {
-    darkModeWallpaper: default18,
-    lightModeWallpaper: default19,
+    darkModeWallpaper: xyoDark,
+    lightModeWallpaper: xyoLight,
     nameCode: "xyo",
     readableName: "XYO"
   }
@@ -200,7 +218,9 @@ var WidgetCaller = class extends OsCallerBase {
       }) : void 0;
     }));
     const successfulResults = results.filter(fulfilled).map((result) => result.value);
-    const failedResults = results.filter(rejected).map((result) => new Error(result.reason));
+    const failedResults = results.filter(rejected).map((result) => {
+      return result.reason instanceof Error ? result.reason : new Error(String(result.reason));
+    });
     return [
       successfulResults,
       failedResults
@@ -259,8 +279,8 @@ var XyOsUiContextProvider = XyOsUiContext.Provider;
 
 // src/modules/XyOsUi/lib/XyOsUi.ts
 import { forget } from "@xylabs/sdk-js";
-import { ModuleFactoryLocator as ModuleFactoryLocator2 } from "@xyo-network/module-factory-locator";
 import { dappsReadyConnection, XyOs } from "@xyo-network/os-runtime";
+import { ModuleFactoryLocator as ModuleFactoryLocator2 } from "@xyo-network/sdk-js";
 var XyOsUi = class extends XyOs {
   static {
     __name(this, "XyOsUi");
@@ -478,19 +498,8 @@ var useKernel = /* @__PURE__ */ __name((locator, params) => {
 // src/modules/Dapp/Alert/RenderErrorWithSupportLink.tsx
 import { ButtonEx } from "@xylabs/react-button";
 import { ErrorAlert } from "@xylabs/react-error";
-import React2, { useEffect as useEffect4 } from "react";
-import { useLocation } from "react-router-dom";
+import React2 from "react";
 var ErrorRenderWithSupport = /* @__PURE__ */ __name(({ supportHref = "", supportTo, supportLinkText = "Support", error, onCancel, ...props }) => {
-  const location2 = useLocation();
-  useEffect4(() => {
-    location2.state = {
-      from: {
-        pathname: globalThis.location.pathname
-      }
-    };
-  }, [
-    location2
-  ]);
   return /* @__PURE__ */ React2.createElement(ErrorAlert, {
     action: supportTo ? /* @__PURE__ */ React2.createElement(ButtonEx, {
       target: "_blank",
@@ -522,7 +531,7 @@ import React26, { memo, useMemo as useMemo14 } from "react";
 import { useAsyncEffect } from "@xylabs/react-async-effect";
 import { DappIntentTypes } from "@xyo-network/os-model";
 import { DappContextCreator, RunningDappCache } from "@xyo-network/os-runtime";
-import { useCallback, useEffect as useEffect5, useRef, useState } from "react";
+import { useCallback, useEffect as useEffect4, useRef, useState } from "react";
 var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp, currentIntent, allowedNames, createOnMount = false) => {
   const context = useXyOsUiContext();
   const [windowDappNodeSet, setWindowDappNodeSet] = useState({
@@ -532,7 +541,7 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
   const [dappWindowNodeError, setDappWindowNodeError] = useState();
   const targetedDapp = !!(dapp && context && currentIntent?.targetDappId === dapp?.config.name);
   const windowDappNodeSetRef = useRef(windowDappNodeSet);
-  useEffect5(() => {
+  useEffect4(() => {
     windowDappNodeSetRef.current = windowDappNodeSet;
   }, [
     windowDappNodeSet
@@ -552,7 +561,7 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     context,
     allowedNames
   ]);
-  useEffect5(() => {
+  useEffect4(() => {
     if (createOnMount) {
       void (async () => {
         await createNode();
@@ -594,11 +603,11 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
 
 // src/modules/os/hooks/useDappRegistrationResults.ts
 import { EventBusPubSubConnection } from "@xyo-network/os-runtime";
-import { useEffect as useEffect6, useState as useState2 } from "react";
+import { useEffect as useEffect5, useState as useState2 } from "react";
 var useDappRegistrationResults = /* @__PURE__ */ __name(() => {
   const context = useXyOsUiContext();
   const [registeredDappSetResults, setRegisteredDappSetResults] = useState2();
-  useEffect6(() => {
+  useEffect5(() => {
     const listener = /* @__PURE__ */ __name(() => {
       setRegisteredDappSetResults(context?.dappRegistrationResults);
     }, "listener");
@@ -612,11 +621,15 @@ var useDappRegistrationResults = /* @__PURE__ */ __name(() => {
       type: "PubSub"
     };
     const dappsReadyConnection2 = new EventBusPubSubConnection(dappsReadyConnectionRequest);
+    let initialResultsTimeoutId;
     if (context) {
       context.eventBus.addConnection(dappsReadyConnection2);
-      setRegisteredDappSetResults(context.dappRegistrationResults);
+      initialResultsTimeoutId = setTimeout(() => setRegisteredDappSetResults(context.dappRegistrationResults), 0);
     }
-    return () => context && dappsReadyConnection2.id ? context.eventBus.removeConnection(dappsReadyConnection2.id) : void 0;
+    return () => {
+      if (initialResultsTimeoutId !== void 0) clearTimeout(initialResultsTimeoutId);
+      if (context && dappsReadyConnection2.id) context.eventBus.removeConnection(dappsReadyConnection2.id);
+    };
   }, [
     context
   ]);
@@ -631,31 +644,30 @@ import { useMemo as useMemo3 } from "react";
 import { DappSeedPhraseRepository } from "@xyo-network/os-runtime";
 import { useMemo as useMemo2 } from "react";
 var _dappWalletRepository;
+var getOrCreateDappSeedPhraseRepository = /* @__PURE__ */ __name((context, allowedNames) => {
+  _dappWalletRepository ??= new DappSeedPhraseRepository(context, allowedNames);
+  return _dappWalletRepository;
+}, "getOrCreateDappSeedPhraseRepository");
 var useDappSeedPhraseRepository = /* @__PURE__ */ __name((allowedNames) => {
   const context = useXyOsUiContext();
-  const dappWalletRepository = useMemo2(() => {
-    if (_dappWalletRepository === void 0 && context) {
-      _dappWalletRepository = new DappSeedPhraseRepository(context, allowedNames);
-    }
-    return _dappWalletRepository;
+  return useMemo2(() => {
+    return context ? getOrCreateDappSeedPhraseRepository(context, allowedNames) : void 0;
   }, [
     context,
     allowedNames
   ]);
-  return dappWalletRepository;
 }, "useDappSeedPhraseRepository");
 
 // src/modules/os/hooks/useDappRegistry.ts
 var _dappRegistry;
+var getOrCreateDappRegistry = /* @__PURE__ */ __name((repository) => {
+  _dappRegistry ??= new DappRegistry(repository);
+  return _dappRegistry;
+}, "getOrCreateDappRegistry");
 var useDappRegistry = /* @__PURE__ */ __name((allowedNames) => {
   const dappSeedPhraseRepository = useDappSeedPhraseRepository(allowedNames);
   return useMemo3(() => {
-    if (dappSeedPhraseRepository) {
-      if (!_dappRegistry) {
-        _dappRegistry = new DappRegistry(dappSeedPhraseRepository);
-      }
-      return _dappRegistry;
-    }
+    return dappSeedPhraseRepository ? getOrCreateDappRegistry(dappSeedPhraseRepository) : void 0;
   }, [
     dappSeedPhraseRepository
   ]);
@@ -669,13 +681,13 @@ import { useMemo as useMemo4 } from "react";
 // src/modules/stack/useStackReady.ts
 import { assertEx as assertEx3 } from "@xylabs/sdk-js";
 import { EventBusPubSubConnection as EventBusPubSubConnection2 } from "@xyo-network/os-runtime";
-import { useEffect as useEffect7, useState as useState3 } from "react";
+import { useEffect as useEffect6, useState as useState3 } from "react";
 var useStackReady = /* @__PURE__ */ __name((stackReadyEvent, stackName, context) => {
   const providedContext = useXyOsUiContext();
   const [stackReady, setStackReady] = useState3({
     ready: false
   });
-  useEffect7(() => {
+  useEffect6(() => {
     const derivedContext = context ?? providedContext;
     const listener = /* @__PURE__ */ __name(() => {
       if (!derivedContext) throw new Error("no context found");
@@ -695,15 +707,19 @@ var useStackReady = /* @__PURE__ */ __name((stackReadyEvent, stackName, context)
       type: "PubSub"
     };
     const stackReadyReadyConnection = new EventBusPubSubConnection2(stackReadyReadyConnectionRequest);
+    let initialReadyTimeoutId;
     if (derivedContext) {
       derivedContext.eventBus.addConnection(stackReadyReadyConnection);
       const stack = derivedContext.getStack(stackName);
-      if (stack.initialized) setStackReady({
-        ready: true,
-        stack: stack.stack
-      });
+      if (stack.initialized) {
+        initialReadyTimeoutId = setTimeout(() => setStackReady({
+          ready: true,
+          stack: stack.stack
+        }), 0);
+      }
     }
     return () => {
+      if (initialReadyTimeoutId !== void 0) clearTimeout(initialReadyTimeoutId);
       const derivedContext2 = context ?? providedContext;
       if (derivedContext2 && stackReadyReadyConnection._id) {
         derivedContext2.eventBus.removeConnection(stackReadyReadyConnection.id);
@@ -711,7 +727,9 @@ var useStackReady = /* @__PURE__ */ __name((stackReadyEvent, stackName, context)
     };
   }, [
     context,
-    providedContext
+    providedContext,
+    stackName,
+    stackReadyEvent
   ]);
   return stackReady;
 }, "useStackReady");
@@ -774,9 +792,9 @@ var usePhraseFile = /* @__PURE__ */ __name((phrase) => {
 }, "usePhraseFile");
 
 // src/modules/os/hooks/useTabs.ts
-import { useLocation as useLocation2, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 var useTabs = /* @__PURE__ */ __name(() => {
-  const location2 = useLocation2();
+  const location2 = useLocation();
   const navigate = useNavigate();
   const rootFolder = location2.pathname.split("/")[1];
   const tab = rootFolder?.length > 0 ? rootFolder : "node";
@@ -837,10 +855,10 @@ var getApiDomain = /* @__PURE__ */ __name((localHost, apiDomain) => {
 }, "getApiDomain");
 
 // src/utils/useOnWindowResize.tsx
-import { useEffect as useEffect8, useState as useState4 } from "react";
+import { useEffect as useEffect7, useState as useState4 } from "react";
 var useOnWindowResize = /* @__PURE__ */ __name(() => {
   const [resized, setResized] = useState4();
-  useEffect8(() => {
+  useEffect7(() => {
     const onResize = /* @__PURE__ */ __name((event) => {
       setResized(event);
     }, "onResize");
@@ -943,12 +961,12 @@ var useDappIntentCaller = /* @__PURE__ */ __name((xyOsContext) => {
 import { filterAs } from "@xylabs/sdk-js";
 import { asOptionalDappIntent, DappIntentTypes as DappIntentTypes2, DappMode } from "@xyo-network/os-model";
 import { useWeakArchivistFromNode as useWeakArchivistFromNode2 } from "@xyo-network/react-archivist";
-import { useEffect as useEffect9, useState as useState6 } from "react";
+import { useEffect as useEffect8, useState as useState6 } from "react";
 var useDappIntentListener = /* @__PURE__ */ __name((dappName, targetMode = DappMode.Window) => {
   const [dappIntentType, setDappIntentType] = useState6(DappIntentTypes2.Close);
   const [intentPayload, setIntentPayload] = useState6();
   const [intentArchivist] = useWeakArchivistFromNode2("IntentArchivist");
-  useEffect9(() => {
+  useEffect8(() => {
     const listener = /* @__PURE__ */ __name(({ payloads }) => {
       const filteredPayloads = filterAs(payloads, asOptionalDappIntent);
       for (const payload of filteredPayloads) {
@@ -993,35 +1011,40 @@ var useDappIntentListener = /* @__PURE__ */ __name((dappName, targetMode = DappM
 
 // src/modules/intent/useDappIntentListener2.ts
 import { DappIntentTypes as DappIntentTypes3, DappMode as DappMode2 } from "@xyo-network/os-model";
-import { useEffect as useEffect10, useState as useState7 } from "react";
+import { useEffect as useEffect9, useState as useState7 } from "react";
 var useDappIntentListener2 = /* @__PURE__ */ __name((dappName, sourceMode = DappMode2.Window) => {
   const { latestDappIntent } = DappIntentResourceHooks.useResourceViewsFromProvidedNode();
   const [dappIntentType, setDappIntentType] = useState7(DappIntentTypes3.Close);
-  useEffect10(() => {
-    if (sourceMode === DappMode2.Window) {
-      for (const payload of latestDappIntent ?? []) {
-        if (payload.targetDappId === dappName) {
-          switch (payload.intent) {
-            case DappIntentTypes3.Close: {
-              setDappIntentType(DappIntentTypes3.Close);
-              break;
-            }
-            case DappIntentTypes3.Launch: {
-              setDappIntentType(DappIntentTypes3.Launch);
-              break;
-            }
-            case DappIntentTypes3.Minimize: {
-              setDappIntentType(DappIntentTypes3.Minimize);
-              break;
-            }
-            default: {
-              console.warn("Unrecognized DappIntentType:", payload);
-            }
+  useEffect9(() => {
+    if (sourceMode !== DappMode2.Window) {
+      console.warn("Intent sent from unrecognized mode", sourceMode);
+      return;
+    }
+    let nextIntent;
+    for (const payload of latestDappIntent ?? []) {
+      if (payload.targetDappId === dappName) {
+        switch (payload.intent) {
+          case DappIntentTypes3.Close: {
+            nextIntent = DappIntentTypes3.Close;
+            break;
+          }
+          case DappIntentTypes3.Launch: {
+            nextIntent = DappIntentTypes3.Launch;
+            break;
+          }
+          case DappIntentTypes3.Minimize: {
+            nextIntent = DappIntentTypes3.Minimize;
+            break;
+          }
+          default: {
+            console.warn("Unrecognized DappIntentType:", payload);
           }
         }
       }
-    } else {
-      console.warn("Intent sent from unrecognized mode", sourceMode);
+    }
+    if (nextIntent !== void 0) {
+      const timeoutId = setTimeout(() => setDappIntentType(nextIntent), 0);
+      return () => clearTimeout(timeoutId);
     }
   }, [
     dappName,
@@ -1041,7 +1064,7 @@ var useNavigateIntent = /* @__PURE__ */ __name(() => {
   const navigate = useNavigate2();
   const { dappName: dappNameParam } = useParams();
   const updateRouteParam = useCallback2((dappIntent, { skipNavigate } = {}) => {
-    if (dappIntent && dappIntent.targetDappId) {
+    if (dappIntent?.targetDappId) {
       const { targetDappId: dappName, intent: intentType, params: intentParams } = dappIntent;
       const slug = new NameTransforms(dappName).slug();
       switch (intentType) {
@@ -1365,6 +1388,7 @@ var DappAccessDialog = /* @__PURE__ */ __name(({ accessRequest, children, dappNo
             }).catch((e) => {
               setError(e);
             });
+            break;
           }
           default: {
             const message = `no helper for interface ${registeredDappAccess.name} found`;
@@ -1658,7 +1682,7 @@ var useAddDappMenuItems = /* @__PURE__ */ __name((payloads) => {
 }, "useAddDappMenuItems");
 
 // src/modules/Dapp/modules/Window/hooks/menu/useDappMenu.ts
-import { useEffect as useEffect11, useRef as useRef3, useState as useState10 } from "react";
+import { useEffect as useEffect10, useRef as useRef3, useState as useState10 } from "react";
 import { useNavigate as useNavigate3, useParams as useParams2 } from "react-router-dom";
 
 // src/modules/Dapp/modules/Window/hooks/menu/useDappMenuDependencies.ts
@@ -1686,27 +1710,30 @@ var useDappMenu = /* @__PURE__ */ __name((context, dappName) => {
   const { defaultPath, menuConfigs, menuItemsVisible, menuSelection, resourceError } = useDappMenuDependencies(context);
   const activePath = menuSelection ?? defaultPath;
   const currentPathRef = useRef3(void 0);
-  useEffect11(() => {
+  useEffect10(() => {
     if (params && currentPathRef.current === void 0) {
       currentPathRef.current = params.path ?? "";
     }
   }, []);
-  useEffect11(() => {
+  useEffect10(() => {
     if (context === null) {
       currentPathRef.current = void 0;
     }
   }, [
     context
   ]);
-  useEffect11(() => {
+  useEffect10(() => {
     if (menuSelection) {
       currentPathRef.current = menuSelection;
     }
   }, [
     menuSelection
   ]);
-  useEffect11(() => {
-    if (resourceError) setError(resourceError);
+  useEffect10(() => {
+    if (resourceError) {
+      const timeoutId = setTimeout(() => setError(resourceError), 0);
+      return () => clearTimeout(timeoutId);
+    }
   }, [
     resourceError
   ]);
@@ -1786,7 +1813,7 @@ import { useAtomicPromise, usePromise as usePromise12 } from "@xylabs/react-prom
 import { findAs as findAs2 } from "@xylabs/sdk-js";
 import { asOptionalDappIntent as asOptionalDappIntent2, DappIntentTypes as DappIntentTypes7 } from "@xyo-network/os-model";
 import { DappIntentCaller as DappIntentCaller3 } from "@xyo-network/os-runtime";
-import { useEffect as useEffect12, useState as useState11 } from "react";
+import { useEffect as useEffect11, useState as useState11 } from "react";
 var useManageDappIntentRequest = /* @__PURE__ */ __name((context, dappId) => {
   const dappCaller = useDappCaller(context);
   const sendIntent = useSendDappIntent();
@@ -1820,7 +1847,7 @@ var useManageDappIntentRequest = /* @__PURE__ */ __name((context, dappId) => {
     intentPayload,
     sendIntent
   ]);
-  useEffect12(() => {
+  useEffect11(() => {
     const listener = /* @__PURE__ */ __name(({ payloads }) => {
       if (context) {
         const intentPayload2 = findAs2(payloads, asOptionalDappIntent2);
@@ -1845,7 +1872,7 @@ var useManageDappIntentRequest = /* @__PURE__ */ __name((context, dappId) => {
 
 // src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappPathFromRoute.tsx
 import { usePromise as usePromise13 } from "@xylabs/react-promise";
-import { useCallback as useCallback4, useEffect as useEffect13, useRef as useRef4 } from "react";
+import { useCallback as useCallback4, useEffect as useEffect12, useRef as useRef4 } from "react";
 import { useNavigate as useNavigate5, useParams as useParams3 } from "react-router-dom";
 var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
   const params = useParams3();
@@ -1870,7 +1897,7 @@ var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
     context,
     defaultPath
   ]);
-  useEffect13(() => {
+  useEffect12(() => {
     if (context && menuSelection) {
       const pathIsInUnchanged = DappPathHelpers.detectDuplicateSelections(currentPathRef.current ?? "", menuSelection, defaultPath);
       if (pathIsInUnchanged) return;
@@ -1943,7 +1970,7 @@ var useManageDappStateFromRoute = /* @__PURE__ */ __name((intentPayload) => {
 }, "useManageDappStateFromRoute");
 
 // src/modules/Dapp/modules/Window/hooks/useDebugClick.ts
-import { useCallback as useCallback5, useEffect as useEffect14, useRef as useRef6, useState as useState12 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect13, useRef as useRef6, useState as useState12 } from "react";
 import { useNavigate as useNavigate6, useSearchParams as useSearchParams2 } from "react-router-dom";
 var useDebugClick = /* @__PURE__ */ __name(() => {
   const [params, setParams] = useSearchParams2();
@@ -1972,7 +1999,7 @@ var useDebugClick = /* @__PURE__ */ __name(() => {
   }, [
     navigate
   ]);
-  useEffect14(() => {
+  useEffect13(() => {
     const initialOpen = openFromClick.current && !closeFromClick.current && params.has("debug");
     const backButtonClicked = openFromClick.current && !closeFromClick.current && !params.has("debug");
     if (initialOpen) {
@@ -2398,12 +2425,14 @@ var DefaultComingSoon = /* @__PURE__ */ __name(({ children, desc = defaultDescri
 // src/modules/Dapp/modules/Window/components/menu/BottomNavigation.tsx
 import { BottomNavigation, BottomNavigationAction, Paper, styled as styled2 } from "@mui/material";
 import { useIsDark } from "@xylabs/react-theme";
-import React16, { useEffect as useEffect15, useState as useState13 } from "react";
+import React16, { useEffect as useEffect14, useState as useState13 } from "react";
 var DappBottomNavigation = /* @__PURE__ */ __name(({ activePath, menuConfig, menuItems, onPathChange, ...props }) => {
   const [activeIndex, setActiveIndex] = useState13(0);
-  useEffect15(() => {
+  useEffect14(() => {
     if (menuConfig?.defaultPath && menuItems && activePath) {
-      setActiveIndex(menuItems.findIndex((item) => activePath === item.path));
+      const nextIndex = menuItems.findIndex((item) => activePath === item.path);
+      const timeoutId = setTimeout(() => setActiveIndex(nextIndex), 0);
+      return () => clearTimeout(timeoutId);
     }
   }, [
     activePath,
@@ -2452,7 +2481,7 @@ import { alpha, Drawer, List, ListItem, ListItemIcon, ListItemText, Tooltip as T
 import { FlexCol as FlexCol6, FlexGrowRow as FlexGrowRow4, FlexRow as FlexRow7 } from "@xylabs/react-flexbox";
 import { alphaCss as alphaCss3, darkenCss, useIsDark as useIsDark2 } from "@xylabs/react-theme";
 import { XyOsMonitor as XyOsMonitor3 } from "@xyo-network/os-runtime";
-import React19, { useEffect as useEffect16, useState as useState15 } from "react";
+import React19, { useEffect as useEffect15, useState as useState15 } from "react";
 
 // src/modules/Dapp/modules/Window/components/menu/BottomMenuArea.tsx
 import { BugReport as BugReport2, KeyboardArrowDownRounded, KeyboardArrowUpRounded } from "@mui/icons-material";
@@ -2466,6 +2495,9 @@ import React18, { useState as useState14 } from "react";
 // src/modules/Dapp/modules/Window/components/menu/img/xyoOS-Icon-White.svg
 var xyoOS_Icon_White_default = '<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 900"><defs><style>.cls-1{fill:#a8a8a8;opacity:.21;}.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:#fff;}</style></defs><path class="cls-1" d="M864.29,297.43c-2.44-6.58-9.76-9.94-16.34-7.5l-143.74,53.26L533.2,21.88c-1.85-3.48-5.21-5.9-9.09-6.56-3.89-.66-7.85.51-10.75,3.18l-267.76,246.55-118-97.86c-5.4-4.48-13.42-3.73-17.9,1.67-4.48,5.4-3.73,13.42,1.67,17.9l118,97.86L36.62,593.37c-2.09,3.34-2.5,7.46-1.14,11.15s4.37,6.54,8.13,7.72l347.4,108.61-25.75,151.12c-1.18,6.92,3.48,13.49,10.4,14.67.24.04.47.07.7.1,6.66.76,12.82-3.81,13.96-10.5l25.75-151.12,363.77,12.56c3.94.14,7.71-1.56,10.22-4.59,2.51-3.03,3.48-7.06,2.62-10.9l-79.64-355.16,143.75-53.26c6.58-2.44,9.94-9.75,7.5-16.34ZM518.49,48.34l156.33,293.75-401.12-68.35,244.79-225.4ZM674.37,367.8l-264.69,319.16-144.06-388.81,408.75,69.65ZM66.9,592.88l176.22-282.26,141.37,381.56-317.59-99.29ZM431.72,700.22l259.75-313.21,72.81,324.69-332.56-11.48Z"/><path class="cls-2" d="M865.04,302.64c.01-.2.02-.4.03-.6,0-.33,0-.66-.03-.99-.01-.2-.02-.39-.04-.58-.04-.35-.1-.71-.17-1.06-.03-.16-.05-.32-.09-.48-.12-.5-.26-1.01-.45-1.5-.18-.49-.4-.97-.64-1.43-.08-.15-.17-.29-.25-.43-.17-.31-.35-.61-.55-.9-.12-.17-.24-.33-.37-.49-.19-.25-.39-.5-.6-.74-.14-.16-.29-.32-.45-.47-.22-.22-.45-.44-.68-.65-.1-.08-.18-.18-.27-.26L530.1,18.07c-.34-.28-.7-.53-1.07-.77-.09-.06-.17-.13-.26-.19-.62-.39-1.26-.7-1.92-.98-.18-.07-.36-.14-.54-.21-.71-.26-1.43-.47-2.16-.6,0,0-.01,0-.02,0,0,0,0,0-.01,0-.67-.11-1.35-.15-2.03-.16-.37,0-.73,0-1.09.03-.23.02-.46.06-.7.09-.86.11-1.69.31-2.5.59-.07.03-.15.04-.23.07l-.32.12c-.2.08-.4.13-.59.22L115.08,165.06c-.11.04-.22.1-.33.15-.3.12-.59.25-.88.39-.19.1-.38.19-.57.3-.27.15-.54.32-.81.5-.17.12-.35.22-.52.35-.27.2-.53.42-.79.64-.14.12-.28.23-.41.35-.35.33-.68.68-1,1.05-.04.05-.08.1-.12.14-.32.38-.6.78-.87,1.2-.09.14-.16.29-.25.43-.18.31-.36.62-.51.94-.08.17-.15.35-.23.53-.13.31-.25.62-.36.93-.06.19-.12.38-.17.57-.09.33-.17.65-.23.98-.02.11-.06.22-.08.33l-72.09,423.12c-.07.43-.11.87-.13,1.3,0,.11-.03.22-.03.33-.03.73.02,1.44.12,2.16.02.19.06.38.09.57.13.74.31,1.48.57,2.19,0,0,0,0,0,0,0,.02.01.03.02.04.2.53.43,1.04.7,1.53.12.22.26.42.38.63.17.28.33.56.52.82.17.23.35.44.54.66.18.22.36.44.56.65.2.21.42.4.63.6.16.14.29.3.46.43l330.39,274c.08.07.17.12.25.18.32.25.65.49.99.71.15.09.29.19.44.28.44.26.9.5,1.37.7.04.02.08.04.12.06.51.21,1.03.39,1.56.53.17.05.35.08.53.12.24.06.47.12.71.16.23.04.46.07.69.1.47.05.95.08,1.42.08.15,0,.3-.02.45-.02.32-.01.65-.02.97-.06.18-.02.36-.06.54-.08.29-.04.58-.09.86-.15.19-.04.38-.1.56-.15.28-.08.55-.16.82-.25.08-.03.15-.04.23-.07l402.48-149.13s.06-.03.09-.04c.39-.15.76-.32,1.13-.51.12-.06.24-.1.35-.16.44-.24.88-.51,1.29-.8.03-.02.06-.04.09-.06.55-.39,1.07-.85,1.56-1.34.83-.82,1.54-1.76,2.11-2.78.09-.17.19-.33.27-.5.32-.64.61-1.3.82-2,.03-.11.05-.22.08-.33.12-.42.23-.84.3-1.27l72.09-423.12c.02-.11.02-.22.03-.33.05-.34.08-.67.1-1.01ZM771.44,701.13l-101.05-83.8,158.61-254.06-57.56,337.86ZM121.2,242.67l65.53,292.26-123.1,45.61,57.57-337.87ZM656.65,591.33l-141.37-381.56,317.59,99.3-176.22,282.26ZM508.76,181.1l22.05-129.41,263.81,218.79-285.86-89.37ZM483.7,176.83l-299.33-10.33L505.75,47.42l-22.05,129.41ZM208.31,514.94l-72.81-324.69,332.56,11.48-259.75,313.21ZM490.1,214.98l144.06,388.81-382.98-65.25-25.77-4.39L490.1,214.98ZM246.9,563.6l379.17,64.6-244.79,225.4-156.33-293.74,21.95,3.74ZM654.16,636.9l101.05,83.8-321.38,119.08,220.33-202.88ZM72.47,604.37l123.1-45.61,140.72,264.4-84.17-69.81-179.65-148.98Z"/></svg>';
 
+// src/modules/Dapp/modules/Window/components/menu/img/index.ts
+var XyoOSLogoWhite = xyoOS_Icon_White_default;
+
 // src/modules/Dapp/modules/Window/components/menu/SocialData.tsx
 import { Facebook, Instagram, LinkedIn, Reddit, StorefrontRounded, Telegram, X, YouTube } from "@mui/icons-material";
 import React17 from "react";
@@ -2634,7 +2666,7 @@ var BottomMenuArea = /* @__PURE__ */ __name(({ openDebug, backgroundColor }) =>
       color: theme.vars?.palette.text.primary,
       fill: theme.vars?.palette.text.primary
     },
-    src: xyoOS_Icon_White_default,
+    src: XyoOSLogoWhite,
     width: "auto",
     height: "20px"
   })), /* @__PURE__ */ React18.createElement(Typography5, {
@@ -2708,10 +2740,11 @@ var DappMenuDrawer = /* @__PURE__ */ __name(({ activePath, context, iconSvg, nam
   const theme = useTheme6();
   const drawerColor = darkMode ? theme.vars?.palette.background.paper : darkenCss(theme.vars?.palette.primary.main ?? "#fff", 0.5);
   const activeColor = theme.vars?.palette.primary.light;
-  useEffect16(() => {
+  useEffect15(() => {
     if (menuConfig?.defaultPath && menuItems && activePath) {
       const newPath = menuItems.find((item) => activePath === item.path)?.path ?? "";
-      setPath(newPath);
+      const timeoutId = setTimeout(() => setPath(newPath), 0);
+      return () => clearTimeout(timeoutId);
     }
   }, [
     activePath,
@@ -2878,7 +2911,7 @@ import React25 from "react";
 // src/modules/Dapp/modules/Window/LoadingFlexbox.tsx
 import { Fade, styled as styled4, Typography as Typography7 } from "@mui/material";
 import { FlexCol as FlexCol8 } from "@xylabs/react-flexbox";
-import React24, { useEffect as useEffect17, useState as useState17 } from "react";
+import React24, { useEffect as useEffect16, useState as useState17 } from "react";
 
 // src/modules/LoadingOsLogo/LoadingOsLogo.tsx
 import { FlexCol as FlexCol7 } from "@xylabs/react-flexbox";
@@ -2887,13 +2920,16 @@ import React22, { useState as useState16 } from "react";
 // src/modules/LoadingOsLogo/img/xyoOS-Icon.svg
 var xyoOS_Icon_default = '<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 900 900"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:#a8a8a8;opacity:.21;}</style><linearGradient id="linear-gradient" x1="34.7" y1="450.98" x2="865.07" y2="450.98" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#579fd6"/><stop offset=".52" stop-color="#eb407a"/><stop offset="1" stop-color="#f27046"/></linearGradient></defs><path class="cls-2" d="M864.29,297.43c-2.44-6.58-9.76-9.94-16.34-7.5l-143.74,53.26L533.2,21.88c-1.85-3.48-5.21-5.9-9.09-6.56-3.89-.66-7.85.51-10.75,3.18l-267.76,246.55-118-97.86c-5.4-4.48-13.42-3.73-17.9,1.67-4.48,5.4-3.73,13.42,1.67,17.9l118,97.86L36.62,593.37c-2.09,3.34-2.5,7.46-1.14,11.15s4.37,6.54,8.13,7.72l347.4,108.61-25.75,151.12c-1.18,6.92,3.48,13.49,10.4,14.67.24.04.47.07.7.1,6.66.76,12.82-3.81,13.96-10.5l25.75-151.12,363.77,12.56c3.94.14,7.71-1.56,10.22-4.59,2.51-3.03,3.48-7.06,2.62-10.9l-79.64-355.16,143.75-53.26c6.58-2.44,9.94-9.75,7.5-16.34ZM518.49,48.34l156.33,293.75-401.12-68.35,244.79-225.4ZM674.37,367.8l-264.69,319.16-144.06-388.81,408.75,69.65ZM66.9,592.88l176.22-282.26,141.37,381.56-317.59-99.29ZM431.72,700.22l259.75-313.21,72.81,324.69-332.56-11.48Z"/><path class="cls-1" d="M865.04,302.64c.01-.2.02-.4.03-.6,0-.33,0-.66-.03-.99-.01-.2-.02-.39-.04-.58-.04-.35-.1-.71-.17-1.06-.03-.16-.05-.32-.09-.48-.12-.5-.26-1.01-.45-1.5-.18-.49-.4-.97-.64-1.43-.08-.15-.17-.29-.25-.43-.17-.31-.35-.61-.55-.9-.12-.17-.24-.33-.37-.49-.19-.25-.39-.5-.6-.74-.14-.16-.29-.32-.45-.47-.22-.22-.45-.44-.68-.65-.1-.08-.18-.18-.27-.26L530.1,18.07c-.34-.28-.7-.53-1.07-.77-.09-.06-.17-.13-.26-.19-.62-.39-1.26-.7-1.92-.98-.18-.07-.36-.14-.54-.21-.71-.26-1.43-.47-2.16-.6,0,0-.01,0-.02,0,0,0,0,0-.01,0-.67-.11-1.35-.15-2.03-.16-.37,0-.73,0-1.09.03-.23.02-.46.06-.7.09-.86.11-1.69.31-2.5.59-.07.03-.15.04-.23.07l-.32.12c-.2.08-.4.13-.59.22L115.08,165.06c-.11.04-.22.1-.33.15-.3.12-.59.25-.88.39-.19.1-.38.19-.57.3-.27.15-.54.32-.81.5-.17.12-.35.22-.52.35-.27.2-.53.42-.79.64-.14.12-.28.23-.41.35-.35.33-.68.68-1,1.05-.04.05-.08.1-.12.14-.32.38-.6.78-.87,1.2-.09.14-.16.29-.25.43-.18.31-.36.62-.51.94-.08.17-.15.35-.23.53-.13.31-.25.62-.36.93-.06.19-.12.38-.17.57-.09.33-.17.65-.23.98-.02.11-.06.22-.08.33l-72.09,423.12c-.07.43-.11.87-.13,1.3,0,.11-.03.22-.03.33-.03.73.02,1.44.12,2.16.02.19.06.38.09.57.13.74.31,1.48.57,2.19,0,0,0,0,0,0,0,.02.01.03.02.04.2.53.43,1.04.7,1.53.12.22.26.42.38.63.17.28.33.56.52.82.17.23.35.44.54.66.18.22.36.44.56.65.2.21.42.4.63.6.16.14.29.3.46.43l330.39,274c.08.07.17.12.25.18.32.25.65.49.99.71.15.09.29.19.44.28.44.26.9.5,1.37.7.04.02.08.04.12.06.51.21,1.03.39,1.56.53.17.05.35.08.53.12.24.06.47.12.71.16.23.04.46.07.69.1.47.05.95.08,1.42.08.15,0,.3-.02.45-.02.32-.01.65-.02.97-.06.18-.02.36-.06.54-.08.29-.04.58-.09.86-.15.19-.04.38-.1.56-.15.28-.08.55-.16.82-.25.08-.03.15-.04.23-.07l402.48-149.13s.06-.03.09-.04c.39-.15.76-.32,1.13-.51.12-.06.24-.1.35-.16.44-.24.88-.51,1.29-.8.03-.02.06-.04.09-.06.55-.39,1.07-.85,1.56-1.34.83-.82,1.54-1.76,2.11-2.78.09-.17.19-.33.27-.5.32-.64.61-1.3.82-2,.03-.11.05-.22.08-.33.12-.42.23-.84.3-1.27l72.09-423.12c.02-.11.02-.22.03-.33.05-.34.08-.67.1-1.01ZM771.44,701.13l-101.05-83.8,158.61-254.06-57.56,337.86ZM121.2,242.67l65.53,292.26-123.1,45.61,57.57-337.87ZM656.65,591.33l-141.37-381.56,317.59,99.3-176.22,282.26ZM508.76,181.1l22.05-129.41,263.81,218.79-285.86-89.37ZM483.7,176.83l-299.33-10.33L505.75,47.42l-22.05,129.41ZM208.31,514.94l-72.81-324.69,332.56,11.48-259.75,313.21ZM490.1,214.98l144.06,388.81-382.98-65.25-25.77-4.39L490.1,214.98ZM246.9,563.6l379.17,64.6-244.79,225.4-156.33-293.74,21.95,3.74ZM654.16,636.9l101.05,83.8-321.38,119.08,220.33-202.88ZM72.47,604.37l123.1-45.61,140.72,264.4-84.17-69.81-179.65-148.98Z"/></svg>';
 
+// src/modules/LoadingOsLogo/img/index.ts
+var XyoOSIcon = xyoOS_Icon_default;
+
 // src/modules/LoadingOsLogo/LoadingOsLogo.tsx
 var LoadingOsLogo = /* @__PURE__ */ __name(({ widthInPixels, busy, spinsPerSecond = 0.5, ...props }) => {
   const [imageLoaded, setImageLoaded] = useState16(false);
   if (!imageLoaded) {
     const img = new Image();
     img.addEventListener("load", () => setImageLoaded(true));
-    img.src = xyoOS_Icon_default;
+    img.src = XyoOSIcon;
   }
   return imageLoaded ? /* @__PURE__ */ React22.createElement(FlexCol7, {
     sx: {
@@ -2928,7 +2964,7 @@ var LoadingOsLogo = /* @__PURE__ */ __name(({ widthInPixels, busy, spinsPerSecon
     },
     ...props
   }, /* @__PURE__ */ React22.createElement("img", {
-    src: xyoOS_Icon_default,
+    src: XyoOSIcon,
     height: widthInPixels ?? 22
   }))) : null;
 }, "LoadingOsLogo");
@@ -2968,11 +3004,11 @@ var DappLoadingFlexbox = /* @__PURE__ */ __name(({ minimize, open, name, ...prop
   const [fadeIn, setFadeIn] = useState17(!open);
   const [trail, setTrail] = useState17(false);
   const skipLoadingScreen = useSkipLoadingScreen();
-  useEffect17(() => {
+  useEffect16(() => {
     if (open) {
       if (skipLoadingScreen) {
-        setFadeIn(false);
-        return;
+        const immediateTimeout = setTimeout(() => setFadeIn(false), 0);
+        return () => clearTimeout(immediateTimeout);
       }
       const fadeInTimeout = setTimeout(() => {
         setFadeIn(false);
@@ -2989,7 +3025,8 @@ var DappLoadingFlexbox = /* @__PURE__ */ __name(({ minimize, open, name, ...prop
       };
     }
     if (!minimize) {
-      setFadeIn(true);
+      const resetTimeout = setTimeout(() => setFadeIn(true), 0);
+      return () => clearTimeout(resetTimeout);
     }
   }, [
     minimize,
@@ -3050,7 +3087,7 @@ var StyledSplashContainer = styled4(FlexCol8, {
 
 // src/modules/Dapp/modules/Window/Rendered.tsx
 var DappRendered = /* @__PURE__ */ __name(({ context, dapp, dappMenuProperties, dappState, dappWallet, errors }) => {
-  const { DappComponent, name, scrollable = true, version } = useDecomposeDapp(dapp);
+  const { DappComponent: dappComponent, name, scrollable = true, version } = useDecomposeDapp(dapp);
   const { active, minimized } = dappState ?? {};
   const hasErrors = errors && errors.length > 0;
   return /* @__PURE__ */ React25.createElement(DappChrome, {
@@ -3104,7 +3141,7 @@ var DappRendered = /* @__PURE__ */ __name(({ context, dapp, dappMenuProperties,
     sx: {
       overflowY: scrollable ? "auto" : "hidden"
     }
-  }, /* @__PURE__ */ React25.createElement(DappComponent, {
+  }, /* @__PURE__ */ React25.createElement(dappComponent, {
     name: dapp?.config.name
   })), /* @__PURE__ */ React25.createElement(DappAccessFlexbox, {
     context
@@ -3181,7 +3218,7 @@ import React31 from "react";
 import { SignalCellularAltOutlined } from "@mui/icons-material";
 import { Tooltip as Tooltip4, useTheme as useTheme7 } from "@mui/material";
 import { useIsDark as useIsDark3 } from "@xylabs/react-theme";
-import React28, { useMemo as useMemo17 } from "react";
+import React28 from "react";
 
 // src/modules/network/hooks/useOsNetwork.tsx
 import { OsPubSubNetworkReadyEvent } from "@xyo-network/os-runtime";
@@ -3308,31 +3345,23 @@ var NetworkLoadingIndicator = /* @__PURE__ */ __name(({ highContrast }) => {
   const successColor = highContrast ? highContrastSuccessColor : theme.vars?.palette.success.main;
   const highContrastErrorColor = darkMode ? theme.vars?.palette.success.dark : theme.vars?.palette.error.main;
   const errorColor = highContrast ? highContrastErrorColor : theme.vars?.palette.error.main;
-  const NetworkComponent = useMemo17(() => {
-    if (networkReady) {
-      const connectionReady = true;
-      return connectionReady ? () => /* @__PURE__ */ React28.createElement(Tooltip4, {
-        title: "Connected to Network"
-      }, /* @__PURE__ */ React28.createElement(SignalCellularAltOutlined, {
-        sx: {
-          color: successColor
-        }
-      })) : () => /* @__PURE__ */ React28.createElement(Tooltip4, {
-        title: "Error Connecting to Network"
-      }, /* @__PURE__ */ React28.createElement(SignalCellularAltOutlined, {
-        sx: {
-          color: errorColor
-        }
-      }));
-    } else {
-      return WaitingForNetwork;
+  if (!networkReady) {
+    return /* @__PURE__ */ React28.createElement(WaitingForNetwork, null);
+  }
+  const connectionReady = true;
+  return connectionReady ? /* @__PURE__ */ React28.createElement(Tooltip4, {
+    title: "Connected to Network"
+  }, /* @__PURE__ */ React28.createElement(SignalCellularAltOutlined, {
+    sx: {
+      color: successColor
     }
-  }, [
-    errorColor,
-    networkReady,
-    successColor
-  ]);
-  return /* @__PURE__ */ React28.createElement(NetworkComponent, null);
+  })) : /* @__PURE__ */ React28.createElement(Tooltip4, {
+    title: "Error Connecting to Network"
+  }, /* @__PURE__ */ React28.createElement(SignalCellularAltOutlined, {
+    sx: {
+      color: errorColor
+    }
+  }));
 }, "NetworkLoadingIndicator");
 
 // src/modules/network/components/NetworkButton.tsx
@@ -3342,7 +3371,7 @@ import React29 from "react";
 var NetworkButton = /* @__PURE__ */ __name(({ disabled, startIcon, ...props }) => {
   const { networkReady } = useOsNetwork();
   return /* @__PURE__ */ React29.createElement(Button2, {
-    disabled: disabled || !networkReady,
+    disabled: disabled === true || !networkReady,
     startIcon: /* @__PURE__ */ React29.createElement(React29.Fragment, null, startIcon, networkReady === false ? /* @__PURE__ */ React29.createElement(NotInterested, null) : null),
     ...props
   });
@@ -3458,6 +3487,14 @@ var DappPage = /* @__PURE__ */ __name(({ checkNetwork, noScroll, subtitle, title
 import { animated as animated2, useTransition } from "@react-spring/web";
 import { ErrorRender as ErrorRender5 } from "@xylabs/react-error";
 import React32 from "react";
+var resolveActiveComponent = /* @__PURE__ */ __name((activePathRef, pathToComponent) => {
+  const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePathRef === componentPath);
+  const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== void 0 ? pathToComponent[activeIndex] : void 0;
+  return activeItem ? activeItem.component : /* @__PURE__ */ React32.createElement(ErrorRender5, {
+    error: new Error(`No component found for path: ${activePathRef}`),
+    scope: "DappPathSwitcher"
+  });
+}, "resolveActiveComponent");
 var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent }) => {
   const transitions = useTransition(activePath, {
     enter: {
@@ -3491,19 +3528,12 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
       top: 0,
       zIndex
     }
-  }, (() => {
-    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePathRef === componentPath);
-    const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== void 0 ? pathToComponent[activeIndex] : void 0;
-    return activeItem ? activeItem.component : /* @__PURE__ */ React32.createElement(ErrorRender5, {
-      error: new Error(`No component found for path: ${activePathRef}`),
-      scope: "DappPathSwitcher"
-    });
-  })())));
+  }, resolveActiveComponent(activePathRef, pathToComponent))));
 }, "DappPathSwitcher");
 
 // src/modules/Dapp/Page/Row.tsx
 import { Divider as Divider4, Fade as Fade2, styled as styled6 } from "@mui/material";
-import React34, { useMemo as useMemo18 } from "react";
+import React34, { useMemo as useMemo17 } from "react";
 
 // src/modules/Dapp/Page/DividerChip.tsx
 import { Chip as Chip2, CircularProgress } from "@mui/material";
@@ -3527,7 +3557,7 @@ var DividerChip = /* @__PURE__ */ __name(({ registeredDapps, ...props }) => {
 
 // src/modules/Dapp/Page/Row.tsx
 var DappsRow = /* @__PURE__ */ __name(({ chipLabel, currentIntent, installType, registeredDappsSet, xnsNetwork, xnsNodeUrl }) => {
-  const filteredRegisteredDappSets = useMemo18(() => DappInstallTypeFilters[installType](registeredDappsSet), [
+  const filteredRegisteredDappSets = useMemo17(() => DappInstallTypeFilters[installType](registeredDappsSet), [
     installType,
     registeredDappsSet
   ]);
@@ -3565,7 +3595,7 @@ var StyledGridContainer = styled6("div", {
 
 // src/modules/dapps/accounts/components/AnimatedComponents/GenericAnimations/ShiftAnimation.tsx
 import { animated as animated3, useSpring as useSpring2 } from "@react-spring/web";
-import React35, { useEffect as useEffect18, useState as useState18 } from "react";
+import React35, { useEffect as useEffect17, useState as useState18 } from "react";
 var MovementData = {
   down: [
     {
@@ -3646,7 +3676,7 @@ var ShiftAnimation = /* @__PURE__ */ __name(({ startAnimation = false, animation
       y: startAnimation ? MovementData[animationDirection][0].FromYMovement : 0
     }
   });
-  useEffect18(() => {
+  useEffect17(() => {
     if (!isShifted) {
       return;
     }
@@ -3931,10 +3961,10 @@ import React44 from "react";
 
 // src/modules/dapps/table/head/hooks/useVisibleColumns.tsx
 import { useMediaQuery as useMediaQuery2 } from "@mui/material";
-import { useMemo as useMemo19 } from "react";
+import { useMemo as useMemo18 } from "react";
 var useVisibleColumns = /* @__PURE__ */ __name((tableHeadCells) => {
   const isMedium = useMediaQuery2((theme) => theme.breakpoints.down("lg"));
-  const VisibleTableCells = useMemo19(() => {
+  const VisibleTableCells = useMemo18(() => {
     return isMedium ? tableHeadCells.filter((cell) => cell.showOnMobile) : tableHeadCells;
   }, [
     isMedium,
@@ -4210,7 +4240,7 @@ var HorizontalBarGraph = /* @__PURE__ */ __name(({ items = sampleData, ...props
 // src/modules/widgets/Types/DataColumns/TwoColTwoStat.tsx
 import { Typography as Typography13, useTheme as useTheme10 } from "@mui/material";
 import { FlexCol as FlexCol16, FlexGrowRow as FlexGrowRow9 } from "@xylabs/react-flexbox";
-import React48, { useEffect as useEffect19 } from "react";
+import React48, { useEffect as useEffect18 } from "react";
 var MAX_LENGTH = 2;
 var validateProps = /* @__PURE__ */ __name((props) => {
   if (props.length > MAX_LENGTH) {
@@ -4219,7 +4249,7 @@ var validateProps = /* @__PURE__ */ __name((props) => {
 }, "validateProps");
 var TwoColTwoStat = /* @__PURE__ */ __name(({ items, ...props }) => {
   const theme = useTheme10();
-  useEffect19(() => {
+  useEffect18(() => {
     validateProps(items);
   }, [
     items
@@ -4511,7 +4541,7 @@ var WidgetCardExamples = /* @__PURE__ */ __name(() => {
   const darkMode = useIsDark4();
   return /* @__PURE__ */ React54.createElement(DappPage, {
     sx: {
-      backgroundImage: darkMode ? `url(${default18})` : `url(${default19})`,
+      backgroundImage: darkMode ? `url(${xyoDark})` : `url(${xyoLight})`,
       backgroundSize: "cover"
     },
     container: "xl",
@@ -4526,9 +4556,9 @@ var WidgetCardExamples = /* @__PURE__ */ __name(() => {
 // src/settings/Theme/ThemeProvider.tsx
 import { ThemeProvider } from "@mui/material";
 import { XyosTheme } from "@xylabs/react-theme";
-import React55, { useMemo as useMemo20 } from "react";
+import React55, { useMemo as useMemo19 } from "react";
 var AppOsThemeProvider = /* @__PURE__ */ __name(({ children }) => {
-  const initialValue = useMemo20(() => {
+  const initialValue = useMemo19(() => {
     const validValues = [
       "light",
       "dark"