@dynamic-labs/sdk-react-core 0.18.0-beta.29 → 0.19.0-alpha.0

package/CHANGELOG.md

@@ -1,53 +1,5 @@
 
-## [0.18.0-beta.29](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-beta.28...v0.18.0-beta.29) (2023-08-03)
-
-
-### ⚠ BREAKING CHANGES
-
-* remove deprecated multiwallet prop (#2821)
-
-### Bug Fixes
-
-* array of dynamicWagmiSettings not being sent, must be turned into object ([#2837](https://github.com/dynamic-labs/DynamicAuth/issues/2837)) ([fc5051d](https://github.com/dynamic-labs/DynamicAuth/commit/fc5051d3ce4c5e28d54a74cc9d74424748b52df9)), closes [#2835](https://github.com/dynamic-labs/DynamicAuth/issues/2835)
-* change network modal doesn't pop on secondary wallet, when primaryWallet was disconnected ([#2831](https://github.com/dynamic-labs/DynamicAuth/issues/2831)) ([4a78cc8](https://github.com/dynamic-labs/DynamicAuth/commit/4a78cc8c9004e6716fa9e35d8572c57bfd8bdc22))
-* connectSuccess callback is not being called when connecting new wallet after unlink ([#2829](https://github.com/dynamic-labs/DynamicAuth/issues/2829)) ([37795e5](https://github.com/dynamic-labs/DynamicAuth/commit/37795e5304d65766968ae6168d329b899c0afdfa))
-* **wcv2:** simulate chain change event in switchNetwork ([#2827](https://github.com/dynamic-labs/DynamicAuth/issues/2827)) ([98cff76](https://github.com/dynamic-labs/DynamicAuth/commit/98cff7687112ddbf2971fa4e42cc959f5be62014)), closes [#2809](https://github.com/dynamic-labs/DynamicAuth/issues/2809)
-* wrong wallet list is showing after disconnecting and network change ([#2832](https://github.com/dynamic-labs/DynamicAuth/issues/2832)) ([b7af548](https://github.com/dynamic-labs/DynamicAuth/commit/b7af5480a0f05b851cf9accb3ab0870fd2836a92))
-
-
-* remove deprecated multiwallet prop ([#2821](https://github.com/dynamic-labs/DynamicAuth/issues/2821)) ([d95173d](https://github.com/dynamic-labs/DynamicAuth/commit/d95173de890104b1b94b612976682c9d86ec4b17))
-
-## [0.18.0-beta.28](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.27...v0.18.0-beta.28) (2023-08-03)
-
-
-### Bug Fixes
-
-* gracefully handle walletbook fallbacks ([#2812](https://github.com/dynamic-labs/DynamicAuth/issues/2812)) ([#2822](https://github.com/dynamic-labs/DynamicAuth/issues/2822)) ([8e737d6](https://github.com/dynamic-labs/DynamicAuth/commit/8e737d602d64fa2414ba136799b8878e975a40a2))
-
-## [0.18.0-RC.27](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.26...v0.18.0-RC.27) (2023-08-03)
-
-### Bug Fixes
-
-* fixes circular dependency issues on usePromise
-
-## [0.18.0-RC.26](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.24...v0.18.0-RC.26) (2023-08-02)
-
-
-### ⚠ BREAKING CHANGES
-
-* displayTermsOfService prop set to false breaks message verfication (#2751)
-
-### Features
-
-* send wagmi settings from wagmi connector ([#2791](https://github.com/dynamic-labs/DynamicAuth/issues/2791)) ([#2800](https://github.com/dynamic-labs/DynamicAuth/issues/2800)) ([5b65605](https://github.com/dynamic-labs/DynamicAuth/commit/5b656059361a48de57e01ad2dd81de0bc9b2c7e8))
-
-
-### Bug Fixes
-
-* always call onBeforeConnectSuccess callback when wallet state changes ([#2786](https://github.com/dynamic-labs/DynamicAuth/issues/2786)) ([e2eaef3](https://github.com/dynamic-labs/DynamicAuth/commit/e2eaef3da1f80cdc7dc21e902e9c033e581242d2))
-* displayTermsOfService prop set to false breaks message verfication ([#2751](https://github.com/dynamic-labs/DynamicAuth/issues/2751)) ([6433732](https://github.com/dynamic-labs/DynamicAuth/commit/6433732fac87d641f2475d19ef743ac31130274f))
-* ensure auto-redirect back to dapp after message signing ([#2783](https://github.com/dynamic-labs/DynamicAuth/issues/2783)) ([dba4664](https://github.com/dynamic-labs/DynamicAuth/commit/dba466473ecc2afd808cdae0fd9023d38676b01f))
-* use css.supports only when available ([#2802](https://github.com/dynamic-labs/DynamicAuth/issues/2802)) ([7651898](https://github.com/dynamic-labs/DynamicAuth/commit/76518982a97e728ab65549f37f55b537eed4e890))
+## [0.19.0-alpha.0](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.25...v0.19.0-alpha.0) (2023-08-01)
 
 ## [0.18.0-RC.25](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.24...v0.18.0-RC.25) (2023-08-01)
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.18.0-beta.29";
+var version = "0.19.0-alpha.0";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.18.0-beta.29";
+var version = "0.19.0-alpha.0";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.18.0-beta.29",
+  "version": "0.19.0-alpha.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,13 +16,13 @@
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.18.0-beta.29",
-    "@dynamic-labs/multi-wallet": "0.18.0-beta.29",
-    "@dynamic-labs/rpc-providers": "0.18.0-beta.29",
-    "@dynamic-labs/types": "0.18.0-beta.29",
-    "@dynamic-labs/utils": "0.18.0-beta.29",
-    "@dynamic-labs/wallet-book": "0.18.0-beta.29",
-    "@dynamic-labs/wallet-connector-core": "0.18.0-beta.29"
+    "@dynamic-labs/logger": "0.19.0-alpha.0",
+    "@dynamic-labs/multi-wallet": "0.19.0-alpha.0",
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.0",
+    "@dynamic-labs/types": "0.19.0-alpha.0",
+    "@dynamic-labs/utils": "0.19.0-alpha.0",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.0",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.0"
   },
   "devDependencies": {
     "semver": "7.3.8"

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -357,12 +357,9 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
         user,
     });
     const sendWagmiSettings = (settings) => {
-        const { dynamicWagmiSettings } = settings;
-        if (dynamicWagmiSettings) {
-            api.sendDynamicProps(environmentId, {
-                dynamicWagmiSettings: { dynamicWagmiSettings },
-            });
-        }
+        api.sendDynamicProps(environmentId, {
+            dynamicWagmiSettings: settings.dynamicWagmiSettings,
+        });
     };
     const clearStatesOnBackClick = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setDesktopUri('');

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -353,12 +353,9 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
         user,
     });
     const sendWagmiSettings = (settings) => {
-        const { dynamicWagmiSettings } = settings;
-        if (dynamicWagmiSettings) {
-            sendDynamicProps(environmentId, {
-                dynamicWagmiSettings: { dynamicWagmiSettings },
-            });
-        }
+        sendDynamicProps(environmentId, {
+            dynamicWagmiSettings: settings.dynamicWagmiSettings,
+        });
     };
     const clearStatesOnBackClick = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         setDesktopUri('');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -28,11 +28,11 @@ require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 
-const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
+const useConnectAndSign = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -72,10 +72,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                if (shouldUpdateWallets) {
-                    handleWalletsToConnect();
-                }
-                if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
+                handleWalletsToConnect();
+                if (!isFullyConnected) {
                     setCallback('connectSuccess');
                 }
                 return;

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.d.ts

@@ -3,7 +3,5 @@ type Props = {
     fetchPublicAddressOpts?: FetchPublicAddressOpts;
     walletConnector: WalletConnector;
 };
-export declare const useConnectAndSign: ({ shouldUpdateWallets }?: {
-    shouldUpdateWallets?: boolean | undefined;
-}) => ({ walletConnector, fetchPublicAddressOpts, }: Props) => Promise<void>;
+export declare const useConnectAndSign: () => ({ walletConnector, fetchPublicAddressOpts, }: Props) => Promise<void>;
 export {};

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -24,11 +24,11 @@ import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 
-const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
+const useConnectAndSign = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -68,10 +68,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
             }
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                if (shouldUpdateWallets) {
-                    handleWalletsToConnect();
-                }
-                if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
+                handleWalletsToConnect();
+                if (!isFullyConnected) {
                     setCallback('connectSuccess');
                 }
                 return;

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs

@@ -21,7 +21,6 @@ const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wal
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
-    const seen = new Set();
     React.useEffect(() => {
         const fetchNetwork = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             try {
@@ -44,9 +43,14 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         if (!primaryWallet) {
             return;
         }
+        const seen = new Set();
         addPrimaryWalletEventListeners(seen);
+        addSecondaryWalletEventListeners(seen);
         return () => {
             primaryWallet.connector.teardownEventListeners();
+            for (const wallet of secondaryWallets) {
+                wallet.connector.teardownEventListeners();
+            }
         };
         // justification: we don't want to setup event listeners more than needed
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -56,20 +60,10 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
         multiWalletWidgetState,
         // eslint-disable-next-line react-hooks/exhaustive-deps
+        orderedSecondaryWalletAddresses(secondaryWallets).join(),
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
     ]);
-    React.useEffect(() => {
-        addSecondaryWalletEventListeners(seen);
-        return () => {
-            for (const wallet of secondaryWallets) {
-                wallet.connector.teardownEventListeners();
-            }
-        };
-    }, [
-        multiWalletWidgetState,
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-    ]);
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
         // this means the user is linking a new account, so we need proof of ownership...

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.js

@@ -17,7 +17,6 @@ const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wal
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
     const [network, setNetwork] = useState(undefined);
-    const seen = new Set();
     useEffect(() => {
         const fetchNetwork = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
@@ -40,9 +39,14 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         if (!primaryWallet) {
             return;
         }
+        const seen = new Set();
         addPrimaryWalletEventListeners(seen);
+        addSecondaryWalletEventListeners(seen);
         return () => {
             primaryWallet.connector.teardownEventListeners();
+            for (const wallet of secondaryWallets) {
+                wallet.connector.teardownEventListeners();
+            }
         };
         // justification: we don't want to setup event listeners more than needed
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -52,20 +56,10 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
         multiWalletWidgetState,
         // eslint-disable-next-line react-hooks/exhaustive-deps
+        orderedSecondaryWalletAddresses(secondaryWallets).join(),
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
     ]);
-    useEffect(() => {
-        addSecondaryWalletEventListeners(seen);
-        return () => {
-            for (const wallet of secondaryWallets) {
-                wallet.connector.teardownEventListeners();
-            }
-        };
-    }, [
-        multiWalletWidgetState,
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-    ]);
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
         // this means the user is linking a new account, so we need proof of ownership...

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.cjs

@@ -53,12 +53,10 @@ var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNe
 var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.cjs');
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
-    const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
-    });
+    const finishConnectAndSign = useConnectAndSign.useConnectAndSign();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
     // Finishes auth flow when wallet switches to proper network
     React.useEffect(() => {
@@ -66,16 +64,8 @@ const NetworkNotSupported = () => {
             finishConnectAndSign({
                 walletConnector: walletConnector,
             });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
         }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
+    }, [walletConnectorNetwork]);
     // Updates the contexts 'network' based on the selected wallet connector.
     // It helps ensure that the 'network' is always in sync with the wallet's actual network,
     // Prevents 'network' from being 'undefined'.

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

@@ -49,12 +49,10 @@ import { SelectNetworkButton } from '../../components/SelectNetworkButton/Select
 import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.js';
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
-    const finishConnectAndSign = useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
-    });
+    const finishConnectAndSign = useConnectAndSign();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
     // Finishes auth flow when wallet switches to proper network
     useEffect(() => {
@@ -62,16 +60,8 @@ const NetworkNotSupported = () => {
             finishConnectAndSign({
                 walletConnector: walletConnector,
             });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
         }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
+    }, [walletConnectorNetwork]);
     // Updates the contexts 'network' based on the selected wallet connector.
     // It helps ensure that the 'network' is always in sync with the wallet's actual network,
     // Prevents 'network' from being 'undefined'.

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs

@@ -54,30 +54,20 @@ var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletCo
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
-    const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
-    });
+    const finishConnectAndSign = useConnectAndSign.useConnectAndSign();
     // Finishes auth flow when wallet switches to proper network
     React.useEffect(() => {
         if (isSupportedNetwork.isSupportedNetwork({ network: walletConnectorNetwork, walletConnector })) {
             finishConnectAndSign({
                 walletConnector: walletConnector,
             });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
         }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
+    }, [walletConnectorNetwork]);
     // Updates the contexts 'network' based on the selected wallet connector.
     // It helps ensure that the 'network' is always in sync with the wallet's actual network,
     // Prevents 'network' from being 'undefined'.

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js

@@ -50,30 +50,20 @@ import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWallet
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
-    const finishConnectAndSign = useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
-    });
+    const finishConnectAndSign = useConnectAndSign();
     // Finishes auth flow when wallet switches to proper network
     useEffect(() => {
         if (isSupportedNetwork({ network: walletConnectorNetwork, walletConnector })) {
             finishConnectAndSign({
                 walletConnector: walletConnector,
             });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
         }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
+    }, [walletConnectorNetwork]);
     // Updates the contexts 'network' based on the selected wallet connector.
     // It helps ensure that the 'network' is always in sync with the wallet's actual network,
     // Prevents 'network' from being 'undefined'.

package/src/lib/widgets/DynamicWidget/views/EditProfileView/EditProfileView.cjs

@@ -65,7 +65,7 @@ const EditProfileView = ({ rootClassName, }) => {
     }), [goToProfileView, setShowAuthFlow, setView, updateUser]);
     const isKYCEnabled = useKYCFlag.useKYCFlag();
     const isMultiWalletEnabled = useMultiWalletFlag.useMultiWalletFlag();
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [!isMultiWalletEnabled && isKYCEnabled && (jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'regular', color: 'secondary', variant: 'body_normal', className: 'dynamic-widget-edit-profile-view__profile-title' }, { children: "My profile" }))), jsxRuntime.jsx(UserProfileForm.UserProfileForm, { formClassName: rootClassName, onEditProfileSubmit: onEditProfileFormSubmit, onEditProfileCancel: goToProfileView })] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [!isMultiWalletEnabled && isKYCEnabled && (jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'regular', color: 'secondary', variant: 'body_normal', className: 'dynamic-widget-edit-profile-view__profile-title' }, { children: "My information" }))), jsxRuntime.jsx(UserProfileForm.UserProfileForm, { formClassName: rootClassName, onEditProfileSubmit: onEditProfileFormSubmit, onEditProfileCancel: goToProfileView })] }));
 };
 
 exports.EditProfileView = EditProfileView;

package/src/lib/widgets/DynamicWidget/views/EditProfileView/EditProfileView.js

@@ -61,7 +61,7 @@ const EditProfileView = ({ rootClassName, }) => {
     }), [goToProfileView, setShowAuthFlow, setView, updateUser]);
     const isKYCEnabled = useKYCFlag();
     const isMultiWalletEnabled = useMultiWalletFlag();
-    return (jsxs(Fragment, { children: [!isMultiWalletEnabled && isKYCEnabled && (jsx(Typography, Object.assign({ weight: 'regular', color: 'secondary', variant: 'body_normal', className: 'dynamic-widget-edit-profile-view__profile-title' }, { children: "My profile" }))), jsx(UserProfileForm, { formClassName: rootClassName, onEditProfileSubmit: onEditProfileFormSubmit, onEditProfileCancel: goToProfileView })] }));
+    return (jsxs(Fragment, { children: [!isMultiWalletEnabled && isKYCEnabled && (jsx(Typography, Object.assign({ weight: 'regular', color: 'secondary', variant: 'body_normal', className: 'dynamic-widget-edit-profile-view__profile-title' }, { children: "My information" }))), jsx(UserProfileForm, { formClassName: rootClassName, onEditProfileSubmit: onEditProfileFormSubmit, onEditProfileCancel: goToProfileView })] }));
 };
 
 export { EditProfileView };