Fix walletConnect persistance

src/core/providers-strategy/CrossWindowProviderStrategy.ts

@@ -46,16 +46,15 @@ export class CrossWindowProviderStrategy {
   };
 
   private buildProvider = () => {
+    const { address } = getAccount();
+
     if (!this.provider) {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
     const provider = this.provider as unknown as IProvider;
 
-    if (this.address) {
-      provider.setAccount({ address: this.address });
-    }
-
+    provider.setAccount({ address: this.address || address });
     provider.signTransactions = this.signTransactions;
     provider.signMessage = this.signMessage;
 

src/core/providers-strategy/IFrameProviderStrategy.ts

@@ -1,5 +1,6 @@
 import { IframeProvider } from '@multiversx/sdk-web-wallet-iframe-provider/out';
 import { IframeLoginTypes } from '@multiversx/sdk-web-wallet-iframe-provider/out/constants';
+import { getAccount } from 'core/methods/account/getAccount';
 import { IProvider } from 'core/providers/types/providerFactory.types';
 import { networkSelector } from 'store/selectors/networkSelectors';
 import { getState } from 'store/store';
@@ -38,15 +39,15 @@ export class IFrameProviderStrategy {
   };
 
   private buildProvider = () => {
+    const { address } = getAccount();
+
     if (!this.provider) {
       throw new Error(ProviderErrorsEnum.notInitialized);
     }
 
     const provider = this.provider as unknown as IProvider;
 
-    if (this.address) {
-      provider.setAccount({ address: this.address });
-    }
+    provider.setAccount({ address: this.address || address });
 
     return provider;
   };

src/core/providers-strategy/WalletConnectProviderStrategy.ts

@@ -18,6 +18,7 @@ import {
 } from 'core/providers/types/providerFactory.types';
 import { defineCustomElements, WalletConnectModal } from 'lib/sdkDappCoreUi';
 import { logoutAction } from 'store/actions';
+import { setWalletConnectConfig } from 'store/actions/config/configActions';
 import { chainIdSelector, nativeAuthConfigSelector } from 'store/selectors';
 import { getState } from 'store/store';
 import { ProviderErrorsEnum } from 'types';
@@ -60,8 +61,12 @@ export class WalletConnectProviderStrategy {
 
     const eventBus = await this.createEventBus();
 
-    const manager = WalletConnectStateManager.getInstance(eventBus);
-    this.manager = manager;
+    if (eventBus) {
+      const manager = WalletConnectStateManager.getInstance(eventBus);
+      this.manager = manager;
+
+      setWalletConnectConfig(this.config);
+    }
 
     if (!this.provider) {
       const { walletConnectProvider, dappMethods } =
@@ -74,21 +79,31 @@ export class WalletConnectProviderStrategy {
     }
 
     const onClose = () => {
-      manager.closeAndReset();
+      if (!this.manager) {
+        throw new Error('State manager is not initialized');
+      }
+
+      this.manager.closeAndReset();
     };
 
     this.unsubscribeEvents = () => {
+      if (!eventBus) {
+        throw new Error('Event bus is not initialized');
+      }
+
       eventBus.unsubscribe(WalletConnectEventsEnum.CLOSE, onClose);
     };
 
-    const { uri = '', approval } = await this.provider.connect({
-      methods: this.methods
-    });
+    if (eventBus && this.manager) {
+      const { uri = '', approval } = await this.provider.connect({
+        methods: this.methods
+      });
 
-    this.approval = approval;
-    manager.updateWcURI(uri);
+      this.approval = approval;
+      this.manager.updateWcURI(uri);
 
-    eventBus.subscribe(WalletConnectEventsEnum.CLOSE, onClose);
+      eventBus.subscribe(WalletConnectEventsEnum.CLOSE, onClose);
+    }
 
     return this.buildProvider();
   };
@@ -122,10 +137,10 @@ export class WalletConnectProviderStrategy {
       await customElements.whenDefined('wallet-connect-modal');
 
       eventBus = await walletConnectModalElement.getEventBus();
-    }
 
-    if (!eventBus) {
-      throw new Error('Event bus not provided for WalletConnect provider');
+      if (!eventBus) {
+        throw new Error('Event bus not provided for WalletConnect provider');
+      }
     }
 
     return eventBus;
@@ -150,11 +165,11 @@ export class WalletConnectProviderStrategy {
     const handleOnLogin = () => {};
 
     const handleOnLogout = async () => {
-      if (config.onLogout) {
-        await config.onLogout();
-      }
-
       logoutAction();
+
+      if (config.logoutRoute) {
+        safeWindow.location.replace(config.logoutRoute);
+      }
     };
 
     const handleOnEvent = (_event: SessionEventTypes['event']) => {};

src/core/providers/helpers/restoreProvider.ts

@@ -1,12 +1,17 @@
 import { getAddress } from 'core/methods/account/getAddress';
-import { providerTypeSelector } from 'store/selectors';
+import {
+  walletConnectConfigSelector,
+  providerTypeSelector
+} from 'store/selectors';
 import { getState } from 'store/store';
 import { setAccountProvider } from '../accountProvider';
 import { ProviderFactory } from '../ProviderFactory';
 import { IProviderConfig } from '../types/providerFactory.types';
 
 export async function restoreProvider() {
   const type = providerTypeSelector(getState());
+  const walletConnectConfig = walletConnectConfigSelector(getState());
+
   const address = getAddress();
 
   if (!type) {
@@ -19,6 +24,10 @@ export async function restoreProvider() {
     }
   };
 
+  if (walletConnectConfig) {
+    config.walletConnect = walletConnectConfig;
+  }
+
   const provider = await ProviderFactory.create({
     type,
     config

src/core/providers/types/providerFactory.types.ts

@@ -47,7 +47,7 @@ export interface IProviderConfig {
     walletConnectV2RelayAddress?: string;
     walletConnectV2Options?: WalletConnectV2ProviderOptionsType;
     customRequestMethods?: Array<string>;
-    onLogout?: () => Promise<void>;
+    logoutRoute?: string;
   };
 }
 

src/store/actions/config/configActions.ts

@@ -1,7 +1,15 @@
+import { IProviderConfig } from 'core/providers/types/providerFactory.types';
 import { NativeAuthConfigType } from 'services/nativeAuth/nativeAuth.types';
 import { getStore } from 'store/store';
 
 export const setNativeAuthConfig = (config: NativeAuthConfigType) =>
   getStore().setState(({ config: state }) => {
     state.nativeAuthConfig = config;
   });
+
+export const setWalletConnectConfig = (
+  config: IProviderConfig['walletConnect']
+) =>
+  getStore().setState(({ config: state }) => {
+    state.walletConnectConfig = config;
+  });

src/store/selectors/configSelectors.ts

@@ -4,3 +4,7 @@ export const configSelector = ({ config }: StoreType) => config;
 
 export const nativeAuthConfigSelector = ({ config }: StoreType) =>
   config.nativeAuthConfig;
+
+export const walletConnectConfigSelector = ({ config }: StoreType) => {
+  return config.walletConnectConfig;
+};

src/store/slices/config/config.types.ts

@@ -1,5 +1,7 @@
+import { IProviderConfig } from 'core/providers/types/providerFactory.types';
 import { NativeAuthConfigType } from 'services/nativeAuth/nativeAuth.types';
 
 export interface ConfigSliceType {
   nativeAuthConfig: NativeAuthConfigType | null;
+  walletConnectConfig: IProviderConfig['walletConnect'] | null;
 }

src/store/slices/config/configSlice.ts

@@ -7,7 +7,8 @@ import { ConfigSliceType } from './config.types';
 // The config should be changed by using the `setNativeAuthConfig` action in some specific cases.
 // Preferably, the config should be set at the dApp initialization and not changed during the dApp lifecycle. (e.g. when the user logs in/log out)
 const initialState: ConfigSliceType = {
-  nativeAuthConfig: null
+  nativeAuthConfig: null,
+  walletConnectConfig: null
 };
 
 function getConfigSlice(): StateCreator<