Update createModalElement func

multiversx · Dec 19, 2024 · 6601d3e · 6601d3e
1 parent a5a44e1
commit 6601d3e
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 68 deletions.
diff --git a/src/core/providers/strategies/CrossWindowProviderStrategy/CrossWindowProviderStrategy.ts b/src/core/providers/strategies/CrossWindowProviderStrategy/CrossWindowProviderStrategy.ts
@@ -89,10 +89,10 @@ export class CrossWindowProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);
@@ -138,10 +138,10 @@ export class CrossWindowProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);

diff --git a/src/core/providers/strategies/ExtensionProviderStrategy/ExtensionProviderStrategy.ts b/src/core/providers/strategies/ExtensionProviderStrategy/ExtensionProviderStrategy.ts
@@ -72,10 +72,10 @@ export class ExtensionProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);
@@ -117,10 +117,10 @@ export class ExtensionProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);

diff --git a/src/core/providers/strategies/IFrameProviderStrategy/IFrameProviderStrategy.ts b/src/core/providers/strategies/IFrameProviderStrategy/IFrameProviderStrategy.ts
@@ -84,10 +84,10 @@ export class IFrameProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);
@@ -129,10 +129,10 @@ export class IFrameProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);

diff --git a/src/core/providers/strategies/LedgerProviderStrategy/LedgerProviderStrategy.ts b/src/core/providers/strategies/LedgerProviderStrategy/LedgerProviderStrategy.ts
@@ -149,29 +149,27 @@ export class LedgerProviderStrategy {
       return;
     }
 
-    const { eventBus: modalEventBus } =
-      await createModalElement<LedgerConnectModal>({
-        name: 'ledger-connect-modal',
-        withEventBus: true
-      });
+    const modalElement = await createModalElement<LedgerConnectModal>(
+      'ledger-connect-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
-    if (!modalEventBus) {
-      throw new Error('Event bus not provided for Ledger provider');
+    if (!eventBus) {
+      throw new Error(ProviderErrorsEnum.eventBusError);
     }
 
-    this.eventBus = modalEventBus;
-    return modalEventBus;
+    this.eventBus = eventBus;
+    return eventBus;
   };
 
   private signTransactions = async (transactions: Transaction[]) => {
-    const { modalElement: signModalElement, eventBus } =
-      await createModalElement<SignTransactionsModal>({
-        name: 'sign-transactions-modal',
-        withEventBus: true
-      });
+    const signModalElement = await createModalElement<SignTransactionsModal>(
+      'sign-transactions-modal'
+    );
+    const eventBus = await signModalElement.getEventBus();
 
     if (!eventBus) {
-      throw new Error('Event bus not provided for Ledger provider');
+      throw new Error(ProviderErrorsEnum.eventBusError);
     }
 
     const manager = SignTransactionsStateManager.getInstance(eventBus);

diff --git a/src/core/providers/strategies/WalletConnectProviderStrategy/WalletConnectProviderStrategy.ts b/src/core/providers/strategies/WalletConnectProviderStrategy/WalletConnectProviderStrategy.ts
@@ -160,11 +160,11 @@ export class WalletConnectProviderStrategy {
       return;
     }
 
-    const { eventBus } = await createModalElement<WalletConnectModal>({
-      name: 'wallet-connect-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<WalletConnectModal>(
+      'wallet-connect-modal'
+    );
 
+    const eventBus = await modalElement.getEventBus();
     return eventBus;
   };
 
@@ -305,10 +305,10 @@ export class WalletConnectProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);
@@ -356,10 +356,10 @@ export class WalletConnectProviderStrategy {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
-    const { eventBus } = await createModalElement<PendingTransactionsModal>({
-      name: 'pending-transactions-modal',
-      withEventBus: true
-    });
+    const modalElement = await createModalElement<PendingTransactionsModal>(
+      'pending-transactions-modal'
+    );
+    const eventBus = await modalElement.getEventBus();
 
     if (!eventBus) {
       throw new Error(ProviderErrorsEnum.eventBusError);

diff --git a/src/utils/createModalElement.ts b/src/utils/createModalElement.ts
@@ -2,32 +2,26 @@ import { IEventBus } from '@multiversx/sdk-dapp-core-ui/loader';
 import { safeWindow } from 'constants/index';
 import { defineCustomElements } from 'lib/sdkDappCoreUi';
 
-type CreateModalElementType = {
-  name: string;
-  withEventBus?: boolean;
-};
-
 export const createModalElement = async <
   T extends HTMLElement & { getEventBus: () => Promise<IEventBus | undefined> }
->({
-  name,
-  withEventBus = false
-}: CreateModalElementType) => {
-  let eventBus: IEventBus | undefined;
+>(
+  name: string
+) => {
+  // let eventBus: IEventBus | undefined;
 
   await defineCustomElements(safeWindow);
 
   const modalElement = document.createElement(name) as T;
   document.body.appendChild(modalElement);
   await customElements.whenDefined(name);
 
-  if (withEventBus) {
-    eventBus = await modalElement.getEventBus();
+  // if (withEventBus) {
+  //   eventBus = await modalElement.getEventBus();
 
-    if (!eventBus) {
-      throw new Error(`Event bus not provided for ${name}.`);
-    }
-  }
+  //   if (!eventBus) {
+  //     throw new Error(`Event bus not provided for ${name}.`);
+  //   }
+  // }
 
-  return { modalElement, eventBus };
+  return modalElement;
 };