Update providers

src/core/providers-strategy/CrossWindowProviderStrategy.ts

@@ -1,8 +1,5 @@
 import { isBrowserWithPopupConfirmation } from 'constants/browser.constants';
-import {
-  IProvider,
-  ProviderTypeEnum
-} from 'core/providers/types/providerFactory.types';
+import { IProvider } from 'core/providers/types/providerFactory.types';
 import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 import { networkSelector } from 'store/selectors/networkSelectors';
 import { getState } from 'store/store';
@@ -47,12 +44,7 @@ export class CrossWindowProviderStrategy {
 
   private buildProvider = () => {
     const provider = this.provider as unknown as IProvider;
-    provider.getType = this.getType;
 
     return provider;
   };
-
-  private getType = (): ProviderTypeEnum.crossWindow => {
-    return ProviderTypeEnum.crossWindow;
-  };
 }

src/core/providers-strategy/CustomProviderStrategy.ts

@@ -10,11 +10,15 @@ export class CustomProviderStrategy {
   private type: string = '';
   private config: IProviderConfig = {};
 
-  constructor(
-    type: string,
-    customProvider: ICustomProvider<ProviderTypeEnum>,
-    config: IProviderConfig
-  ) {
+  constructor({
+    type,
+    customProvider,
+    config
+  }: {
+    type: string;
+    customProvider: ICustomProvider<ProviderTypeEnum>;
+    config: IProviderConfig;
+  }) {
     this.type = type;
     this.provider = customProvider;
     this.config = config;
@@ -37,12 +41,6 @@ export class CustomProviderStrategy {
       throw new Error('Provider is not initialized');
     }
 
-    provider.getType = this.getType;
-
     return provider;
   };
-
-  private getType = () => {
-    return this.type;
-  };
 }

src/core/providers-strategy/ExtensionProviderStrategy.ts

@@ -1,8 +1,5 @@
 import { ExtensionProvider } from '@multiversx/sdk-extension-provider/out/extensionProvider';
-import {
-  IProvider,
-  ProviderTypeEnum
-} from 'core/providers/types/providerFactory.types';
+import { IProvider } from 'core/providers/types/providerFactory.types';
 
 export class ExtensionProviderStrategy {
   private provider: ExtensionProvider | null = null;
@@ -18,12 +15,7 @@ export class ExtensionProviderStrategy {
 
   private buildProvider = () => {
     const provider = this.provider as unknown as IProvider;
-    provider.getType = this.getType;
 
     return provider;
   };
-
-  private getType = (): ProviderTypeEnum.extension => {
-    return ProviderTypeEnum.extension;
-  };
 }

src/core/providers-strategy/IFrameProviderStrategy.ts

@@ -1,9 +1,6 @@
 import { IframeProvider } from '@multiversx/sdk-web-wallet-iframe-provider/out';
 import { IframeLoginTypes } from '@multiversx/sdk-web-wallet-iframe-provider/out/constants';
-import {
-  IProvider,
-  ProviderTypeEnum
-} from 'core/providers/types/providerFactory.types';
+import { IProvider } from 'core/providers/types/providerFactory.types';
 import { networkSelector } from 'store/selectors/networkSelectors';
 import { getState } from 'store/store';
 
@@ -33,25 +30,11 @@ export class IFrameProviderStrategy {
 
   private buildProvider = () => {
     const provider = this.provider as unknown as IProvider;
-    provider.getType = this.getType;
 
     if (this.address) {
       provider.setAccount({ address: this.address });
     }
 
     return provider;
   };
-
-  private getType = ():
-    | ProviderTypeEnum.metamask
-    | ProviderTypeEnum.passkey => {
-    switch (this.type) {
-      case IframeLoginTypes.metamask:
-        return ProviderTypeEnum.metamask;
-      case IframeLoginTypes.passkey:
-        return ProviderTypeEnum.passkey;
-      default:
-        throw new Error(`Unsupported type: ${this.type}`);
-    }
-  };
 }

src/core/providers-strategy/WalletConnectProviderStrategy.ts

@@ -14,8 +14,7 @@ import { WalletConnectStateManager } from 'core/providers/helpers/walletConnect/
 import {
   IEventBus,
   IProvider,
-  IProviderConfig,
-  ProviderTypeEnum
+  IProviderConfig
 } from 'core/providers/types/providerFactory.types';
 import { defineCustomElements, WalletConnectModal } from 'lib/sdkDappCoreUi';
 import { logoutAction } from 'store/actions';
@@ -82,7 +81,6 @@ export class WalletConnectProviderStrategy {
 
   private buildProvider = () => {
     const provider = { ...this.provider } as unknown as IProvider;
-    provider.getType = this.getType;
     provider.login = this.login;
     provider.logout = this.logout;
 
@@ -91,7 +89,7 @@ export class WalletConnectProviderStrategy {
 
   private validateConfig = () => {
     if (!this.config?.walletConnectV2ProjectId) {
-      throw new Error('Invalid walletConnect config');
+      throw new Error(WalletConnectV2Error.invalidConfig);
     }
   };
 
@@ -178,10 +176,6 @@ export class WalletConnectProviderStrategy {
     }
   };
 
-  private getType = (): ProviderTypeEnum.walletConnect => {
-    return ProviderTypeEnum.walletConnect;
-  };
-
   private login = async (options?: {
     callbackUrl?: string;
     token?: string;

src/core/providers/ProviderFactory.ts

@@ -108,11 +108,11 @@ export class ProviderFactory {
 
       default: {
         for (const customProvider of this._customProviders) {
-          const providerInstance = new CustomProviderStrategy(
-            type as string,
+          const providerInstance = new CustomProviderStrategy({
+            type: type as ProviderTypeEnum,
             customProvider,
             config
-          );
+          });
 
           createdProvider = await providerInstance.createProvider();
         }
@@ -124,6 +124,7 @@ export class ProviderFactory {
       throw new Error('Unable to create provider');
     }
 
+    createdProvider.getType = () => type;
     const dappProvider = new DappProvider(createdProvider);
 
     setAccountProvider(dappProvider);