Project building

multiversx · Dec 5, 2024 · ed1ea42 · ed1ea42
1 parent 1966b1b
commit ed1ea42
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/src/core/providers/ProviderFactory.ts b/src/core/providers/ProviderFactory.ts
@@ -112,7 +112,7 @@ export class ProviderFactory {
 
       default: {
         this._customProviders.forEach(async (customProvider) => {
-          if (customProvider.name !== type) {
+          if (customProvider.type === type) {
             createdProvider = await customProvider.constructor(config);
             createdProvider.getType = () => type;
           }
@@ -128,7 +128,7 @@ export class ProviderFactory {
     const dappProvider = new DappProvider(createdProvider);
 
     setAccountProvider(dappProvider);
-    setProviderType(type);
+    setProviderType(type as ProviderTypeEnum);
 
     return dappProvider;
   }

diff --git a/src/core/providers/types/providerFactory.types.ts b/src/core/providers/types/providerFactory.types.ts
@@ -13,7 +13,7 @@ export interface IProvider<T extends ProviderTypeEnum = ProviderTypeEnum>
   }>;
   logout: () => Promise<boolean>;
   setShouldShowConsentPopup?: (shouldShow: boolean) => void;
-  getType: () => T;
+  getType: () => T[keyof T] | string;
   getAddress(): Promise<string | undefined>;
   // TODO will be removed as soon as the new login method is implemented in the same way for all providers
   getTokenLoginSignature(): string | undefined;
@@ -52,8 +52,10 @@ export enum ProviderTypeEnum {
   none = ''
 }
 
-export interface IProviderFactory {
-  type: ProviderTypeEnum;
+export interface IProviderFactory<
+  T extends ProviderTypeEnum = ProviderTypeEnum
+> {
+  type: T[keyof T];
   config?: IProviderConfig;
 }
 

diff --git a/src/store/actions/loginInfo/loginInfoActions.ts b/src/store/actions/loginInfo/loginInfoActions.ts
@@ -7,7 +7,9 @@ import {
 import { getStore } from 'store/store';
 import { TokenLoginType } from 'types/login.types';
 
-export const setProviderType = (providerType: ProviderTypeEnum) =>
+export const setProviderType = <T extends ProviderTypeEnum = ProviderTypeEnum>(
+  providerType: T
+) =>
   getStore().setState(({ loginInfo: state }) => {
     state.providerType = providerType;
   });

diff --git a/src/store/actions/sharedActions/sharedActions.ts b/src/store/actions/sharedActions/sharedActions.ts
@@ -4,9 +4,11 @@ import { resetStore } from 'store/middleware/logoutMiddleware';
 import { getStore } from '../../store';
 
 export const logoutAction = () => getStore().setState(resetStore);
-export interface LoginActionPayloadType {
+export interface LoginActionPayloadType<
+  T extends ProviderTypeEnum = ProviderTypeEnum
+> {
   address: string;
-  providerType: ProviderTypeEnum;
+  providerType: T[keyof T];
 }
 
 export const loginAction = ({

diff --git a/src/store/slices/loginInfo/loginInfo.types.ts b/src/store/slices/loginInfo/loginInfo.types.ts
@@ -17,8 +17,10 @@ export interface LoginInfoType {
   expires: number;
 }
 
-export interface LoginInfoSliceType {
-  providerType: ProviderTypeEnum | null;
+export interface LoginInfoSliceType<
+  T extends ProviderTypeEnum = ProviderTypeEnum
+> {
+  providerType: T[keyof T] | null;
   walletConnectLogin: WalletConnectLoginType | null;
   ledgerLogin: LedgerLoginType | null;
   tokenLogin: TokenLoginType | null;