@dynamic-labs/sdk-react-core 0.19.0-alpha.4 → 0.19.0-alpha.6

package/CHANGELOG.md

@@ -1,4 +1,27 @@
 
+## [0.19.0-alpha.6](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.5...v0.19.0-alpha.6) (2023-08-25)
+
+
+### Features
+
+* optionally split up email and social and change their display order in login view ([#3125](https://github.com/dynamic-labs/DynamicAuth/issues/3125)) ([ee82d26](https://github.com/dynamic-labs/DynamicAuth/commit/ee82d264eb3cb7f4ca7eb33369ef5409fe6860e4))
+* post a connection request for second wallet ([#3113](https://github.com/dynamic-labs/DynamicAuth/issues/3113)) ([630aefa](https://github.com/dynamic-labs/DynamicAuth/commit/630aefa5ce83278082db1e3cd419c03e4fd081c7))
+
+
+### Bug Fixes
+
+* fix bug where user was not able to confirm last wallet transfer ([#3102](https://github.com/dynamic-labs/DynamicAuth/issues/3102)) ([453b4c2](https://github.com/dynamic-labs/DynamicAuth/commit/453b4c20ea8f09d92dda11cdf92ddab562096d6f))
+* fix github social linking icon on dark mode ([#3126](https://github.com/dynamic-labs/DynamicAuth/issues/3126)) ([6a8f3e3](https://github.com/dynamic-labs/DynamicAuth/commit/6a8f3e3d6e43d76b428e169fd5ead9ee0e2ec43d))
+* fix issue with detecting oauth window closed before finishing linking ([#3124](https://github.com/dynamic-labs/DynamicAuth/issues/3124)) ([6a80ee9](https://github.com/dynamic-labs/DynamicAuth/commit/6a80ee97deb54e5b62bf2285d71b03c36802c5d2))
+* stop calling handleLogOut prematurely ([#3135](https://github.com/dynamic-labs/DynamicAuth/issues/3135)) ([e7c81ad](https://github.com/dynamic-labs/DynamicAuth/commit/e7c81ad7e9e9cff03e5d2ca1e0fb7cfea083d06e))
+
+## [0.19.0-alpha.5](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.4...v0.19.0-alpha.5) (2023-08-24)
+
+
+### Bug Fixes
+
+* send wagmi settings only once when DynamicWagmiConnector loads ([#3103](https://github.com/dynamic-labs/DynamicAuth/issues/3103)) ([8bba505](https://github.com/dynamic-labs/DynamicAuth/commit/8bba505f84f6f3567743397a3f1274a3840a7700))
+
 ## [0.19.0-alpha.4](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.3...v0.19.0-alpha.4) (2023-08-23)
 
 

package/package.cjs

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.19.0-alpha.4";
+var version = "0.19.0-alpha.6";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.27",
-	"@dynamic-labs/sdk-api": "0.0.263",
+	"@dynamic-labs/sdk-api": "0.0.270",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	yup: "0.32.11",

package/package.js

@@ -1,8 +1,8 @@
-var version = "0.19.0-alpha.4";
+var version = "0.19.0-alpha.6";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.27",
-	"@dynamic-labs/sdk-api": "0.0.263",
+	"@dynamic-labs/sdk-api": "0.0.270",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	yup: "0.32.11",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.19.0-alpha.4",
+  "version": "0.19.0-alpha.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -9,20 +9,20 @@
   "dependencies": {
     "react-focus-lock": "2.9.2",
     "@dynamic-labs/iconic": "0.1.27",
-    "@dynamic-labs/sdk-api": "0.0.263",
+    "@dynamic-labs/sdk-api": "0.0.270",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "country-list": "2.3.0",
     "yup": "0.32.11",
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.19.0-alpha.4",
-    "@dynamic-labs/multi-wallet": "0.19.0-alpha.4",
-    "@dynamic-labs/rpc-providers": "0.19.0-alpha.4",
-    "@dynamic-labs/types": "0.19.0-alpha.4",
-    "@dynamic-labs/utils": "0.19.0-alpha.4",
-    "@dynamic-labs/wallet-book": "0.19.0-alpha.4",
-    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.4",
+    "@dynamic-labs/logger": "0.19.0-alpha.6",
+    "@dynamic-labs/multi-wallet": "0.19.0-alpha.6",
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.6",
+    "@dynamic-labs/types": "0.19.0-alpha.6",
+    "@dynamic-labs/utils": "0.19.0-alpha.6",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.6",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.6",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/DynamicConnectButton/DynamicConnectButton.cjs

@@ -10,28 +10,16 @@ var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 var ConnectButton = require('./components/ConnectButton.cjs');
 
 const DynamicConnectButton = ({ buttonContainerClassName = '', buttonClassName = '', children, }) => {
-    const { isProjectSettingsLoading, setShowAuthFlow, setSelectedWalletConnector, loginWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { isProjectSettingsLoading, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const [didUserClick, setUserClicked] = React.useState(false);
     const handleOnClick = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!didUserClick) {
             setUserClicked(true);
         }
-        if (loginWithEmail) {
-            setView('login-with-email-or-wallet');
-        }
-        else {
-            setView('wallet-list');
-        }
         setSelectedWalletConnector(null);
         setShowAuthFlow(true);
-    }), [
-        didUserClick,
-        loginWithEmail,
-        setSelectedWalletConnector,
-        setShowAuthFlow,
-        setView,
-    ]);
+    }), [didUserClick, setSelectedWalletConnector, setShowAuthFlow, setView]);
     return (jsxRuntime.jsx(ConnectButton.ConnectButton, Object.assign({ isLoading: isProjectSettingsLoading, isActive: didUserClick, onClick: handleOnClick, buttonContainerClassName: buttonContainerClassName, buttonClassName: buttonClassName }, { children: children })));
 };
 

package/src/lib/components/DynamicConnectButton/DynamicConnectButton.js

@@ -6,28 +6,16 @@ import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import { ConnectButton } from './components/ConnectButton.js';
 
 const DynamicConnectButton = ({ buttonContainerClassName = '', buttonClassName = '', children, }) => {
-    const { isProjectSettingsLoading, setShowAuthFlow, setSelectedWalletConnector, loginWithEmail, } = useInternalDynamicContext();
+    const { isProjectSettingsLoading, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const [didUserClick, setUserClicked] = useState(false);
     const handleOnClick = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         if (!didUserClick) {
             setUserClicked(true);
         }
-        if (loginWithEmail) {
-            setView('login-with-email-or-wallet');
-        }
-        else {
-            setView('wallet-list');
-        }
         setSelectedWalletConnector(null);
         setShowAuthFlow(true);
-    }), [
-        didUserClick,
-        loginWithEmail,
-        setSelectedWalletConnector,
-        setShowAuthFlow,
-        setView,
-    ]);
+    }), [didUserClick, setSelectedWalletConnector, setShowAuthFlow, setView]);
     return (jsx(ConnectButton, Object.assign({ isLoading: isProjectSettingsLoading, isActive: didUserClick, onClick: handleOnClick, buttonContainerClassName: buttonContainerClassName, buttonClassName: buttonClassName }, { children: children })));
 };
 

package/src/lib/components/UserProfile/UserProfile.cjs

@@ -43,7 +43,7 @@ const UserProfile = ({ rootClassName }) => {
                         const { label } = index$1.getValueByKey(fieldsConfig.fieldsConfig, name);
                         const value = mapFieldKeyToValue(name);
                         return (jsxRuntime.jsx(UserProfileField.UserProfileField, { name: name, label: label, value: value }, name));
-                    }) })) }))), (providers === null || providers === void 0 ? void 0 : providers.length) > 0 && (jsxRuntime.jsx(UserProfileSection.UserProfileSection, Object.assign({ title: 'Social accounts' }, { children: jsxRuntime.jsx("div", Object.assign({ className: 'user-profile__social-accounts' }, { children: providers.map(({ authorizationUrl, provider }) => (jsxRuntime.jsx(UserProfileSocialAccount.UserProfileSocialAccount, { provider: provider }, provider))) })) })))] })));
+                    }) })) }))), (providers === null || providers === void 0 ? void 0 : providers.length) > 0 && (jsxRuntime.jsx(UserProfileSection.UserProfileSection, Object.assign({ title: 'Social accounts' }, { children: jsxRuntime.jsx("div", Object.assign({ className: 'user-profile__social-accounts' }, { children: providers.map(({ provider }) => (jsxRuntime.jsx(UserProfileSocialAccount.UserProfileSocialAccount, { provider: provider }, provider))) })) })))] })));
 };
 
 exports.UserProfile = UserProfile;

package/src/lib/components/UserProfile/UserProfile.js

@@ -39,7 +39,7 @@ const UserProfile = ({ rootClassName }) => {
                         const { label } = getValueByKey(fieldsConfig, name);
                         const value = mapFieldKeyToValue(name);
                         return (jsx(UserProfileField, { name: name, label: label, value: value }, name));
-                    }) })) }))), (providers === null || providers === void 0 ? void 0 : providers.length) > 0 && (jsx(UserProfileSection, Object.assign({ title: 'Social accounts' }, { children: jsx("div", Object.assign({ className: 'user-profile__social-accounts' }, { children: providers.map(({ authorizationUrl, provider }) => (jsx(UserProfileSocialAccount, { provider: provider }, provider))) })) })))] })));
+                    }) })) }))), (providers === null || providers === void 0 ? void 0 : providers.length) > 0 && (jsx(UserProfileSection, Object.assign({ title: 'Social accounts' }, { children: jsx("div", Object.assign({ className: 'user-profile__social-accounts' }, { children: providers.map(({ provider }) => (jsx(UserProfileSocialAccount, { provider: provider }, provider))) })) })))] })));
 };
 
 export { UserProfile };

package/src/lib/components/UserProfile/parts/UserProfileSocialAccount/UserProfileSocialAccount.cjs

@@ -60,7 +60,7 @@ const UserProfileSocialAccount = ({ provider, }) => {
     const isProviderLinked = isLinked(provider);
     const connectedAccountInfo = getLinkedAccountInformation(provider);
     const iconThemeVariant = useIconThemeVariant.useIconThemeVariant();
-    return (jsxRuntime.jsxs("div", Object.assign({ className: 'user-profile-social-account', "data-testid": `social-account-${provider}` }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'user-profile-social-account__icon' }, { children: isProviderLinked ? (jsxRuntime.jsx(ConnectedAccountAvatar.ConnectedAccountAvatar, { provider: provider, avatarUrl: connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.avatar, iconThemeVariant: iconThemeVariant })) : (jsxRuntime.jsx(iconic.SocialIcon, { name: provider, variant: iconThemeVariant })) })), jsxRuntime.jsx("div", Object.assign({ className: 'user-profile-social-account__label' }, { children: jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary' }, { children: (_a = connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.publicIdentifier) !== null && _a !== void 0 ? _a : helpers.capitalize(provider) })) })), isProviderLinked ? (jsxRuntime.jsx(Button.Button, { buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => unlinkSocialAccount(provider), loading: isProcessing, dataTestId: 'social-account-disconnect-button', typographyProps: {
+    return (jsxRuntime.jsxs("div", Object.assign({ className: 'user-profile-social-account', "data-testid": `social-account-${provider}` }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'user-profile-social-account__icon' }, { children: isProviderLinked ? (jsxRuntime.jsx(ConnectedAccountAvatar.ConnectedAccountAvatar, { provider: provider, avatarUrl: connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.avatar })) : (jsxRuntime.jsx(iconic.SocialIcon, { name: provider, variant: iconThemeVariant })) })), jsxRuntime.jsx("div", Object.assign({ className: 'user-profile-social-account__label' }, { children: jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary' }, { children: (_a = connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.publicIdentifier) !== null && _a !== void 0 ? _a : helpers.capitalize(provider) })) })), isProviderLinked ? (jsxRuntime.jsx(Button.Button, { buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => unlinkSocialAccount(provider), loading: isProcessing, dataTestId: 'social-account-disconnect-button', typographyProps: {
                     color: 'secondary',
                     variant: 'button_tertiary',
                 }, startSlot: 

package/src/lib/components/UserProfile/parts/UserProfileSocialAccount/UserProfileSocialAccount.js

@@ -56,7 +56,7 @@ const UserProfileSocialAccount = ({ provider, }) => {
     const isProviderLinked = isLinked(provider);
     const connectedAccountInfo = getLinkedAccountInformation(provider);
     const iconThemeVariant = useIconThemeVariant();
-    return (jsxs("div", Object.assign({ className: 'user-profile-social-account', "data-testid": `social-account-${provider}` }, { children: [jsx("div", Object.assign({ className: 'user-profile-social-account__icon' }, { children: isProviderLinked ? (jsx(ConnectedAccountAvatar, { provider: provider, avatarUrl: connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.avatar, iconThemeVariant: iconThemeVariant })) : (jsx(SocialIcon, { name: provider, variant: iconThemeVariant })) })), jsx("div", Object.assign({ className: 'user-profile-social-account__label' }, { children: jsx(Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary' }, { children: (_a = connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.publicIdentifier) !== null && _a !== void 0 ? _a : capitalize(provider) })) })), isProviderLinked ? (jsx(Button, { buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => unlinkSocialAccount(provider), loading: isProcessing, dataTestId: 'social-account-disconnect-button', typographyProps: {
+    return (jsxs("div", Object.assign({ className: 'user-profile-social-account', "data-testid": `social-account-${provider}` }, { children: [jsx("div", Object.assign({ className: 'user-profile-social-account__icon' }, { children: isProviderLinked ? (jsx(ConnectedAccountAvatar, { provider: provider, avatarUrl: connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.avatar })) : (jsx(SocialIcon, { name: provider, variant: iconThemeVariant })) })), jsx("div", Object.assign({ className: 'user-profile-social-account__label' }, { children: jsx(Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary' }, { children: (_a = connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.publicIdentifier) !== null && _a !== void 0 ? _a : capitalize(provider) })) })), isProviderLinked ? (jsx(Button, { buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => unlinkSocialAccount(provider), loading: isProcessing, dataTestId: 'social-account-disconnect-button', typographyProps: {
                     color: 'secondary',
                     variant: 'button_tertiary',
                 }, startSlot: 

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

@@ -691,9 +691,9 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
     return (jsxRuntime.jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsxRuntime.jsx(walletBook.WalletBookContextProvider, Object.assign({ walletBook: walletBook$1 }, { children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, Object.assign({ customerTheme: parseTheme.parseTheme(theme, ((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _h === void 0 ? void 0 : _h.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design }, { children: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsx(ViewContext.ViewContextProvider, Object.assign({ initialView: helpers.getInitialView({
                             connectedWallets,
+                            isAuthenticated,
                             isBridgeFlow,
                             isFullyConnected,
-                            loginWithEmail,
                         }) }, { children: jsxRuntime.jsx(AccountExistsContext.AccountExistsContextProvider, { children: jsxRuntime.jsx(WalletContext.WalletContextProvider, Object.assign({ canSync: didConnectedStateLoad }, { children: jsxRuntime.jsx(QrCodeContext.QrCodeContextProvider, { children: jsxRuntime.jsx(EmailVerificationContext.EmailVerificationContextProvider, { children: jsxRuntime.jsx(ErrorContext.ErrorContextProvider, { children: jsxRuntime.jsx(DynamicWidgetContext.DynamicWidgetContextProvider, { children: jsxRuntime.jsx(DynamicBridgeWidgetContext.DynamicBridgeWidgetContextProvider, { children: jsxRuntime.jsx(CaptchaContext.CaptchaContextProvider, { children: jsxRuntime.jsx(FundingContext.FundingContextProvider, { children: jsxRuntime.jsx(AccessDeniedContext.AccessDeniedContextProvider, { children: jsxRuntime.jsx(SendBalanceContext.SendBalanceContextProvider, { children: jsxRuntime.jsx(WalletGroupContext.WalletGroupContextProvider, { children: jsxRuntime.jsxs(UserFieldEditorContext.UserFieldEditorContextProvider, { children: [jsxRuntime.jsx(app.DynamicAuthFlow, {}), jsxRuntime.jsx(Toolkit.Toolkit, {}), jsxRuntime.jsx(FundingWidget.FundingWidget, {}), jsxRuntime.jsx(OAuthIFrameContainer.OAuthIFrameContainer, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) })) }) })) }) })) })) })));
 };
 

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

@@ -687,9 +687,9 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
     return (jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsx(WalletBookContextProvider, Object.assign({ walletBook: walletBook }, { children: jsx(ThemeContextProvider, Object.assign({ customerTheme: parseTheme(theme, ((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _h === void 0 ? void 0 : _h.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design }, { children: jsx(LoadingContextProvider, { children: jsx(ViewContextProvider, Object.assign({ initialView: getInitialView({
                             connectedWallets,
+                            isAuthenticated,
                             isBridgeFlow,
                             isFullyConnected,
-                            loginWithEmail,
                         }) }, { children: jsx(AccountExistsContextProvider, { children: jsx(WalletContextProvider, Object.assign({ canSync: didConnectedStateLoad }, { children: jsx(QrCodeContextProvider, { children: jsx(EmailVerificationContextProvider, { children: jsx(ErrorContextProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(CaptchaContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsx(WalletGroupContextProvider, { children: jsxs(UserFieldEditorContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), jsx(OAuthIFrameContainer, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) })) }) })) }) })) })) })));
 };
 

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

@@ -54,17 +54,16 @@ const initExpirationTime = (logout) => {
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
 };
-const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFullyConnected, }) => {
-    if (loginWithEmail) {
-        return 'login-with-email-or-wallet';
-    }
-    if (isFullyConnected) {
+const getInitialView = ({ connectedWallets, isBridgeFlow, isFullyConnected, isAuthenticated, }) => {
+    // when multiwallet enabled, and user wants to link wallet
+    // show wallet-list view
+    if (isFullyConnected || isAuthenticated) {
         return 'wallet-list';
     }
     if (isBridgeFlow && !connectedWallets.length) {
         return 'bridge-welcome';
     }
-    return 'wallet-list';
+    return 'login-with-email-or-wallet';
 };
 
 exports.getInitialView = getInitialView;

package/src/lib/context/DynamicContext/helpers.d.ts

@@ -2,9 +2,9 @@ import { Wallet } from '../../shared';
 import { ViewType } from '../ViewContext';
 export declare const isAuthTokenExpired: (token: string) => boolean;
 export declare const initExpirationTime: (logout: VoidFunction) => void;
-export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBridgeFlow, isFullyConnected, }: {
+export declare const getInitialView: ({ connectedWallets, isBridgeFlow, isFullyConnected, isAuthenticated, }: {
     connectedWallets: Wallet[];
-    loginWithEmail: boolean;
     isBridgeFlow: boolean;
+    isAuthenticated: boolean;
     isFullyConnected: boolean;
 }) => ViewType;

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

@@ -50,17 +50,16 @@ const initExpirationTime = (logout) => {
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
 };
-const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFullyConnected, }) => {
-    if (loginWithEmail) {
-        return 'login-with-email-or-wallet';
-    }
-    if (isFullyConnected) {
+const getInitialView = ({ connectedWallets, isBridgeFlow, isFullyConnected, isAuthenticated, }) => {
+    // when multiwallet enabled, and user wants to link wallet
+    // show wallet-list view
+    if (isFullyConnected || isAuthenticated) {
         return 'wallet-list';
     }
     if (isBridgeFlow && !connectedWallets.length) {
         return 'bridge-welcome';
     }
-    return 'wallet-list';
+    return 'login-with-email-or-wallet';
 };
 
 export { getInitialView, initExpirationTime, isAuthTokenExpired };

package/src/lib/context/ViewContext/ViewContext.d.ts

@@ -1,5 +1,5 @@
 import { SetStateAction, Dispatch, PropsWithChildren, FC } from 'react';
-export type ViewType = 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-email-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'wallet-cannot-be-transferred';
+export type ViewType = 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'wallet-cannot-be-transferred';
 export type ViewContextProps = {
     setView: Dispatch<SetStateAction<ViewType>>;
     view: ViewType;

package/src/lib/layout/DynamicAuthLayout/HelpContent/HelpContent.cjs

@@ -17,7 +17,8 @@ const HelpContentSwitch = () => {
     const { projectSettings, newToWeb3WalletChainMap, selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
     const isWalletListTypeView = React.useMemo(() => view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
-        view === 'login-with-email-or-wallet-full-wallet-list', [view]);
+        view === 'login-with-email-or-wallet-full-wallet-list' ||
+        view === 'login-with-wallet-only', [view]);
     const isPendingSignatureTypeView = React.useMemo(() => view === 'pending-signature-without-back-button' ||
         view === 'pending-signature', [view]);
     const isPendingConnectTypeView = React.useMemo(() => view === 'pending-connect' || view === 'qr-code', [view]);

package/src/lib/layout/DynamicAuthLayout/HelpContent/HelpContent.js

@@ -13,7 +13,8 @@ const HelpContentSwitch = () => {
     const { projectSettings, newToWeb3WalletChainMap, selectedWalletConnector } = useInternalDynamicContext();
     const isWalletListTypeView = useMemo(() => view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
-        view === 'login-with-email-or-wallet-full-wallet-list', [view]);
+        view === 'login-with-email-or-wallet-full-wallet-list' ||
+        view === 'login-with-wallet-only', [view]);
     const isPendingSignatureTypeView = useMemo(() => view === 'pending-signature-without-back-button' ||
         view === 'pending-signature', [view]);
     const isPendingConnectTypeView = useMemo(() => view === 'pending-connect' || view === 'qr-code', [view]);

package/src/lib/utils/functions/createUserProfile/createUserProfile.cjs

@@ -29,7 +29,7 @@ const createUserProfile = (decodedJwt) => {
         team: decodedJwt.team,
         username: decodedJwt.username,
     };
-    const userProfile = Object.assign({ chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain, ens: wallet === null || wallet === void 0 ? void 0 : wallet.nameService, environmentId: decodedJwt.environmentId, isAuthenticatedWithAWallet: ((_a = index.lastAuthenticatedAccount(decodedJwt)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain', lastVerifiedCredentialId: decodedJwt.lastVerifiedCredentialId, lists: decodedJwt.lists, newUser: decodedJwt.newUser, scope: decodedJwt.scope, sessionId: decodedJwt.sid, userId: decodedJwt.sub, verifiedCredentials: decodedJwt.verifiedCredentials || [], wallet: wallet === null || wallet === void 0 ? void 0 : wallet.walletName }, kyc);
+    const userProfile = Object.assign({ chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain, ens: wallet === null || wallet === void 0 ? void 0 : wallet.nameService, environmentId: decodedJwt.environmentId, isAuthenticatedWithAWallet: ((_a = index.lastAuthenticatedAccount(decodedJwt)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain', lastVerifiedCredentialId: decodedJwt.lastVerifiedCredentialId, lists: decodedJwt.lists, metadata: decodedJwt.metadata, newUser: decodedJwt.newUser, scope: decodedJwt.scope, sessionId: decodedJwt.sid, userId: decodedJwt.sub, verifiedCredentials: decodedJwt.verifiedCredentials || [], wallet: wallet === null || wallet === void 0 ? void 0 : wallet.walletName }, kyc);
     return userProfile;
 };
 

package/src/lib/utils/functions/createUserProfile/createUserProfile.js

@@ -25,7 +25,7 @@ const createUserProfile = (decodedJwt) => {
         team: decodedJwt.team,
         username: decodedJwt.username,
     };
-    const userProfile = Object.assign({ chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain, ens: wallet === null || wallet === void 0 ? void 0 : wallet.nameService, environmentId: decodedJwt.environmentId, isAuthenticatedWithAWallet: ((_a = lastAuthenticatedAccount(decodedJwt)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain', lastVerifiedCredentialId: decodedJwt.lastVerifiedCredentialId, lists: decodedJwt.lists, newUser: decodedJwt.newUser, scope: decodedJwt.scope, sessionId: decodedJwt.sid, userId: decodedJwt.sub, verifiedCredentials: decodedJwt.verifiedCredentials || [], wallet: wallet === null || wallet === void 0 ? void 0 : wallet.walletName }, kyc);
+    const userProfile = Object.assign({ chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain, ens: wallet === null || wallet === void 0 ? void 0 : wallet.nameService, environmentId: decodedJwt.environmentId, isAuthenticatedWithAWallet: ((_a = lastAuthenticatedAccount(decodedJwt)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain', lastVerifiedCredentialId: decodedJwt.lastVerifiedCredentialId, lists: decodedJwt.lists, metadata: decodedJwt.metadata, newUser: decodedJwt.newUser, scope: decodedJwt.scope, sessionId: decodedJwt.sid, userId: decodedJwt.sub, verifiedCredentials: decodedJwt.verifiedCredentials || [], wallet: wallet === null || wallet === void 0 ? void 0 : wallet.walletName }, kyc);
     return userProfile;
 };
 

package/src/lib/utils/functions/getDynamicLayoutData/getDynamicLayoutData.cjs

@@ -16,6 +16,9 @@ const getDynamicLayoutData = ({ view }) => {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Get your first wallet',
         },
+        'login-with-wallet-only': {
+            heading: 'Get your first wallet',
+        },
         'pending-connect': {
             heading: 'Connecting a wallet',
         },
@@ -44,6 +47,9 @@ const getDynamicLayoutData = ({ view }) => {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Select your wallet',
         },
+        'login-with-wallet-only': {
+            heading: 'Select your wallet',
+        },
         'wallet-connect-mobile-wallets-list': {
             heading: (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(iconic.WalletConnectIcon, { style: { height: '1.5rem', width: '1.5rem' } }), ' ', "WalletConnect wallets"] })),
         },

package/src/lib/utils/functions/getDynamicLayoutData/getDynamicLayoutData.js

@@ -12,6 +12,9 @@ const getDynamicLayoutData = ({ view }) => {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Get your first wallet',
         },
+        'login-with-wallet-only': {
+            heading: 'Get your first wallet',
+        },
         'pending-connect': {
             heading: 'Connecting a wallet',
         },
@@ -40,6 +43,9 @@ const getDynamicLayoutData = ({ view }) => {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Select your wallet',
         },
+        'login-with-wallet-only': {
+            heading: 'Select your wallet',
+        },
         'wallet-connect-mobile-wallets-list': {
             heading: (jsxs(Fragment, { children: [jsx(WalletConnectIcon, { style: { height: '1.5rem', width: '1.5rem' } }), ' ', "WalletConnect wallets"] })),
         },

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -91,12 +91,12 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
                 computeConnectedStateForWallets();
                 return;
             }
-            if (!primaryWallet.connector.isInstalledOnBrowser()) {
-                handleLogOut();
-                return;
-            }
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === errors.MISSING_ADDRESS_ERROR) {
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
                 setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -87,12 +87,12 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
                 computeConnectedStateForWallets();
                 return;
             }
-            if (!primaryWallet.connector.isInstalledOnBrowser()) {
-                handleLogOut();
-                return;
-            }
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
                 setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }

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

@@ -17,7 +17,8 @@ const useAuthLayoutChecks = (walletConnector) => {
     const { helpHeaderData } = getDynamicLayoutData.getDynamicLayoutData({ view });
     const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
-        view === 'login-with-email-or-wallet-full-wallet-list';
+        view === 'login-with-email-or-wallet-full-wallet-list' ||
+        view === 'login-with-wallet-only';
     const showHelpContent = Boolean(helpHeaderData &&
         // Notice the negation here
         !((view === 'qr-code' && !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.canConnectViaQrCode)) ||
@@ -51,13 +52,14 @@ const useAuthLayoutChecks = (walletConnector) => {
     const showToSFooter = Boolean(!isUserLinkingWallet.isUserLinkingWallet(user, view, mockedSDK) &&
         (view === 'wallet-list' ||
             view === 'wallet-connect-mobile-wallets-list' ||
-            // Don't show empty footer on login-with-email-or-wallet-full-wallet-list
-            (view === 'login-with-email-or-wallet' &&
+            // Don't show empty footer during the login
+            ((view === 'login-with-email-or-wallet' ||
+                view === 'login-with-email-or-wallet-full-wallet-list' ||
+                view === 'login-with-wallet-only') &&
                 (termsOfServiceUrl ||
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
-                    customTermsOfServices)) ||
-            view === 'login-with-email-or-wallet-full-wallet-list'));
+                    customTermsOfServices))));
     const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
         view !== 'login-with-email-verification';
     const showBackButton = view === 'qr-code' ||

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

@@ -13,7 +13,8 @@ const useAuthLayoutChecks = (walletConnector) => {
     const { helpHeaderData } = getDynamicLayoutData({ view });
     const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
-        view === 'login-with-email-or-wallet-full-wallet-list';
+        view === 'login-with-email-or-wallet-full-wallet-list' ||
+        view === 'login-with-wallet-only';
     const showHelpContent = Boolean(helpHeaderData &&
         // Notice the negation here
         !((view === 'qr-code' && !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.canConnectViaQrCode)) ||
@@ -47,13 +48,14 @@ const useAuthLayoutChecks = (walletConnector) => {
     const showToSFooter = Boolean(!isUserLinkingWallet(user, view, mockedSDK) &&
         (view === 'wallet-list' ||
             view === 'wallet-connect-mobile-wallets-list' ||
-            // Don't show empty footer on login-with-email-or-wallet-full-wallet-list
-            (view === 'login-with-email-or-wallet' &&
+            // Don't show empty footer during the login
+            ((view === 'login-with-email-or-wallet' ||
+                view === 'login-with-email-or-wallet-full-wallet-list' ||
+                view === 'login-with-wallet-only') &&
                 (termsOfServiceUrl ||
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
-                    customTermsOfServices)) ||
-            view === 'login-with-email-or-wallet-full-wallet-list'));
+                    customTermsOfServices))));
     const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
         view !== 'login-with-email-verification';
     const showBackButton = view === 'qr-code' ||

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

@@ -130,8 +130,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             network: currentWalletConnectoNetwork,
         });
     });
-    const shouldSkipCreatingVisit = React.useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
-        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
+    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -168,21 +167,20 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.name,
                 walletId,
             });
+            if (!shouldSkipCreatingVisit) {
+                // send information to backend to kick off background jobs
+                // so verify/sign on the next step could go by more quickly
+                // this is async work, but DO NOT AWAIT
+                api.createVisit({
+                    authMode,
+                    chain: walletChain || '',
+                    environmentId,
+                    publicWalletAddress,
+                    walletName: walletConnector.name,
+                    walletProvider: getWalletProvider.getWalletProvider(walletConnector),
+                });
+            }
         }
-        if (shouldSkipCreatingVisit) {
-            return Promise.resolve(publicWalletAddress);
-        }
-        // send information to backend to kick off background jobs
-        // so verify/sign on the next step could go by more quickly
-        // this is async work, but DO NOT AWAIT
-        api.createVisit({
-            authMode,
-            chain: walletChain || '',
-            environmentId,
-            publicWalletAddress,
-            walletName: walletConnector.name,
-            walletProvider: getWalletProvider.getWalletProvider(walletConnector),
-        });
         return Promise.resolve(publicWalletAddress);
     });
     const unlinkConnectedWallet = (walletId) => {

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

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect, useMemo } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import { getWalletConnectorByName, logger } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
@@ -126,8 +126,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             network: currentWalletConnectoNetwork,
         });
     });
-    const shouldSkipCreatingVisit = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
-        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
+    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -164,21 +163,20 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.name,
                 walletId,
             });
+            if (!shouldSkipCreatingVisit) {
+                // send information to backend to kick off background jobs
+                // so verify/sign on the next step could go by more quickly
+                // this is async work, but DO NOT AWAIT
+                createVisit({
+                    authMode,
+                    chain: walletChain || '',
+                    environmentId,
+                    publicWalletAddress,
+                    walletName: walletConnector.name,
+                    walletProvider: getWalletProvider(walletConnector),
+                });
+            }
         }
-        if (shouldSkipCreatingVisit) {
-            return Promise.resolve(publicWalletAddress);
-        }
-        // send information to backend to kick off background jobs
-        // so verify/sign on the next step could go by more quickly
-        // this is async work, but DO NOT AWAIT
-        createVisit({
-            authMode,
-            chain: walletChain || '',
-            environmentId,
-            publicWalletAddress,
-            walletName: walletConnector.name,
-            walletProvider: getWalletProvider(walletConnector),
-        });
         return Promise.resolve(publicWalletAddress);
     });
     const unlinkConnectedWallet = (walletId) => {

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

@@ -147,6 +147,7 @@ const useSocialAccounts = ({ sessionTimeout } = {
             if (!isValidMessage) {
                 return;
             }
+            setIsProcessing(true);
             if (!((_c = providersWaitingOauthMessages.current) === null || _c === void 0 ? void 0 : _c[provider])) {
                 handleError(types.SocialOAuthErrorCode.SESSION_TIMEOUT, `Linking ${provider} account session timeout.`);
                 return;
@@ -201,15 +202,9 @@ const useSocialAccounts = ({ sessionTimeout } = {
         if (!providersWithoutWindowOpenerRefence.includes(provider)) {
             // For provider that support window.opener, we need to clear all states/listeners when the window is closed
             authWindowInterval.current = setInterval(() => {
-                var _a;
                 if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
                     return;
                 }
-                // window was closed by user, before completing oauth
-                if ((_a = providersWaitingOauthMessages.current) === null || _a === void 0 ? void 0 : _a[provider]) {
-                    clearListeners();
-                    handleError(types.SocialOAuthErrorCode.OAUTH_WINDOW_CLOSED, `Linking ${provider} account window closed.`);
-                }
                 clearInterval(authWindowInterval.current);
                 setIsProcessing(false);
             });