@dynamic-labs/sdk-react-core 4.0.0-alpha.14 → 4.0.0-alpha.16

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -65,11 +65,11 @@ import 'qrcode';
 import 'formik';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../store/state/sendBalances.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.cjs

@@ -68,11 +68,11 @@ require('qrcode');
 require('formik');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../store/state/sendBalances.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.js

@@ -64,11 +64,11 @@ import 'qrcode';
 import 'formik';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../store/state/sendBalances.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

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

@@ -75,12 +75,12 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');

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

@@ -71,12 +71,12 @@ import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

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

@@ -67,11 +67,11 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');

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

@@ -63,11 +63,11 @@ import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

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

@@ -21,7 +21,7 @@ require('../../../shared/consts/index.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner = false, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!user) {
@@ -29,10 +29,16 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
             primaryWalletId,
+            separateSmartWalletAndSigner,
             user,
             walletConnectorOptions,
         });
-    }, [user, primaryWalletId, walletConnectorOptions]);
+    }, [
+        user,
+        primaryWalletId,
+        walletConnectorOptions,
+        separateSmartWalletAndSigner,
+    ]);
     logger.logger.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
     const wallets = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.d.ts

@@ -11,6 +11,7 @@ type Props = {
     setPrimaryWalletId: (walletId: string) => void;
     user?: UserProfile;
     canHaveMultipleWalletsConnected?: boolean;
+    separateSmartWalletAndSigner?: boolean;
 };
 export interface UseWalletConnectors {
     primaryWallet: Wallet | null;
@@ -20,5 +21,5 @@ export interface UseWalletConnectors {
     showQrcodeModal: boolean;
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner, }: Props) => UseWalletConnectors;
 export {};

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

@@ -17,7 +17,7 @@ import '../../../shared/consts/index.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner = false, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!user) {
@@ -25,10 +25,16 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return createLinkedWalletsFromWalletOptions({
             primaryWalletId,
+            separateSmartWalletAndSigner,
             user,
             walletConnectorOptions,
         });
-    }, [user, primaryWalletId, walletConnectorOptions]);
+    }, [
+        user,
+        primaryWalletId,
+        walletConnectorOptions,
+        separateSmartWalletAndSigner,
+    ]);
     logger.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
     const wallets = useMemo(() => {
         // Before signing the first message we are using connected wallets list

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -10,7 +10,7 @@ var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManu
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
-const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -37,13 +37,15 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             wallet.walletConnector.isHardwareWalletEnabled = true;
         }
         // this account is the owner of a smart wallet, and should not be surfaced
-        if (smartWallet.isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
+        if (!separateSmartWalletAndSigner &&
+            smartWallet.isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
             return null;
         }
         if (account.address && account.chain) {
             if (account.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet) {
                 smartWallet.initializeSmartWallet({
                     account,
+                    primaryWalletId,
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -4,6 +4,7 @@ type CreateWalletsFromWalletOptionsProps = {
     user: UserProfile;
     primaryWalletId: string | undefined;
     walletConnectorOptions: WalletOption[] | undefined;
+    separateSmartWalletAndSigner?: boolean;
 };
-export declare const createLinkedWalletsFromWalletOptions: ({ user, walletConnectorOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export declare const createLinkedWalletsFromWalletOptions: ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
 export {};

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -6,7 +6,7 @@ import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldMa
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
-const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -33,13 +33,15 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             wallet.walletConnector.isHardwareWalletEnabled = true;
         }
         // this account is the owner of a smart wallet, and should not be surfaced
-        if (isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
+        if (!separateSmartWalletAndSigner &&
+            isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
             return null;
         }
         if (account.address && account.chain) {
             if (account.walletProvider === WalletProviderEnum.SmartContractWallet) {
                 initializeSmartWallet({
                     account,
+                    primaryWalletId,
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.cjs

@@ -13,7 +13,7 @@ var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/fin
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, }) {
+const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
     var _b, _c;
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
@@ -45,7 +45,16 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
     if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
         throw new Error('could not initialize smart wallet');
     }
-    yield connector.setEoaConnector(ownerWallet.walletConnector);
+    if (!owner.address || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
+    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
+    yield connector.registerEoa({
+        eoaAddress: owner.address,
+        eoaConnector: ownerWallet.walletConnector,
+        shouldSetEoaConnector,
+        smartWalletAddress: account.address,
+    });
 });
 
 exports.findOwner = findOwner;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.d.ts

@@ -3,8 +3,9 @@ import { WalletOption } from '../../../../../shared';
 export declare const findOwner: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const findSmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const isOwnerOfASmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => boolean;
-export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, }: {
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }: {
     account: JwtVerifiedCredential;
     verifiedCredentials: JwtVerifiedCredential[];
     walletConnectorOptions: WalletOption[];
+    primaryWalletId?: string;
 }) => Promise<void>;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.js

@@ -9,7 +9,7 @@ import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/f
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, }) {
+const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
     var _b, _c;
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
@@ -41,7 +41,16 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
     if (!isAccountAbstractionConnector(connector)) {
         throw new Error('could not initialize smart wallet');
     }
-    yield connector.setEoaConnector(ownerWallet.walletConnector);
+    if (!owner.address || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
+    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
+    yield connector.registerEoa({
+        eoaAddress: owner.address,
+        eoaConnector: ownerWallet.walletConnector,
+        shouldSetEoaConnector,
+        smartWalletAddress: account.address,
+    });
 });
 
 export { findOwner, findSmartWallet, initializeSmartWallet, isOwnerOfASmartWallet };

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

@@ -72,11 +72,11 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
@@ -131,12 +131,22 @@ const useWalletItemActions = () => {
                 verificationType: 'awaiting_verification',
             });
         }
-        onlyConnectUser({ walletConnector });
+        const attemptConnection = () => {
+            onlyConnectUser({ shouldShowPendingConnectView: false, walletConnector });
+        };
+        setView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
+        attemptConnection();
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleInstalledExtensionClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
-        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        if (authMode === 'connect-only') {
+            setView('pending-connect');
+            onlyConnectUser({ walletConnector });
+        }
+        else {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
     });
     const handleUninstalledClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleUninstalledClick', walletConnector);
@@ -209,9 +219,13 @@ const useWalletItemActions = () => {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);
+        const isMetamask = walletConnector.key === 'metamask';
         // in connect only we only allow one account to be connected in the same wallet
-        if (authMode !== 'connect-only') {
+        // also this is only a feature in MM
+        if (authMode !== 'connect-only' && isMetamask) {
             try {
+                setSelectedWalletConnectorKey(walletConnector.key);
+                setView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }
             catch (error) {

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

@@ -68,11 +68,11 @@ import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -127,12 +127,22 @@ const useWalletItemActions = () => {
                 verificationType: 'awaiting_verification',
             });
         }
-        onlyConnectUser({ walletConnector });
+        const attemptConnection = () => {
+            onlyConnectUser({ shouldShowPendingConnectView: false, walletConnector });
+        };
+        setView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
+        attemptConnection();
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleInstalledExtensionClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
-        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        if (authMode === 'connect-only') {
+            setView('pending-connect');
+            onlyConnectUser({ walletConnector });
+        }
+        else {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
     });
     const handleUninstalledClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleUninstalledClick', walletConnector);
@@ -205,9 +215,13 @@ const useWalletItemActions = () => {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);
+        const isMetamask = walletConnector.key === 'metamask';
         // in connect only we only allow one account to be connected in the same wallet
-        if (authMode !== 'connect-only') {
+        // also this is only a feature in MM
+        if (authMode !== 'connect-only' && isMetamask) {
             try {
+                setSelectedWalletConnectorKey(walletConnector.key);
+                setView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }
             catch (error) {

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

@@ -70,11 +70,11 @@ require('formik');
 var groupWalletOptions = require('../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 var WalletGroupContext = require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');

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

@@ -66,11 +66,11 @@ import 'formik';
 import { groupWalletOptions } from '../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.js';
 import '../../../context/FooterAnimationContext/index.js';
 import { useWalletGroupContext } from '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

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

@@ -70,11 +70,11 @@ require('react-focus-lock');
 require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
 var CreatePasswordModal = require('../../../modals/CreatePasswordModal/CreatePasswordModal.cjs');
@@ -85,6 +85,7 @@ var EnterPasswordModal = require('../../../modals/EnterPasswordModal/EnterPasswo
 var SignMessageConfirmationModal = require('../../../modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs');
 var SyncWalletPromptModal = require('../../../modals/SyncWalletPromptModal/SyncWalletPromptModal.cjs');
 var TransactionConfirmationModal = require('../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.cjs');
+var AddNetworkModal = require('../../../modals/AddNetworkModal/AddNetworkModal.cjs');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs = false, }) => {
     const confirmationStateRef = React.useRef('enabled');
@@ -104,6 +105,9 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const { modal: syncWalletPromptModal, open: openSyncWalletPrompt } = useConfirmationModal.useConfirmationModal({
         elementId: 'dynamic-sync-wallet',
     });
+    const { modal: addNetworkModal, open: openAddNetwork } = useConfirmationModal.useConfirmationModal({
+        elementId: 'dynamic-prompt-to-add-network',
+    });
     const shouldConfirmAction = React.useCallback(() => {
         if (confirmationStateRef.current === 'disabled') {
             confirmationStateRef.current = 'enabled';
@@ -155,10 +159,14 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const syncWallet = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
         yield openSyncWalletPrompt((resolve, reject) => (jsxRuntime.jsx(SyncWalletPromptModal.SyncWalletPromptModal, { onResolve: resolve, onReject: reject, connector: walletConnector, expectedAddress: expectedAddress, activeAddress: activeAddress })));
     }), [openSyncWalletPrompt]);
+    const addNetwork = React.useCallback((_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ handler, network, walletKey }) {
+        yield openAddNetwork((resolve) => (jsxRuntime.jsx(AddNetworkModal.AddNetworkModal, { network: network, walletKey: walletKey, onCancel: resolve, onNetworkAdded: resolve, addNetworkMutation: handler })));
+    }), [openAddNetwork]);
     const disabledConfirmationOnce = React.useCallback(() => {
         confirmationStateRef.current = 'disabled';
     }, []);
     const walletUiUtils = React.useMemo(() => ({
+        addNetwork,
         createPassword,
         disabledConfirmationOnce,
         enterPassword,
@@ -172,13 +180,15 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         enterPassword,
         createPassword,
         syncWallet,
+        addNetwork,
     ]);
     return React.useMemo(() => [
         signMessageModal ||
             sendTransactionModal ||
             enterPasswordModal ||
             createPasswordModal ||
-            syncWalletPromptModal,
+            syncWalletPromptModal ||
+            addNetworkModal,
         walletUiUtils,
     ], [
         signMessageModal,
@@ -186,6 +196,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         enterPasswordModal,
         createPasswordModal,
         syncWalletPromptModal,
+        addNetworkModal,
         walletUiUtils,
     ]);
 };

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

@@ -66,11 +66,11 @@ import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
 import { CreatePasswordModal } from '../../../modals/CreatePasswordModal/CreatePasswordModal.js';
@@ -81,6 +81,7 @@ import { EnterPasswordModal } from '../../../modals/EnterPasswordModal/EnterPass
 import { SignMessageConfirmationModal } from '../../../modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js';
 import { SyncWalletPromptModal } from '../../../modals/SyncWalletPromptModal/SyncWalletPromptModal.js';
 import { TransactionConfirmationModal } from '../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.js';
+import { AddNetworkModal } from '../../../modals/AddNetworkModal/AddNetworkModal.js';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs = false, }) => {
     const confirmationStateRef = useRef('enabled');
@@ -100,6 +101,9 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const { modal: syncWalletPromptModal, open: openSyncWalletPrompt } = useConfirmationModal({
         elementId: 'dynamic-sync-wallet',
     });
+    const { modal: addNetworkModal, open: openAddNetwork } = useConfirmationModal({
+        elementId: 'dynamic-prompt-to-add-network',
+    });
     const shouldConfirmAction = useCallback(() => {
         if (confirmationStateRef.current === 'disabled') {
             confirmationStateRef.current = 'enabled';
@@ -151,10 +155,14 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const syncWallet = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
         yield openSyncWalletPrompt((resolve, reject) => (jsx(SyncWalletPromptModal, { onResolve: resolve, onReject: reject, connector: walletConnector, expectedAddress: expectedAddress, activeAddress: activeAddress })));
     }), [openSyncWalletPrompt]);
+    const addNetwork = useCallback((_e) => __awaiter(void 0, [_e], void 0, function* ({ handler, network, walletKey }) {
+        yield openAddNetwork((resolve) => (jsx(AddNetworkModal, { network: network, walletKey: walletKey, onCancel: resolve, onNetworkAdded: resolve, addNetworkMutation: handler })));
+    }), [openAddNetwork]);
     const disabledConfirmationOnce = useCallback(() => {
         confirmationStateRef.current = 'disabled';
     }, []);
     const walletUiUtils = useMemo(() => ({
+        addNetwork,
         createPassword,
         disabledConfirmationOnce,
         enterPassword,
@@ -168,13 +176,15 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         enterPassword,
         createPassword,
         syncWallet,
+        addNetwork,
     ]);
     return useMemo(() => [
         signMessageModal ||
             sendTransactionModal ||
             enterPasswordModal ||
             createPasswordModal ||
-            syncWalletPromptModal,
+            syncWalletPromptModal ||
+            addNetworkModal,
         walletUiUtils,
     ], [
         signMessageModal,
@@ -182,6 +192,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         enterPasswordModal,
         createPasswordModal,
         syncWalletPromptModal,
+        addNetworkModal,
         walletUiUtils,
     ]);
 };

package/src/lib/views/AccessBlockedView/AccessBlockedView.cjs

@@ -72,17 +72,17 @@ require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../index.cjs');
+var IpConfigurationContext = require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../store/state/tokenBalances.cjs');
 require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
-require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
-require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-var IpConfigurationContext = require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 
 const AccessBlockedView = () => {
     const [country, setCountry] = React.useState();