@xyo-network/react-node-renderer 2.58.0-rc.2 → 2.58.0-rc.3

package/dist/cjs/Cytoscape/CytoscapeElements.js

@@ -3,7 +3,6 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CytoscapeElements = void 0;
 const tslib_1 = require("tslib");
-const module_1 = require("@xyo-network/module");
 const lib_1 = require("./lib");
 class CytoscapeElements {
     static buildEdge(rootNode, newNode) {
@@ -15,18 +14,15 @@ class CytoscapeElements {
             },
         };
     }
-    static buildElements(node, account) {
+    static buildElements(node) {
         var _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            console.log('buildElements: Start');
             try {
                 const [, newRootNode] = yield CytoscapeElements.buildRootNode(node);
                 const newElements = [newRootNode];
-                const children = yield Promise.all((yield node.resolve()).map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    return [
-                        yield ((0, module_1.isModuleInstance)(child) ? child.manifest() : module_1.ModuleWrapper.wrap(child, account).manifest()),
-                        child.address,
-                    ];
-                })));
+                const children = yield Promise.all((yield node.resolve()).map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () { return [yield child.manifest(), child.address]; })));
+                console.log(`buildElements: ${JSON.stringify(children[0], null, 2)}`);
                 yield Promise.allSettled((_b = (children !== null && children !== void 0 ? children : [])) === null || _b === void 0 ? void 0 : _b.map(([child, address]) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     try {
                         const newNode = yield CytoscapeElements.buildNode(child, address);

package/dist/cjs/Cytoscape/CytoscapeElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"CytoscapeElements.js","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CytoscapeElements.js","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":";;;;;AAIA,+BAAuC;AAEvC,MAAa,iBAAiB;IAG5B,MAAM,CAAC,SAAS,CAAC,QAA2B,EAAE,OAA0B;QACtE,OAAO;YACL,IAAI,EAAE;gBACJ,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC5C,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACxB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;aACxB;SACF,CAAA;IACH,CAAC;IAED,MAAM,CAAO,aAAa,CAAC,IAAkB;;;YAC3C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;YACnC,IAAI;gBACF,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACnE,MAAM,WAAW,GAAwB,CAAC,WAAW,CAAC,CAAA;gBAEtD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAoC,CAAO,KAAK,EAAE,EAAE,wDAAC,OAAA,CAAC,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA,GAAA,CAAC,CACxH,CAAA;gBACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;gBACrE,MAAM,OAAO,CAAC,UAAU,CACtB,MAAA,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,0CAAE,GAAG,CAAC,CAAO,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE;oBAC/C,IAAI;wBACF,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;wBACjE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBAEzB,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;wBACjE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;qBAC1B;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAA;qBAC3C;gBACH,CAAC,CAAA,CAAC,CACH,CAAA;gBACD,OAAO,WAAW,CAAA;aACnB;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;aACtD;;KACF;IAED,MAAM,CAAC,SAAS,CAAC,QAAwB,EAAE,OAAe;;QACxD,MAAM,SAAS,GAAG,MAAA,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAI,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAClG,OAAO;YACL,IAAI,EAAE;gBACJ,OAAO;gBACP,EAAE,EAAE,SAAS;gBACb,IAAI,EAAE,IAAA,qBAAe,EAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;aAC9C;SACF,CAAA;IACH,CAAC;IAOD,MAAM,CAAC,aAAa,CAAC,IAAa;QAChC,IAAI,CAAC,IAAI;YAAE,OAAM;QACjB,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa;YAAE,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAA;QAC1E,OAAO,IAAI,CAAA;IACb,CAAC;;AA9DH,8CA+DC;;AA9DQ,+BAAa,GAAG,EAAE,CAAA;AAoDlB,+BAAa,GAAG,CAAO,IAAkB,EAAgD,EAAE;IAChG,MAAM,QAAQ,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,CAAA,CAAA;IACvC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;AACxE,CAAC,CAAA,CAAA"}

package/dist/cjs/components/ProvidedNodeRenderer.js

@@ -4,14 +4,12 @@ exports.ProvidedNodeRenderer = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_node_1 = require("@xyo-network/react-node");
-const react_wallet_1 = require("@xyo-network/react-wallet");
 const hooks_1 = require("../hooks");
 const RelationalGraph_1 = require("./RelationalGraph");
 const ProvidedNodeRenderer = (_a) => {
-    var { node, account } = _a, props = tslib_1.__rest(_a, ["node", "account"]);
+    var { node } = _a, props = tslib_1.__rest(_a, ["node"]);
     const [providedNode] = (0, react_node_1.useProvidedNode)();
-    const [wallet] = (0, react_wallet_1.useWallet)();
-    const elements = (0, hooks_1.useCytoscapeElements)(node !== null && node !== void 0 ? node : providedNode, account !== null && account !== void 0 ? account : wallet);
+    const elements = (0, hooks_1.useCytoscapeElements)(node !== null && node !== void 0 ? node : providedNode);
     const options = (0, hooks_1.useCytoscapeOptions)(elements);
     return (0, jsx_runtime_1.jsx)(RelationalGraph_1.NodeRelationalGraph, Object.assign({ alignItems: "stretch", flexGrow: 1, height: "100%", options: options }, props));
 };

package/dist/cjs/components/ProvidedNodeRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProvidedNodeRenderer.js","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";;;;;AAEA,wDAAyD;AACzD,4DAAqD;AAErD,oCAAoE;AAEpE,uDAAuD;AAOhD,MAAM,oBAAoB,GAAwC,CAAC,EAA2B,EAAE,EAAE;QAA/B,EAAE,IAAI,EAAE,OAAO,OAAY,EAAP,KAAK,sBAAzB,mBAA2B,CAAF;IACjG,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,4BAAe,GAAE,CAAA;IACxC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,wBAAS,GAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,IAAA,4BAAoB,EAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,YAAY,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,MAAM,CAAC,CAAA;IAC9E,MAAM,OAAO,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAA;IAE7C,OAAO,uBAAC,qCAAmB,kBAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,IAAM,KAAK,EAAI,CAAA;AAC7G,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC"}
+{"version":3,"file":"ProvidedNodeRenderer.js","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";;;;;AAEA,wDAAyD;AAEzD,oCAAoE;AAEpE,uDAAuD;AAOhD,MAAM,oBAAoB,GAAwC,CAAC,EAAkB,EAAE,EAAE;QAAtB,EAAE,IAAI,OAAY,EAAP,KAAK,sBAAhB,QAAkB,CAAF;IACxF,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,4BAAe,GAAE,CAAA;IACxC,MAAM,QAAQ,GAAG,IAAA,4BAAoB,EAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,YAAY,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAA;IAE7C,OAAO,uBAAC,qCAAmB,kBAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,IAAM,KAAK,EAAI,CAAA;AAC7G,CAAC,CAAA;AANY,QAAA,oBAAoB,wBAMhC"}

package/dist/cjs/hooks/cytoscape/useCytoscapeElements.js

@@ -9,29 +9,29 @@ const Cytoscape_1 = require("../../Cytoscape");
  * Note: Relies on describe but could eventually be converted to a discover call
  * Logic would be similar to what the bridge does
  */
-const useCytoscapeElements = (targetNode, account) => {
+const useCytoscapeElements = (targetNode) => {
     const [elements, setElements] = (0, react_1.useState)([]);
     (0, react_async_effect_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if (targetNode && account) {
-            const newElements = (_a = (yield Cytoscape_1.CytoscapeElements.buildElements(targetNode, account))) !== null && _a !== void 0 ? _a : [];
+        if (targetNode) {
+            const newElements = (_a = (yield Cytoscape_1.CytoscapeElements.buildElements(targetNode))) !== null && _a !== void 0 ? _a : [];
             setElements(newElements);
         }
     }), [targetNode]);
     (0, react_1.useEffect)(() => {
         let attachedListener = undefined;
         let detachedListener = undefined;
-        if (targetNode && account) {
+        if (targetNode) {
             attachedListener = targetNode.on('moduleAttached', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 var _a;
-                const newElements = (_a = (yield Cytoscape_1.CytoscapeElements.buildElements(targetNode, account))) !== null && _a !== void 0 ? _a : [];
+                const newElements = (_a = (yield Cytoscape_1.CytoscapeElements.buildElements(targetNode))) !== null && _a !== void 0 ? _a : [];
                 setElements(newElements);
             }));
             detachedListener = targetNode.on('moduleDetached', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 var _b;
-                const newElements = (_b = (yield Cytoscape_1.CytoscapeElements.buildElements(targetNode, account))) !== null && _b !== void 0 ? _b : [];
+                const newElements = (_b = (yield Cytoscape_1.CytoscapeElements.buildElements(targetNode))) !== null && _b !== void 0 ? _b : [];
                 setElements(newElements);
             }));
         }

package/dist/cjs/hooks/cytoscape/useCytoscapeElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":";;;;AAAA,mEAA2D;AAK3D,iCAA2C;AAE3C,+CAAmD;AAEnD;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAC,UAA2C,EAAE,OAA4C,EAAE,EAAE;IAChI,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAsB,EAAE,CAAC,CAAA;IAEjE,IAAA,mCAAc;IACZ,uDAAuD;IACvD,GAAS,EAAE;;QACT,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YACtF,WAAW,CAAC,WAAW,CAAC,CAAA;SACzB;IACH,CAAC,CAAA,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QACtE,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QAEtE,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAS,EAAE;;gBAC5D,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;gBACtF,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAA,CAAC,CAAA;YACF,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAS,EAAE;;gBAC5D,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;gBACtF,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAA,CAAC,CAAA;SACH;QAED,OAAO,GAAG,EAAE;YACV,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,EAAI,CAAA;YACpB,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,EAAI,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AApCY,QAAA,oBAAoB,wBAoChC"}
+{"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":";;;;AAAA,mEAA2D;AAI3D,iCAA2C;AAE3C,+CAAmD;AAEnD;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAC,UAA2C,EAAE,EAAE;IAClF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAsB,EAAE,CAAC,CAAA;IAEjE,IAAA,mCAAc;IACZ,uDAAuD;IACvD,GAAS,EAAE;;QACT,IAAI,UAAU,EAAE;YACd,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;SACzB;IACH,CAAC,CAAA,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QACtE,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QAEtE,IAAI,UAAU,EAAE;YACd,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAS,EAAE;;gBAC5D,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,mCAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAA,CAAC,CAAA;YACF,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAS,EAAE;;gBAC5D,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,mCAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAA,CAAC,CAAA;SACH;QAED,OAAO,GAAG,EAAE;YACV,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,EAAI,CAAA;YACpB,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,EAAI,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AApCY,QAAA,oBAAoB,wBAoChC"}

package/dist/esm/Cytoscape/CytoscapeElements.js

@@ -1,4 +1,3 @@
-import { isModuleInstance, ModuleWrapper } from '@xyo-network/module';
 import { parseModuleType } from './lib';
 export class CytoscapeElements {
     static MaxNameLength = 20;
@@ -11,14 +10,13 @@ export class CytoscapeElements {
             },
         };
     }
-    static async buildElements(node, account) {
+    static async buildElements(node) {
+        console.log('buildElements: Start');
         try {
             const [, newRootNode] = await CytoscapeElements.buildRootNode(node);
             const newElements = [newRootNode];
-            const children = await Promise.all((await node.resolve()).map(async (child) => [
-                await (isModuleInstance(child) ? child.manifest() : ModuleWrapper.wrap(child, account).manifest()),
-                child.address,
-            ]));
+            const children = await Promise.all((await node.resolve()).map(async (child) => [await child.manifest(), child.address]));
+            console.log(`buildElements: ${JSON.stringify(children[0], null, 2)}`);
             await Promise.allSettled((children ?? [])?.map(async ([child, address]) => {
                 try {
                     const newNode = await CytoscapeElements.buildNode(child, address);

package/dist/esm/Cytoscape/CytoscapeElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"CytoscapeElements.js","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CytoscapeElements.js","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"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"}

package/dist/esm/components/ProvidedNodeRenderer.js

@@ -1,12 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useProvidedNode } from '@xyo-network/react-node';
-import { useWallet } from '@xyo-network/react-wallet';
 import { useCytoscapeElements, useCytoscapeOptions } from '../hooks';
 import { NodeRelationalGraph } from './RelationalGraph';
-export const ProvidedNodeRenderer = ({ node, account, ...props }) => {
+export const ProvidedNodeRenderer = ({ node, ...props }) => {
     const [providedNode] = useProvidedNode();
-    const [wallet] = useWallet();
-    const elements = useCytoscapeElements(node ?? providedNode, account ?? wallet);
+    const elements = useCytoscapeElements(node ?? providedNode);
     const options = useCytoscapeOptions(elements);
     return _jsx(NodeRelationalGraph, { alignItems: "stretch", flexGrow: 1, height: "100%", options: options, ...props });
 };

package/dist/esm/components/ProvidedNodeRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProvidedNodeRenderer.js","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAEpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAOvD,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACvG,MAAM,CAAC,YAAY,CAAC,GAAG,eAAe,EAAE,CAAA;IACxC,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,IAAI,YAAY,EAAE,OAAO,IAAI,MAAM,CAAC,CAAA;IAC9E,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAE7C,OAAO,KAAC,mBAAmB,IAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,KAAM,KAAK,GAAI,CAAA;AAC7G,CAAC,CAAA"}
+{"version":3,"file":"ProvidedNodeRenderer.js","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAEpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAOvD,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,CAAC,YAAY,CAAC,GAAG,eAAe,EAAE,CAAA;IACxC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,IAAI,YAAY,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAE7C,OAAO,KAAC,mBAAmB,IAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,KAAM,KAAK,GAAI,CAAA;AAC7G,CAAC,CAAA"}

package/dist/esm/hooks/cytoscape/useCytoscapeElements.js

@@ -5,26 +5,26 @@ import { CytoscapeElements } from '../../Cytoscape';
  * Note: Relies on describe but could eventually be converted to a discover call
  * Logic would be similar to what the bridge does
  */
-export const useCytoscapeElements = (targetNode, account) => {
+export const useCytoscapeElements = (targetNode) => {
     const [elements, setElements] = useState([]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async () => {
-        if (targetNode && account) {
-            const newElements = (await CytoscapeElements.buildElements(targetNode, account)) ?? [];
+        if (targetNode) {
+            const newElements = (await CytoscapeElements.buildElements(targetNode)) ?? [];
             setElements(newElements);
         }
     }, [targetNode]);
     useEffect(() => {
         let attachedListener = undefined;
         let detachedListener = undefined;
-        if (targetNode && account) {
+        if (targetNode) {
             attachedListener = targetNode.on('moduleAttached', async () => {
-                const newElements = (await CytoscapeElements.buildElements(targetNode, account)) ?? [];
+                const newElements = (await CytoscapeElements.buildElements(targetNode)) ?? [];
                 setElements(newElements);
             });
             detachedListener = targetNode.on('moduleDetached', async () => {
-                const newElements = (await CytoscapeElements.buildElements(targetNode, account)) ?? [];
+                const newElements = (await CytoscapeElements.buildElements(targetNode)) ?? [];
                 setElements(newElements);
             });
         }

package/dist/esm/hooks/cytoscape/useCytoscapeElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAK3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAA2C,EAAE,OAA4C,EAAE,EAAE;IAChI,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAsB,EAAE,CAAC,CAAA;IAEjE,cAAc;IACZ,uDAAuD;IACvD,KAAK,IAAI,EAAE;QACT,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;YACtF,WAAW,CAAC,WAAW,CAAC,CAAA;SACzB;IACH,CAAC,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QACtE,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QAEtE,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;gBACtF,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YACF,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;gBACtF,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;SACH;QAED,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,EAAE,CAAA;YACpB,gBAAgB,EAAE,EAAE,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
+{"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAI3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAA2C,EAAE,EAAE;IAClF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAsB,EAAE,CAAC,CAAA;IAEjE,cAAc;IACZ,uDAAuD;IACvD,KAAK,IAAI,EAAE;QACT,IAAI,UAAU,EAAE;YACd,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;SACzB;IACH,CAAC,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QACtE,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QAEtE,IAAI,UAAU,EAAE;YACd,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YACF,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;SACH;QAED,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,EAAE,CAAA;YACpB,gBAAgB,EAAE,EAAE,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}

package/dist/types/Cytoscape/CytoscapeElements.d.ts

@@ -1,4 +1,3 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { ModuleManifest } from '@xyo-network/manifest-model';
 import { NodeInstance } from '@xyo-network/node';
 import { ElementDefinition } from 'cytoscape';
@@ -11,7 +10,7 @@ export declare class CytoscapeElements {
             target: string | undefined;
         };
     };
-    static buildElements(node: NodeInstance, account: AccountInstance): Promise<ElementDefinition[] | undefined>;
+    static buildElements(node: NodeInstance): Promise<ElementDefinition[] | undefined>;
     static buildNode(manifest: ModuleManifest, address: string): ElementDefinition;
     static buildRootNode: (node: NodeInstance) => Promise<[ModuleManifest, ElementDefinition]>;
     static normalizeName(name?: string): string | undefined;

package/dist/types/Cytoscape/CytoscapeElements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CytoscapeElements.d.ts","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAI7C,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,aAAa,SAAK;IAEzB,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB;;;;;;;WAU3D,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe;IA8BvE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB;IAW9E,MAAM,CAAC,aAAa,SAAgB,YAAY,KAAG,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAG9F;IAED,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM;CAKnC"}
+{"version":3,"file":"CytoscapeElements.d.ts","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAI7C,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,aAAa,SAAK;IAEzB,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB;;;;;;;WAU3D,aAAa,CAAC,IAAI,EAAE,YAAY;IA6B7C,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB;IAW9E,MAAM,CAAC,aAAa,SAAgB,YAAY,KAAG,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAG9F;IAED,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM;CAKnC"}

package/dist/types/components/ProvidedNodeRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProvidedNodeRenderer.d.ts","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAA;AAGhD,MAAM,WAAW,yBAA0B,SAAQ,wBAAwB;IACzE,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,IAAI,CAAC,EAAE,YAAY,CAAA;CACpB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAOpE,CAAA"}
+{"version":3,"file":"ProvidedNodeRenderer.d.ts","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAA;AAGhD,MAAM,WAAW,yBAA0B,SAAQ,wBAAwB;IACzE,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,IAAI,CAAC,EAAE,YAAY,CAAA;CACpB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAMpE,CAAA"}

package/dist/types/hooks/cytoscape/useCytoscapeElements.d.ts

@@ -1,9 +1,8 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { NodeInstance } from '@xyo-network/node';
 import { ElementDefinition } from 'cytoscape';
 /**
  * Note: Relies on describe but could eventually be converted to a discover call
  * Logic would be similar to what the bridge does
  */
-export declare const useCytoscapeElements: (targetNode: NodeInstance | undefined | null, account?: AccountInstance | undefined | null) => ElementDefinition[];
+export declare const useCytoscapeElements: (targetNode: NodeInstance | undefined | null) => ElementDefinition[];
 //# sourceMappingURL=useCytoscapeElements.d.ts.map

package/dist/types/hooks/cytoscape/useCytoscapeElements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCytoscapeElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAK7C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,eAAgB,YAAY,GAAG,SAAS,GAAG,IAAI,YAAY,eAAe,GAAG,SAAS,GAAG,IAAI,wBAoC7H,CAAA"}
+{"version":3,"file":"useCytoscapeElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAK7C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,eAAgB,YAAY,GAAG,SAAS,GAAG,IAAI,wBAoC/E,CAAA"}

package/package.json

@@ -13,16 +13,16 @@
     "@xylabs/react-async-effect": "~2.17.6",
     "@xylabs/react-flexbox": "~2.17.6",
     "@xylabs/react-shared": "~2.17.6",
-    "@xyo-network/account-model": "^2.67.0-rc.2",
-    "@xyo-network/archivist-model": "^2.67.0-rc.2",
-    "@xyo-network/diviner-model": "^2.67.0-rc.2",
-    "@xyo-network/manifest-model": "^2.67.0-rc.2",
-    "@xyo-network/module": "^2.67.0-rc.2",
-    "@xyo-network/node": "^2.67.0-rc.2",
-    "@xyo-network/react-archivist": "~2.58.0-rc.2",
-    "@xyo-network/react-module": "~2.58.0-rc.2",
-    "@xyo-network/react-node": "~2.58.0-rc.2",
-    "@xyo-network/react-shared": "~2.58.0-rc.2",
+    "@xyo-network/account-model": "^2.67.0-rc.4",
+    "@xyo-network/archivist-model": "^2.67.0-rc.4",
+    "@xyo-network/diviner-model": "^2.67.0-rc.4",
+    "@xyo-network/manifest-model": "^2.67.0-rc.4",
+    "@xyo-network/module": "^2.67.0-rc.4",
+    "@xyo-network/node": "^2.67.0-rc.4",
+    "@xyo-network/react-archivist": "~2.58.0-rc.3",
+    "@xyo-network/react-module": "~2.58.0-rc.3",
+    "@xyo-network/react-node": "~2.58.0-rc.3",
+    "@xyo-network/react-shared": "~2.58.0-rc.3",
     "cytoscape": "^3.25.0"
   },
   "peerDependencies": {
@@ -40,15 +40,15 @@
     "@types/react-dom": "^18.2.7",
     "@xylabs/ts-scripts-yarn3": "^2.19.0",
     "@xylabs/tsconfig-react": "^2.19.0",
-    "@xyo-network/archivist": "^2.67.0-rc.2",
-    "@xyo-network/http-bridge": "^2.67.0-rc.2",
-    "@xyo-network/id-plugin": "^2.67.0-rc.2",
-    "@xyo-network/module": "^2.67.0-rc.2",
-    "@xyo-network/node": "^2.67.0-rc.2",
-    "@xyo-network/react-node": "~2.58.0-rc.2",
-    "@xyo-network/react-storybook": "~2.58.0-rc.2",
-    "@xyo-network/react-wallet": "~2.58.0-rc.2",
-    "@xyo-network/sentinel": "^2.67.0-rc.2",
+    "@xyo-network/archivist": "^2.67.0-rc.4",
+    "@xyo-network/http-bridge": "^2.67.0-rc.4",
+    "@xyo-network/id-plugin": "^2.67.0-rc.4",
+    "@xyo-network/module": "^2.67.0-rc.4",
+    "@xyo-network/node": "^2.67.0-rc.4",
+    "@xyo-network/react-node": "~2.58.0-rc.3",
+    "@xyo-network/react-storybook": "~2.58.0-rc.3",
+    "@xyo-network/react-wallet": "~2.58.0-rc.3",
+    "@xyo-network/sentinel": "^2.67.0-rc.4",
     "typescript": "^5.1.6"
   },
   "description": "Common React library for all XYO projects that use React",
@@ -94,6 +94,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.58.0-rc.2",
+  "version": "2.58.0-rc.3",
   "stableVersion": "2.57.7"
 }

package/src/Cytoscape/CytoscapeElements.ts

@@ -1,6 +1,4 @@
-import { AccountInstance } from '@xyo-network/account-model'
 import { ModuleManifest } from '@xyo-network/manifest-model'
-import { isModuleInstance, ModuleWrapper } from '@xyo-network/module'
 import { NodeInstance } from '@xyo-network/node'
 import { ElementDefinition } from 'cytoscape'
 
@@ -19,17 +17,16 @@ export class CytoscapeElements {
     }
   }
 
-  static async buildElements(node: NodeInstance, account: AccountInstance) {
+  static async buildElements(node: NodeInstance) {
+    console.log('buildElements: Start')
     try {
       const [, newRootNode] = await CytoscapeElements.buildRootNode(node)
       const newElements: ElementDefinition[] = [newRootNode]
 
       const children = await Promise.all(
-        (await node.resolve()).map<Promise<[ModuleManifest, string]>>(async (child) => [
-          await (isModuleInstance(child) ? child.manifest() : ModuleWrapper.wrap(child, account).manifest()),
-          child.address,
-        ]),
+        (await node.resolve()).map<Promise<[ModuleManifest, string]>>(async (child) => [await child.manifest(), child.address]),
       )
+      console.log(`buildElements: ${JSON.stringify(children[0], null, 2)}`)
       await Promise.allSettled(
         (children ?? [])?.map(async ([child, address]) => {
           try {

package/src/components/ProvidedNodeRenderer.tsx

@@ -1,7 +1,6 @@
 import { AccountInstance } from '@xyo-network/account-model'
 import { NodeInstance } from '@xyo-network/node'
 import { useProvidedNode } from '@xyo-network/react-node'
-import { useWallet } from '@xyo-network/react-wallet'
 
 import { useCytoscapeElements, useCytoscapeOptions } from '../hooks'
 import { NodeRelationalGraphProps } from './lib'
@@ -12,10 +11,9 @@ export interface ProvidedNodeRendererProps extends NodeRelationalGraphProps {
   node?: NodeInstance
 }
 
-export const ProvidedNodeRenderer: React.FC<ProvidedNodeRendererProps> = ({ node, account, ...props }) => {
+export const ProvidedNodeRenderer: React.FC<ProvidedNodeRendererProps> = ({ node, ...props }) => {
   const [providedNode] = useProvidedNode()
-  const [wallet] = useWallet()
-  const elements = useCytoscapeElements(node ?? providedNode, account ?? wallet)
+  const elements = useCytoscapeElements(node ?? providedNode)
   const options = useCytoscapeOptions(elements)
 
   return <NodeRelationalGraph alignItems="stretch" flexGrow={1} height="100%" options={options} {...props} />

package/src/hooks/cytoscape/useCytoscapeElements.ts

@@ -1,5 +1,4 @@
 import { useAsyncEffect } from '@xylabs/react-async-effect'
-import { AccountInstance } from '@xyo-network/account-model'
 import { EventUnsubscribeFunction } from '@xyo-network/module'
 import { NodeInstance } from '@xyo-network/node'
 import { ElementDefinition } from 'cytoscape'
@@ -11,14 +10,14 @@ import { CytoscapeElements } from '../../Cytoscape'
  * Note: Relies on describe but could eventually be converted to a discover call
  * Logic would be similar to what the bridge does
  */
-export const useCytoscapeElements = (targetNode: NodeInstance | undefined | null, account?: AccountInstance | undefined | null) => {
+export const useCytoscapeElements = (targetNode: NodeInstance | undefined | null) => {
   const [elements, setElements] = useState<ElementDefinition[]>([])
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async () => {
-      if (targetNode && account) {
-        const newElements = (await CytoscapeElements.buildElements(targetNode, account)) ?? []
+      if (targetNode) {
+        const newElements = (await CytoscapeElements.buildElements(targetNode)) ?? []
         setElements(newElements)
       }
     },
@@ -29,13 +28,13 @@ export const useCytoscapeElements = (targetNode: NodeInstance | undefined | null
     let attachedListener: EventUnsubscribeFunction | undefined = undefined
     let detachedListener: EventUnsubscribeFunction | undefined = undefined
 
-    if (targetNode && account) {
+    if (targetNode) {
       attachedListener = targetNode.on('moduleAttached', async () => {
-        const newElements = (await CytoscapeElements.buildElements(targetNode, account)) ?? []
+        const newElements = (await CytoscapeElements.buildElements(targetNode)) ?? []
         setElements(newElements)
       })
       detachedListener = targetNode.on('moduleDetached', async () => {
-        const newElements = (await CytoscapeElements.buildElements(targetNode, account)) ?? []
+        const newElements = (await CytoscapeElements.buildElements(targetNode)) ?? []
         setElements(newElements)
       })
     }