@dynamic-labs/sdk-react-core 1.1.0-alpha.16 → 1.1.0-alpha.18

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+## [1.1.0-alpha.18](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.17...v1.1.0-alpha.18) (2024-01-30)
+
+
+### Bug Fixes
+
+* catch email_associated_with_different_provider from response ([#4532](https://github.com/dynamic-labs/DynamicAuth/issues/4532)) ([52be1b4](https://github.com/dynamic-labs/DynamicAuth/commit/52be1b45af46c2b70972b99d73387eb4d7161ec6))
+
+## [1.1.0-alpha.17](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.16...v1.1.0-alpha.17) (2024-01-30)
+
+
+### Features
+
+* add sendRawTransaction to BitcoinWalletConnector ([2e86c5a](https://github.com/dynamic-labs/DynamicAuth/commit/2e86c5a5245bd0fc29162ef1f7fe2fbd65245fe1))
+
+
+### Bug Fixes
+
+* properly handle AccountExistsError for signInOAuth ([#4529](https://github.com/dynamic-labs/DynamicAuth/issues/4529)) ([d37fdc3](https://github.com/dynamic-labs/DynamicAuth/commit/d37fdc310fe4b70f8948fd5ed3d058342afbe08f))
+
 ## [1.1.0-alpha.16](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.15...v1.1.0-alpha.16) (2024-01-30)
 
 

package/package.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.1.0-alpha.16";
+var version = "1.1.0-alpha.18";
 var dependencies = {
-	"@dynamic-labs/iconic": "0.1.48",
+	"@dynamic-labs/iconic": "0.1.50",
 	"@dynamic-labs/sdk-api": "0.0.356",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",

package/package.js

@@ -1,6 +1,6 @@
-var version = "1.1.0-alpha.16";
+var version = "1.1.0-alpha.18";
 var dependencies = {
-	"@dynamic-labs/iconic": "0.1.48",
+	"@dynamic-labs/iconic": "0.1.50",
 	"@dynamic-labs/sdk-api": "0.0.356",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "1.1.0-alpha.16",
+  "version": "1.1.0-alpha.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
     "directory": "packages/sdk-react-core"
   },
   "dependencies": {
-    "@dynamic-labs/iconic": "0.1.48",
+    "@dynamic-labs/iconic": "0.1.50",
     "@dynamic-labs/sdk-api": "0.0.356",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "country-list": "2.3.0",
@@ -17,15 +17,15 @@
     "react-focus-lock": "2.9.2",
     "react-i18next": "^13.2.0",
     "yup": "0.32.11",
-    "@dynamic-labs/ethereum": "1.1.0-alpha.16",
-    "@dynamic-labs/logger": "1.1.0-alpha.16",
-    "@dynamic-labs/multi-wallet": "1.1.0-alpha.16",
-    "@dynamic-labs/rpc-providers": "1.1.0-alpha.16",
-    "@dynamic-labs/types": "1.1.0-alpha.16",
-    "@dynamic-labs/utils": "1.1.0-alpha.16",
-    "@dynamic-labs/viem-utils": "1.1.0-alpha.16",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.16",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.16",
+    "@dynamic-labs/ethereum": "1.1.0-alpha.18",
+    "@dynamic-labs/logger": "1.1.0-alpha.18",
+    "@dynamic-labs/multi-wallet": "1.1.0-alpha.18",
+    "@dynamic-labs/rpc-providers": "1.1.0-alpha.18",
+    "@dynamic-labs/types": "1.1.0-alpha.18",
+    "@dynamic-labs/utils": "1.1.0-alpha.18",
+    "@dynamic-labs/viem-utils": "1.1.0-alpha.18",
+    "@dynamic-labs/wallet-book": "1.1.0-alpha.18",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.18",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/AuthProviderIcon/AuthProviderIcon.cjs

@@ -12,7 +12,7 @@ require('../../context/ViewContext/ViewContext.cjs');
 require('react');
 var embeddedWalletIcon = require('../../shared/assets/embedded-wallet-icon.cjs');
 require('../../utils/constants/colors.cjs');
-require('../../utils/constants/values.cjs');
+var values = require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
@@ -59,6 +59,7 @@ require('../OverlayCard/OverlayCard.context.cjs');
 require('../PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../views/WalletList/WalletList.cjs');
 var WalletIconWithStatus = require('../../widgets/DynamicWidget/components/WalletIconWithStatus/WalletIconWithStatus.cjs');
+var WalletIconWithNetwork = require('../../widgets/DynamicWidget/components/WalletIconWithNetwork/WalletIconWithNetwork.cjs');
 require('qrcode');
 require('@hcaptcha/react-hcaptcha');
 require('../../context/LoadingContext/LoadingContext.cjs');
@@ -100,6 +101,7 @@ const getMagicEmailOrSocialIcon = ({ findSocialIcon, wallet, jwt, }) => {
     return null;
 };
 const AuthProviderIcon = ({ jwt, iconSize = 64, showStatus, wallet, }) => {
+    var _a, _b;
     const { primaryWallet, selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
     const { deniedOauthProvider, deniedAddress } = AccessDeniedContext.useAccessDeniedContext();
     const findSocialIcon = useFindSocialIcon.useFindSocialIcon();
@@ -127,6 +129,12 @@ const AuthProviderIcon = ({ jwt, iconSize = 64, showStatus, wallet, }) => {
         jwt,
         wallet: walletForIcon,
     });
+    const isEmbeddedWallet = (_b = (_a = walletForIcon === null || walletForIcon === void 0 ? void 0 : walletForIcon.connector) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.startsWith('turnkey');
+    if (isEmbeddedWallet && MagicEmailOrSocialIcon) {
+        const chain = walletForIcon === null || walletForIcon === void 0 ? void 0 : walletForIcon.chain;
+        const chainEnum = values.VerifiedCredentialNameToChainEnum[chain];
+        return (jsxRuntime.jsx(WalletIconWithNetwork.WalletIconWithNetwork, { iconSize: iconSize, Icon: MagicEmailOrSocialIcon, chainName: chainEnum }));
+    }
     if (MagicEmailOrSocialIcon) {
         return showStatus ? (jsxRuntime.jsx(IconWithStatus.IconWithStatus, { iconSize: iconSize, Icon: MagicEmailOrSocialIcon, variant: walletForIcon.connected ? 'green' : 'red' })) : (jsxRuntime.jsx(MagicEmailOrSocialIcon, { style: { height: pixelToRem.pixelToRem(iconSize), width: pixelToRem.pixelToRem(iconSize) } }));
     }

package/src/lib/components/AuthProviderIcon/AuthProviderIcon.js

@@ -8,7 +8,7 @@ import '../../context/ViewContext/ViewContext.js';
 import 'react';
 import { ReactComponent as SvgEmbeddedWalletIcon } from '../../shared/assets/embedded-wallet-icon.js';
 import '../../utils/constants/colors.js';
-import '../../utils/constants/values.js';
+import { VerifiedCredentialNameToChainEnum } from '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
@@ -55,6 +55,7 @@ import '../OverlayCard/OverlayCard.context.js';
 import '../PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../views/WalletList/WalletList.js';
 import { WalletIconWithStatus } from '../../widgets/DynamicWidget/components/WalletIconWithStatus/WalletIconWithStatus.js';
+import { WalletIconWithNetwork } from '../../widgets/DynamicWidget/components/WalletIconWithNetwork/WalletIconWithNetwork.js';
 import 'qrcode';
 import '@hcaptcha/react-hcaptcha';
 import '../../context/LoadingContext/LoadingContext.js';
@@ -96,6 +97,7 @@ const getMagicEmailOrSocialIcon = ({ findSocialIcon, wallet, jwt, }) => {
     return null;
 };
 const AuthProviderIcon = ({ jwt, iconSize = 64, showStatus, wallet, }) => {
+    var _a, _b;
     const { primaryWallet, selectedWalletConnector } = useInternalDynamicContext();
     const { deniedOauthProvider, deniedAddress } = useAccessDeniedContext();
     const findSocialIcon = useFindSocialIcon();
@@ -123,6 +125,12 @@ const AuthProviderIcon = ({ jwt, iconSize = 64, showStatus, wallet, }) => {
         jwt,
         wallet: walletForIcon,
     });
+    const isEmbeddedWallet = (_b = (_a = walletForIcon === null || walletForIcon === void 0 ? void 0 : walletForIcon.connector) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.startsWith('turnkey');
+    if (isEmbeddedWallet && MagicEmailOrSocialIcon) {
+        const chain = walletForIcon === null || walletForIcon === void 0 ? void 0 : walletForIcon.chain;
+        const chainEnum = VerifiedCredentialNameToChainEnum[chain];
+        return (jsx(WalletIconWithNetwork, { iconSize: iconSize, Icon: MagicEmailOrSocialIcon, chainName: chainEnum }));
+    }
     if (MagicEmailOrSocialIcon) {
         return showStatus ? (jsx(IconWithStatus, { iconSize: iconSize, Icon: MagicEmailOrSocialIcon, variant: walletForIcon.connected ? 'green' : 'red' })) : (jsx(MagicEmailOrSocialIcon, { style: { height: pixelToRem(iconSize), width: pixelToRem(iconSize) } }));
     }

package/src/lib/data/api.cjs

@@ -398,6 +398,9 @@ const signInOAuth = (environmentId, providerType, { code, codeVerifier, state, c
                 walletPublicKey: data.payload.walletPublicKey,
             });
         }
+        if (data.code === 'email_associated_with_different_provider') {
+            throw new utils.AccountExistsError(data.error, data.payload);
+        }
         return undefined;
     }
 });

package/src/lib/data/api.js

@@ -394,6 +394,9 @@ const signInOAuth = (environmentId, providerType, { code, codeVerifier, state, c
                 walletPublicKey: data.payload.walletPublicKey,
             });
         }
+        if (data.code === 'email_associated_with_different_provider') {
+            throw new AccountExistsError(data.error, data.payload);
+        }
         return undefined;
     }
 });