@broxus/evm-connect 1.12.5 → 1.12.7

package/lib/cjs/context/EvmWalletProvidersContext.js

@@ -49,7 +49,6 @@ function useEvmWalletProviders() {
 }
 exports.EvmWalletProvidersProvider = (0, mobx_react_lite_1.observer)(({ agreementsNote, children, network, recentMetaStorageKey, onConnect, }) => {
     const walletService = (0, EvmWalletServiceContext_1.useEvmWalletService)();
-    const [recentMeta, setRecentMeta] = (0, hooks_1.useRecentConnectionMeta)(recentMetaStorageKey);
     const [error, setError] = React.useState(null);
     const [connectingProvider, setConnectingProvider] = React.useState(null);
     const connect = React.useCallback(async (providerConfig) => {
@@ -57,6 +56,7 @@ exports.EvmWalletProvidersProvider = (0, mobx_react_lite_1.observer)(({ agreemen
             setError(null);
             setConnectingProvider(providerConfig);
             const prevConnector = walletService.connector;
+            const recentMeta = (0, hooks_1.getRecentConnectionMeta)(recentMetaStorageKey);
             // eslint-disable-next-line no-nested-ternary
             const chainParams = network ?? (recentMeta?.chainId
                 ? walletService.networks.find(_network => _network.chainId === recentMeta.chainId) ?? 1
@@ -67,7 +67,7 @@ exports.EvmWalletProvidersProvider = (0, mobx_react_lite_1.observer)(({ agreemen
                 await prevConnector?.disconnect(true);
             }
             await onConnect?.(providerConfig.connector);
-            setRecentMeta({
+            (0, hooks_1.storeRecentConnectionMeta)({
                 chainId: providerConfig.connector.chainId?.toString(),
                 disconnected: false,
                 providerId: providerConfig.id,
@@ -78,7 +78,7 @@ exports.EvmWalletProvidersProvider = (0, mobx_react_lite_1.observer)(({ agreemen
         catch (e) {
             setError(e);
         }
-    }, [network, onConnect, recentMeta, recentMetaStorageKey, setRecentMeta, walletService]);
+    }, [network, onConnect, recentMetaStorageKey, walletService]);
     const reset = React.useCallback(() => {
         setError(null);
         setConnectingProvider(null);

package/lib/cjs/context/EvmWalletServiceContext.js

@@ -48,7 +48,6 @@ function useEvmWalletService() {
     return (0, react_uikit_1.useContext)(exports.EvmWalletServiceContext);
 }
 function EvmWalletServiceProvider({ agreementsNote, children, params, recentMetaStorageKey, wallet, }) {
-    const [, setRecentMeta] = (0, hooks_1.useRecentConnectionMeta)(recentMetaStorageKey);
     const context = React.useMemo(() => {
         if (wallet instanceof services_1.EvmWalletService) {
             return wallet;
@@ -58,9 +57,9 @@ function EvmWalletServiceProvider({ agreementsNote, children, params, recentMeta
     React.useEffect(() => (0, mobx_1.reaction)(() => context.chainId, chainId => {
         if (chainId) {
             const recentMeta = (0, hooks_1.getRecentConnectionMeta)(recentMetaStorageKey);
-            setRecentMeta({ ...recentMeta, chainId: chainId.toString() });
+            (0, hooks_1.storeRecentConnectionMeta)({ ...recentMeta, chainId: chainId.toString() }, recentMetaStorageKey);
         }
-    }, { delay: 10, fireImmediately: context.isReady }), [context, recentMetaStorageKey, setRecentMeta]);
+    }, { delay: 10, fireImmediately: context.isReady }), [context, recentMetaStorageKey]);
     return (React.createElement(exports.EvmWalletServiceContext.Provider, { value: context },
         React.createElement(EvmWalletProvidersContext_1.EvmWalletProvidersProvider, { agreementsNote: agreementsNote, recentMetaStorageKey: recentMetaStorageKey }, children)));
 }

package/lib/cjs/hooks/useRecentConnectionMeta.js

@@ -39,6 +39,7 @@ exports.useRecentConnectionMeta = useRecentConnectionMeta;
 const js_utils_1 = require("@broxus/js-utils");
 const React = __importStar(require("react"));
 const constants_1 = require("../constants");
+const context_1 = require("../context");
 const types_1 = require("../types");
 function isRecentConnectionMeta(value) {
     const meta = { providerId: value.providerId, type: value.type };
@@ -70,7 +71,8 @@ function getRecentConnectionMeta(storageKey = constants_1.EVM_RECENT_CONNECTION)
     return undefined;
 }
 function useRecentConnectionMeta(storageKey = constants_1.EVM_RECENT_CONNECTION) {
-    const [meta, setMeta] = React.useState(getRecentConnectionMeta(storageKey));
+    const walletProviders = (0, context_1.useEvmWalletProviders)();
+    const [meta, setMeta] = React.useState(getRecentConnectionMeta(walletProviders.recentMetaStorageKey || storageKey));
     React.useEffect(() => {
         const onStorage = (event) => {
             if (event.key === storageKey && event.newValue) {

package/lib/esm/context/EvmWalletProvidersContext.js

@@ -4,7 +4,7 @@ import { useContext } from '@broxus/react-uikit';
 import { observer } from 'mobx-react-lite';
 import * as React from 'react';
 import { useEvmWalletService } from '../context/EvmWalletServiceContext';
-import { useRecentConnectionMeta } from '../hooks';
+import { getRecentConnectionMeta, storeRecentConnectionMeta } from '../hooks';
 import { convertNetworkToChainParams } from '../utils';
 export const EvmWalletProvidersContext = React.createContext(null);
 export function useEvmWalletProviders() {
@@ -12,7 +12,6 @@ export function useEvmWalletProviders() {
 }
 export const EvmWalletProvidersProvider = observer(({ agreementsNote, children, network, recentMetaStorageKey, onConnect, }) => {
     const walletService = useEvmWalletService();
-    const [recentMeta, setRecentMeta] = useRecentConnectionMeta(recentMetaStorageKey);
     const [error, setError] = React.useState(null);
     const [connectingProvider, setConnectingProvider] = React.useState(null);
     const connect = React.useCallback(async (providerConfig) => {
@@ -20,6 +19,7 @@ export const EvmWalletProvidersProvider = observer(({ agreementsNote, children,
             setError(null);
             setConnectingProvider(providerConfig);
             const prevConnector = walletService.connector;
+            const recentMeta = getRecentConnectionMeta(recentMetaStorageKey);
             // eslint-disable-next-line no-nested-ternary
             const chainParams = network ?? (recentMeta?.chainId
                 ? walletService.networks.find(_network => _network.chainId === recentMeta.chainId) ?? 1
@@ -30,7 +30,7 @@ export const EvmWalletProvidersProvider = observer(({ agreementsNote, children,
                 await prevConnector?.disconnect(true);
             }
             await onConnect?.(providerConfig.connector);
-            setRecentMeta({
+            storeRecentConnectionMeta({
                 chainId: providerConfig.connector.chainId?.toString(),
                 disconnected: false,
                 providerId: providerConfig.id,
@@ -41,7 +41,7 @@ export const EvmWalletProvidersProvider = observer(({ agreementsNote, children,
         catch (e) {
             setError(e);
         }
-    }, [network, onConnect, recentMeta, recentMetaStorageKey, setRecentMeta, walletService]);
+    }, [network, onConnect, recentMetaStorageKey, walletService]);
     const reset = React.useCallback(() => {
         setError(null);
         setConnectingProvider(null);

package/lib/esm/context/EvmWalletServiceContext.js

@@ -3,14 +3,13 @@ import { useContext } from '@broxus/react-uikit';
 import { reaction } from 'mobx';
 import * as React from 'react';
 import { EvmWalletProvidersProvider } from '../context/EvmWalletProvidersContext';
-import { getRecentConnectionMeta, useRecentConnectionMeta } from '../hooks';
+import { getRecentConnectionMeta, storeRecentConnectionMeta } from '../hooks';
 import { EvmWalletService } from '../services';
 export const EvmWalletServiceContext = React.createContext(null);
 export function useEvmWalletService() {
     return useContext(EvmWalletServiceContext);
 }
 export function EvmWalletServiceProvider({ agreementsNote, children, params, recentMetaStorageKey, wallet, }) {
-    const [, setRecentMeta] = useRecentConnectionMeta(recentMetaStorageKey);
     const context = React.useMemo(() => {
         if (wallet instanceof EvmWalletService) {
             return wallet;
@@ -20,9 +19,9 @@ export function EvmWalletServiceProvider({ agreementsNote, children, params, rec
     React.useEffect(() => reaction(() => context.chainId, chainId => {
         if (chainId) {
             const recentMeta = getRecentConnectionMeta(recentMetaStorageKey);
-            setRecentMeta({ ...recentMeta, chainId: chainId.toString() });
+            storeRecentConnectionMeta({ ...recentMeta, chainId: chainId.toString() }, recentMetaStorageKey);
         }
-    }, { delay: 10, fireImmediately: context.isReady }), [context, recentMetaStorageKey, setRecentMeta]);
+    }, { delay: 10, fireImmediately: context.isReady }), [context, recentMetaStorageKey]);
     return (React.createElement(EvmWalletServiceContext.Provider, { value: context },
         React.createElement(EvmWalletProvidersProvider, { agreementsNote: agreementsNote, recentMetaStorageKey: recentMetaStorageKey }, children)));
 }

package/lib/esm/hooks/useRecentConnectionMeta.js

@@ -1,6 +1,7 @@
 import { debug, isBrowser, storage } from '@broxus/js-utils';
 import * as React from 'react';
 import { EVM_RECENT_CONNECTION } from '../constants';
+import { useEvmWalletProviders } from '../context';
 import { EthereumConnectionType } from '../types';
 function isRecentConnectionMeta(value) {
     const meta = { providerId: value.providerId, type: value.type };
@@ -32,7 +33,8 @@ export function getRecentConnectionMeta(storageKey = EVM_RECENT_CONNECTION) {
     return undefined;
 }
 export function useRecentConnectionMeta(storageKey = EVM_RECENT_CONNECTION) {
-    const [meta, setMeta] = React.useState(getRecentConnectionMeta(storageKey));
+    const walletProviders = useEvmWalletProviders();
+    const [meta, setMeta] = React.useState(getRecentConnectionMeta(walletProviders.recentMetaStorageKey || storageKey));
     React.useEffect(() => {
         const onStorage = (event) => {
             if (event.key === storageKey && event.newValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@broxus/evm-connect",
-    "version": "1.12.5",
+    "version": "1.12.7",
     "description": "Ethereum wallets connector.",
     "license": "MIT",
     "keywords": [
@@ -96,5 +96,5 @@
         "web3-types": "^1.x",
         "web3-utils": "^4.x"
     },
-    "gitHead": "7ac22e228c35e0140f251e2103fa6d4af1ff8679"
+    "gitHead": "ce82ec3a52cf959110c873959c6615b8733070c9"
 }