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

package/dist/browser/index.mjs

@@ -2156,14 +2156,14 @@ 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, context) => {
+var deriveDappState = /* @__PURE__ */ __name((intent) => {
   const minimized = intent?.intent === DappIntentTypes7.Minimize;
-  const open = intent?.intent === DappIntentTypes7.Launch;
-  const active = !!(context && open);
+  const active = intent?.intent === DappIntentTypes7.Launch;
+  const closed = intent?.intent === DappIntentTypes7.Close;
   return {
     active,
-    minimized,
-    open
+    closed,
+    minimized
   };
 }, "deriveDappState");
 
@@ -3143,14 +3143,18 @@ var DappMenuDrawer = /* @__PURE__ */ __name(({ activePath, context, iconSvg, nam
 }, "DappMenuDrawer");
 
 // src/modules/Dapp/modules/Window/DappWindow.tsx
-var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWallet, intent, nodeCreateError }) => {
+var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWallet, errors, nodeCreateError }) => {
   const { DappComponent, name, scrollable = true, version } = decomposeDappSet(dappSet);
-  const { active, minimized, open } = dappState ?? {};
+  const { active, minimized } = dappState ?? {};
   const TypedDappComponent = useMemo12(() => DappComponent, []);
-  const errors = useManageDappBasedOffRoute(intent, name, context);
   useSyncOsRegisteredAccessInterfaces(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,
@@ -3179,20 +3183,17 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
       }
     }),
     /* Ensure that loading goes away when error occurs */
-    splashScreen: resolvedError ? null : /* @__PURE__ */ React25.createElement(DappLoadingFlexbox, {
+    splashScreen: hasErrors ? null : /* @__PURE__ */ React25.createElement(DappLoadingFlexbox, {
       minimize: !!minimized,
       name,
-      open: !!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, {
+  }, resolvedErrors?.map((error, index) => /* @__PURE__ */ React25.createElement(ErrorRender3, {
     key: index,
     error,
-    scope: "DappWindowErrors"
+    scope: "DappWindow"
   }))) : null, /* @__PURE__ */ React25.createElement(WalletProvider, {
     rootWallet: dappWallet
   }, context === null ? null : /* @__PURE__ */ React25.createElement(XyOsUiContextProvider, {
@@ -3223,11 +3224,10 @@ var DappContainer = /* @__PURE__ */ __name(({ currentIntent, dappSet, xnsNodeUrl
   const { dappWallet, context, nodeCreateError } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp, currentIntent);
   const dappState = useMemo13(() => {
     if (currentIntent?.targetDappId === dapp.config.name) {
-      return deriveDappState(currentIntent, context);
+      return deriveDappState(currentIntent);
     }
   }, [
     currentIntent,
-    context,
     dapp
   ]);
   return /* @__PURE__ */ React26.createElement(DappIconButton, {
@@ -3306,9 +3306,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(DappContainerMemo, {
+  }, /* @__PURE__ */ React29.createElement(StyledGridContainer, null, filteredRegisteredDappSets?.map((dappSet) => /* @__PURE__ */ React29.createElement(DappContainerMemo, {
     currentIntent: intentPayload,
-    key: index,
+    key: dappSet.dapp.config.name,
     dappSet,
     xnsNodeUrl,
     xnsNetwork
@@ -4922,6 +4922,7 @@ export {
   useDappIntentListener2,
   useDappMenu,
   useDappMenuCaller,
+  useDappMenuDependencies,
   useDappRegistrationResults,
   useDappRegistry,
   useDappSeedPhraseRepository,