@dynamic-labs/sdk-react-core 4.48.2 → 4.50.1

package/src/lib/context/PhantomRedirectContext/useResponseHandlers.cjs

@@ -15,7 +15,7 @@ require('../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../ViewContext/ViewContext.cjs');
-require('../../shared/logger.cjs');
+var logger = require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
@@ -124,12 +124,19 @@ const useResponseHandlers = () => {
         .map(({ walletConnector }) => walletConnector)
         .find(walletConnectorCore.isPhantomRedirectConnector);
     const handleConnectResponse = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] called');
         if (!phantomRedirectConnector) {
+            logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] no phantomRedirectConnector');
             return;
         }
         // this completes the connection step
+        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] calling getSession');
         yield phantomRedirectConnector.getSession();
+        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] getSession complete, calling connectWallet');
         const connectResult = yield connectWallet(phantomRedirectConnector);
+        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] connectWallet result', {
+            connectResult,
+        });
         // Check if we have a connection type
         const connectionType = utils.StorageService.getItem(utils.PHANTOM_REDIRECT_CONNECTION_TYPE_KEY);
         // If this is an external wallet funding connection, then we need to
@@ -175,32 +182,74 @@ const useResponseHandlers = () => {
     ]);
     const completeWalletTransfer = useTransferWallet.useTransferWallet();
     const handleUserResponse = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        logger.logger.debug('[PhantomRedirect handleUserResponse] called');
         if (!phantomRedirectConnector) {
+            logger.logger.debug('[PhantomRedirect handleUserResponse] no phantomRedirectConnector');
             return;
         }
         setSelectedWalletConnectorKey('phantom');
         const [address] = yield phantomRedirectConnector.getConnectedAccounts();
+        logger.logger.debug('[PhantomRedirect handleUserResponse] got address', {
+            address,
+        });
         const method = phantomRedirectConnector.consumeMethod();
+        logger.logger.debug('[PhantomRedirect handleUserResponse] consumed method', {
+            method,
+        });
         switch (method) {
             case 'signAndSendTransaction': {
-                const { signature } = phantomRedirectConnector.extractSignature();
-                phantomRedirectConnector.emit('signAndSendTransaction', {
-                    signature,
-                });
+                // Phantom redirect doesn't support signAndSendTransaction natively,
+                // so we extract the signed transaction and send it ourselves
+                const signAndSendRequestId = (_a = phantomRedirectConnector.consumeRequestId) === null || _a === void 0 ? void 0 : _a.call(phantomRedirectConnector);
+                logger.logger.debug('[PhantomRedirect handleUserResponse] handling signAndSendTransaction');
+                try {
+                    const signature = yield phantomRedirectConnector.extractAndSendTransaction();
+                    phantomRedirectConnector.emit('signAndSendTransaction', {
+                        requestId: signAndSendRequestId,
+                        signature,
+                    });
+                }
+                catch (error) {
+                    logger.logger.error('[PhantomRedirect handleUserResponse] Failed to send transaction', { error });
+                    phantomRedirectConnector.emit('signAndSendTransaction', {
+                        errorCode: 'SEND_FAILED',
+                        errorMessage: error instanceof Error
+                            ? error.message
+                            : 'Failed to send transaction',
+                        requestId: signAndSendRequestId,
+                    });
+                }
                 break;
             }
-            case 'signAllTransactions':
+            case 'signAllTransactions': {
+                const signAllRequestId = (_b = phantomRedirectConnector.consumeRequestId) === null || _b === void 0 ? void 0 : _b.call(phantomRedirectConnector);
+                logger.logger.debug('[PhantomRedirect handleUserResponse] handling signAllTransactions');
                 phantomRedirectConnector.emit('signAllTransactions', {
+                    requestId: signAllRequestId,
                     transactions: phantomRedirectConnector.extractTransactions(),
                 });
                 break;
-            case 'signTransaction':
+            }
+            case 'signTransaction': {
+                const requestId = (_c = phantomRedirectConnector.consumeRequestId) === null || _c === void 0 ? void 0 : _c.call(phantomRedirectConnector);
+                logger.logger.debug('[PhantomRedirect handleUserResponse] handling signTransaction');
                 phantomRedirectConnector.emit('signTransaction', {
+                    requestId,
                     transaction: phantomRedirectConnector.extractTransaction(),
                 });
                 break;
+            }
             case 'signMessage': {
+                logger.logger.debug('[PhantomRedirect handleUserResponse] handling signMessage response');
                 const { signature, message } = phantomRedirectConnector.extractSignature();
+                logger.logger.debug('[PhantomRedirect handleUserResponse] extracted signature and message', {
+                    message,
+                    messageLength: message === null || message === void 0 ? void 0 : message.length,
+                    messagePreview: message === null || message === void 0 ? void 0 : message.substring(0, 200),
+                    signature,
+                    signatureLength: signature === null || signature === void 0 ? void 0 : signature.length,
+                });
                 const signatureState = utils.StorageService.getItem(localStorage.PHANTOM_SIGNATURE_STATE);
                 utils.StorageService.removeItem(localStorage.PHANTOM_SIGNATURE_STATE);
                 if ((signatureState === null || signatureState === void 0 ? void 0 : signatureState.verificationType) === 'awaiting_transfer') {
@@ -208,6 +257,12 @@ const useResponseHandlers = () => {
                         appName,
                         siweStatement,
                     });
+                    logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] completeWalletTransfer', {
+                        messageToSignOverride: message,
+                        overrideSiweStatement: siweStatementToUse,
+                        publicWalletAddress: address,
+                        signedMessageOverride: signature,
+                    });
                     yield completeWalletTransfer({
                         messageToSignOverride: message,
                         overrideSiweStatement: siweStatementToUse,
@@ -219,17 +274,45 @@ const useResponseHandlers = () => {
                 }
                 else if ((signatureState === null || signatureState === void 0 ? void 0 : signatureState.verificationType) === 'awaiting_verification' ||
                     !user) {
-                    pushView('wallet-redirect-view');
-                    yield verifyWallet({
-                        captchaToken: getCaptchaToken(),
-                        messageToSignOverride: message,
-                        publicWalletAddress: address,
-                        signedMessageOverride: signature,
-                        walletConnector: phantomRedirectConnector,
+                    logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] calling verifyWallet', {
+                        address,
+                        captchaTokenPresent: Boolean(getCaptchaToken()),
+                        message,
+                        messageLength: message === null || message === void 0 ? void 0 : message.length,
+                        signature,
+                        signatureLength: signature === null || signature === void 0 ? void 0 : signature.length,
+                        user: Boolean(user),
+                        verificationType: signatureState === null || signatureState === void 0 ? void 0 : signatureState.verificationType,
                     });
+                    pushView('wallet-redirect-view');
+                    try {
+                        yield verifyWallet({
+                            captchaToken: getCaptchaToken(),
+                            messageToSignOverride: message,
+                            publicWalletAddress: address,
+                            signedMessageOverride: signature,
+                            walletConnector: phantomRedirectConnector,
+                        });
+                        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] verifyWallet completed successfully');
+                    }
+                    catch (error) {
+                        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] verifyWallet threw error', { error });
+                        throw error;
+                    }
                 }
                 else {
+                    // Post-auth sign: emit the signMessage event with the requestId and message
+                    // so the listener from signMessage() can match and self-cleanup
+                    const requestId = (_d = phantomRedirectConnector.consumeRequestId) === null || _d === void 0 ? void 0 : _d.call(phantomRedirectConnector);
+                    logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] emitting signMessage event (post-auth sign)', {
+                        message,
+                        requestId,
+                        signature,
+                        signatureLength: signature === null || signature === void 0 ? void 0 : signature.length,
+                    });
                     phantomRedirectConnector.emit('signMessage', {
+                        message,
+                        requestId,
                         signature,
                     });
                 }
@@ -249,14 +332,23 @@ const useResponseHandlers = () => {
     ]);
     const handleErrorResponse = React.useCallback((params) => {
         var _a;
-        if (!phantomRedirectConnector)
+        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] called', {
+            errorCode: params.get('errorCode'),
+            errorMessage: params.get('errorMessage'),
+        });
+        if (!phantomRedirectConnector) {
+            logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] no phantomRedirectConnector');
             return;
+        }
         const errorCode = params.get('errorCode');
         const errorMessage = (_a = params.get('errorMessage')) !== null && _a !== void 0 ? _a : undefined;
-        if (!errorCode)
+        if (!errorCode) {
+            logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] no errorCode');
             return;
+        }
         setErrorMessage(errorCode);
         const method = phantomRedirectConnector.consumeMethod();
+        logger.logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] consumed method, emitting error', { errorCode, errorMessage, method });
         switch (method) {
             case 'signAndSendTransaction':
                 phantomRedirectConnector.emit('signAndSendTransaction', {

package/src/lib/context/PhantomRedirectContext/useResponseHandlers.js

@@ -11,7 +11,7 @@ import '../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../ViewContext/ViewContext.js';
-import '../../shared/logger.js';
+import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
@@ -120,12 +120,19 @@ const useResponseHandlers = () => {
         .map(({ walletConnector }) => walletConnector)
         .find(isPhantomRedirectConnector);
     const handleConnectResponse = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] called');
         if (!phantomRedirectConnector) {
+            logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] no phantomRedirectConnector');
             return;
         }
         // this completes the connection step
+        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] calling getSession');
         yield phantomRedirectConnector.getSession();
+        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] getSession complete, calling connectWallet');
         const connectResult = yield connectWallet(phantomRedirectConnector);
+        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleConnectResponse] connectWallet result', {
+            connectResult,
+        });
         // Check if we have a connection type
         const connectionType = StorageService.getItem(PHANTOM_REDIRECT_CONNECTION_TYPE_KEY);
         // If this is an external wallet funding connection, then we need to
@@ -171,32 +178,74 @@ const useResponseHandlers = () => {
     ]);
     const completeWalletTransfer = useTransferWallet();
     const handleUserResponse = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        logger.debug('[PhantomRedirect handleUserResponse] called');
         if (!phantomRedirectConnector) {
+            logger.debug('[PhantomRedirect handleUserResponse] no phantomRedirectConnector');
             return;
         }
         setSelectedWalletConnectorKey('phantom');
         const [address] = yield phantomRedirectConnector.getConnectedAccounts();
+        logger.debug('[PhantomRedirect handleUserResponse] got address', {
+            address,
+        });
         const method = phantomRedirectConnector.consumeMethod();
+        logger.debug('[PhantomRedirect handleUserResponse] consumed method', {
+            method,
+        });
         switch (method) {
             case 'signAndSendTransaction': {
-                const { signature } = phantomRedirectConnector.extractSignature();
-                phantomRedirectConnector.emit('signAndSendTransaction', {
-                    signature,
-                });
+                // Phantom redirect doesn't support signAndSendTransaction natively,
+                // so we extract the signed transaction and send it ourselves
+                const signAndSendRequestId = (_a = phantomRedirectConnector.consumeRequestId) === null || _a === void 0 ? void 0 : _a.call(phantomRedirectConnector);
+                logger.debug('[PhantomRedirect handleUserResponse] handling signAndSendTransaction');
+                try {
+                    const signature = yield phantomRedirectConnector.extractAndSendTransaction();
+                    phantomRedirectConnector.emit('signAndSendTransaction', {
+                        requestId: signAndSendRequestId,
+                        signature,
+                    });
+                }
+                catch (error) {
+                    logger.error('[PhantomRedirect handleUserResponse] Failed to send transaction', { error });
+                    phantomRedirectConnector.emit('signAndSendTransaction', {
+                        errorCode: 'SEND_FAILED',
+                        errorMessage: error instanceof Error
+                            ? error.message
+                            : 'Failed to send transaction',
+                        requestId: signAndSendRequestId,
+                    });
+                }
                 break;
             }
-            case 'signAllTransactions':
+            case 'signAllTransactions': {
+                const signAllRequestId = (_b = phantomRedirectConnector.consumeRequestId) === null || _b === void 0 ? void 0 : _b.call(phantomRedirectConnector);
+                logger.debug('[PhantomRedirect handleUserResponse] handling signAllTransactions');
                 phantomRedirectConnector.emit('signAllTransactions', {
+                    requestId: signAllRequestId,
                     transactions: phantomRedirectConnector.extractTransactions(),
                 });
                 break;
-            case 'signTransaction':
+            }
+            case 'signTransaction': {
+                const requestId = (_c = phantomRedirectConnector.consumeRequestId) === null || _c === void 0 ? void 0 : _c.call(phantomRedirectConnector);
+                logger.debug('[PhantomRedirect handleUserResponse] handling signTransaction');
                 phantomRedirectConnector.emit('signTransaction', {
+                    requestId,
                     transaction: phantomRedirectConnector.extractTransaction(),
                 });
                 break;
+            }
             case 'signMessage': {
+                logger.debug('[PhantomRedirect handleUserResponse] handling signMessage response');
                 const { signature, message } = phantomRedirectConnector.extractSignature();
+                logger.debug('[PhantomRedirect handleUserResponse] extracted signature and message', {
+                    message,
+                    messageLength: message === null || message === void 0 ? void 0 : message.length,
+                    messagePreview: message === null || message === void 0 ? void 0 : message.substring(0, 200),
+                    signature,
+                    signatureLength: signature === null || signature === void 0 ? void 0 : signature.length,
+                });
                 const signatureState = StorageService.getItem(PHANTOM_SIGNATURE_STATE);
                 StorageService.removeItem(PHANTOM_SIGNATURE_STATE);
                 if ((signatureState === null || signatureState === void 0 ? void 0 : signatureState.verificationType) === 'awaiting_transfer') {
@@ -204,6 +253,12 @@ const useResponseHandlers = () => {
                         appName,
                         siweStatement,
                     });
+                    logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] completeWalletTransfer', {
+                        messageToSignOverride: message,
+                        overrideSiweStatement: siweStatementToUse,
+                        publicWalletAddress: address,
+                        signedMessageOverride: signature,
+                    });
                     yield completeWalletTransfer({
                         messageToSignOverride: message,
                         overrideSiweStatement: siweStatementToUse,
@@ -215,17 +270,45 @@ const useResponseHandlers = () => {
                 }
                 else if ((signatureState === null || signatureState === void 0 ? void 0 : signatureState.verificationType) === 'awaiting_verification' ||
                     !user) {
-                    pushView('wallet-redirect-view');
-                    yield verifyWallet({
-                        captchaToken: getCaptchaToken(),
-                        messageToSignOverride: message,
-                        publicWalletAddress: address,
-                        signedMessageOverride: signature,
-                        walletConnector: phantomRedirectConnector,
+                    logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] calling verifyWallet', {
+                        address,
+                        captchaTokenPresent: Boolean(getCaptchaToken()),
+                        message,
+                        messageLength: message === null || message === void 0 ? void 0 : message.length,
+                        signature,
+                        signatureLength: signature === null || signature === void 0 ? void 0 : signature.length,
+                        user: Boolean(user),
+                        verificationType: signatureState === null || signatureState === void 0 ? void 0 : signatureState.verificationType,
                     });
+                    pushView('wallet-redirect-view');
+                    try {
+                        yield verifyWallet({
+                            captchaToken: getCaptchaToken(),
+                            messageToSignOverride: message,
+                            publicWalletAddress: address,
+                            signedMessageOverride: signature,
+                            walletConnector: phantomRedirectConnector,
+                        });
+                        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] verifyWallet completed successfully');
+                    }
+                    catch (error) {
+                        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] verifyWallet threw error', { error });
+                        throw error;
+                    }
                 }
                 else {
+                    // Post-auth sign: emit the signMessage event with the requestId and message
+                    // so the listener from signMessage() can match and self-cleanup
+                    const requestId = (_d = phantomRedirectConnector.consumeRequestId) === null || _d === void 0 ? void 0 : _d.call(phantomRedirectConnector);
+                    logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleUserResponse] emitting signMessage event (post-auth sign)', {
+                        message,
+                        requestId,
+                        signature,
+                        signatureLength: signature === null || signature === void 0 ? void 0 : signature.length,
+                    });
                     phantomRedirectConnector.emit('signMessage', {
+                        message,
+                        requestId,
                         signature,
                     });
                 }
@@ -245,14 +328,23 @@ const useResponseHandlers = () => {
     ]);
     const handleErrorResponse = useCallback((params) => {
         var _a;
-        if (!phantomRedirectConnector)
+        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] called', {
+            errorCode: params.get('errorCode'),
+            errorMessage: params.get('errorMessage'),
+        });
+        if (!phantomRedirectConnector) {
+            logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] no phantomRedirectConnector');
             return;
+        }
         const errorCode = params.get('errorCode');
         const errorMessage = (_a = params.get('errorMessage')) !== null && _a !== void 0 ? _a : undefined;
-        if (!errorCode)
+        if (!errorCode) {
+            logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] no errorCode');
             return;
+        }
         setErrorMessage(errorCode);
         const method = phantomRedirectConnector.consumeMethod();
+        logger.logVerboseTroubleshootingMessage('[PhantomRedirect handleErrorResponse] consumed method, emitting error', { errorCode, errorMessage, method });
         switch (method) {
             case 'signAndSendTransaction':
                 phantomRedirectConnector.emit('signAndSendTransaction', {

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

@@ -1,6 +1,6 @@
 import { ComponentProps, FC } from 'react';
 import { viewToComponentMap } from '../../../views/viewToComponentMap';
-export type ViewType = 'access-blocked' | 'account-upgraded' | 'backup-unsuccessful' | 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-no-wallet' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'login-with-sms-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' | 'verify-email' | 'verify-sms' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'unified-wallet-exchange-list' | 'external-funding-exchange-list' | 'external-funding-wallet-list' | 'mfa-exchange-view' | 'exchange-whitelist-warning' | 'sandbox-maximum-threshold-reached' | 'multi-wallet-wallet-list' | 'duplicate-wallet' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'select-wallet-in-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' | 'merge-user-accounts-conflicts' | 'merge-user-accounts-with-same-email' | 'mfa-choose-device' | 'mfa-recovery' | 'mfa-secure-device' | 'mfa-secure-device-help' | 'mfa-verification' | 'mfa-display-backup-codes' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-recovery-add-email' | 'global-wallet-confirm' | 'global-wallet-malicious' | 'global-wallet-info' | 'passkey-recovery-start' | 'passkey-recovery-bundle' | 'passkey-recovery-complete' | 'passkey-new-domain-detected' | 'passkey-setup' | 'passkey-confirm' | 'embedded-delete-view' | 'embedded-reveal-view' | 'export-shares-view' | 'embedded-reveal-account-view' | 'embedded-wallet-auth-choice' | 'rename-passkey' | 'wallet-redirect-view' | 'wallet-upgrade-flow-view' | 'mobile-wallet-redirect-view' | 'farcaster-connect-view' | 'embedded-wallet-exists' | 'user-delete-account' | 'waas-upgrade-view' | 'wallet-delegation-view';
+export type ViewType = 'access-blocked' | 'account-upgraded' | 'backup-unsuccessful' | 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-no-wallet' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'login-with-sms-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' | 'verify-email' | 'verify-sms' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'unified-wallet-exchange-list' | 'external-funding-exchange-list' | 'external-funding-wallet-list' | 'mfa-exchange-view' | 'exchange-whitelist-warning' | 'sandbox-maximum-threshold-reached' | 'multi-wallet-wallet-list' | 'duplicate-wallet' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'select-wallet-in-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' | 'merge-user-accounts-conflicts' | 'merge-user-accounts-with-same-email' | 'mfa-choose-device' | 'mfa-recovery' | 'mfa-secure-device' | 'mfa-secure-device-help' | 'mfa-verification' | 'mfa-display-backup-codes' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-recovery-add-email' | 'global-wallet-confirm' | 'global-wallet-malicious' | 'global-wallet-info' | 'passkey-recovery-start' | 'passkey-recovery-bundle' | 'passkey-recovery-complete' | 'passkey-new-domain-detected' | 'passkey-setup' | 'passkey-confirm' | 'embedded-delete-view' | 'embedded-reveal-view' | 'export-shares-view' | 'embedded-reveal-account-view' | 'embedded-wallet-auth-choice' | 'rename-passkey' | 'wallet-redirect-view' | 'wallet-upgrade-flow-view' | 'mobile-wallet-redirect-view' | 'farcaster-connect-view' | 'embedded-wallet-exists' | 'user-delete-account' | 'waas-upgrade-view' | 'wallet-delegation-view' | 'waas-backup-view' | 'waas-backup-info-view' | 'waas-backup-cloud-provider-view' | 'waas-backup-download-view' | 'waas-backup-progress-view' | 'waas-backup-success-view';
 export type ViewMapConstraint = Record<ViewType, FC<any>>;
 export type ViewMap = typeof viewToComponentMap;
 export type ViewState<T extends ViewType> = {

package/src/lib/data/api/onramp/onramp.cjs

@@ -6,12 +6,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var api = require('../api.cjs');
 
-const getOnrampProviders = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ chain, environmentId, networkId, token, tokenAmount, walletAddress, currency, includeDisabled, }) {
+const getOnrampProviders = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ chain, environmentId, networkId, token, tokenAmount, walletAddress, currency, includeDisabled, merchantName, }) {
     const { onramps } = yield api.sdkApi().getSupportedOnramps({
         chain,
         currency,
         environmentId,
         includeDisabled,
+        merchantName,
         networkId: networkId ? String(networkId) : undefined,
         token,
         tokenAmount,

package/src/lib/data/api/onramp/onramp.d.ts

@@ -1,5 +1,5 @@
 import { RampConfiguration } from '@dynamic-labs/sdk-api-core';
-export declare const getOnrampProviders: ({ chain, environmentId, networkId, token, tokenAmount, walletAddress, currency, includeDisabled, }: {
+export declare const getOnrampProviders: ({ chain, environmentId, networkId, token, tokenAmount, walletAddress, currency, includeDisabled, merchantName, }: {
     chain: string;
     environmentId: string;
     networkId?: string | number;
@@ -8,4 +8,5 @@ export declare const getOnrampProviders: ({ chain, environmentId, networkId, tok
     walletAddress: string;
     currency?: string;
     includeDisabled?: boolean;
+    merchantName?: string;
 }) => Promise<RampConfiguration[]>;

package/src/lib/data/api/onramp/onramp.js

@@ -2,12 +2,13 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { sdkApi } from '../api.js';
 
-const getOnrampProviders = (_a) => __awaiter(void 0, [_a], void 0, function* ({ chain, environmentId, networkId, token, tokenAmount, walletAddress, currency, includeDisabled, }) {
+const getOnrampProviders = (_a) => __awaiter(void 0, [_a], void 0, function* ({ chain, environmentId, networkId, token, tokenAmount, walletAddress, currency, includeDisabled, merchantName, }) {
     const { onramps } = yield sdkApi().getSupportedOnramps({
         chain,
         currency,
         environmentId,
         includeDisabled,
+        merchantName,
         networkId: networkId ? String(networkId) : undefined,
         token,
         tokenAmount,

package/src/lib/events/dynamicEvents.cjs

@@ -31,6 +31,8 @@ const externalEvents = [
     'walletConnectedForFunding',
     'walletTabSelected',
     'walletConnectionFailed',
+    'embeddedWalletRevealCompleted',
+    'embeddedWalletRevealFailed',
 ];
 // Full internal event emitter
 const dynamicEvents = new EventEmitter__default["default"]();

package/src/lib/events/dynamicEvents.d.ts

@@ -14,7 +14,7 @@ import { WalletEvents } from './wallets';
 export type DynamicEvents = AuthEvents & UIEvents & OTPEvents & WalletEvents & PasskeyEvents & SocialEvents & EmbeddedWalletEvents & MultiWalletInternalEvents & TokenBalancesEvents & UserEvents & FundingEvents;
 type PublicDynamicEvents = Pick<DynamicEvents, typeof externalEvents[number]>;
 /** Which events are accessible by our clients */
-export declare const externalEvents: ("authFailure" | "authInit" | "logout" | "mfaCompletionSuccess" | "mfaCompletionFailure" | "authFlowOpen" | "authFlowClose" | "authFlowCancelled" | "walletTabSelected" | "emailVerificationResult" | "smsVerificationResult" | "walletAdded" | "walletRemoved" | "primaryWalletChanged" | "primaryWalletNetworkChanged" | "userWalletsChanged" | "walletConnectionFailed" | "walletConnectionQrCodeReady" | "embeddedWalletCreated" | "walletConnectedForFunding")[];
+export declare const externalEvents: ("authFailure" | "authInit" | "logout" | "mfaCompletionSuccess" | "mfaCompletionFailure" | "authFlowOpen" | "authFlowClose" | "authFlowCancelled" | "walletTabSelected" | "emailVerificationResult" | "smsVerificationResult" | "walletAdded" | "walletRemoved" | "primaryWalletChanged" | "primaryWalletNetworkChanged" | "userWalletsChanged" | "walletConnectionFailed" | "walletConnectionQrCodeReady" | "embeddedWalletCreated" | "embeddedWalletRevealCompleted" | "embeddedWalletRevealFailed" | "walletConnectedForFunding")[];
 export declare const dynamicEvents: EventEmitter<DynamicEvents, any>;
 export declare const publicDynamicEvents: EventEmitter<PublicDynamicEvents, any>;
 export type DynamicEventEmitter = typeof dynamicEvents;

package/src/lib/events/dynamicEvents.js

@@ -23,6 +23,8 @@ const externalEvents = [
     'walletConnectedForFunding',
     'walletTabSelected',
     'walletConnectionFailed',
+    'embeddedWalletRevealCompleted',
+    'embeddedWalletRevealFailed',
 ];
 // Full internal event emitter
 const dynamicEvents = new EventEmitter();

package/src/lib/shared/assets/backup-waas.cjs

@@ -35,17 +35,17 @@ var SvgBackupWaas = function SvgBackupWaas(_ref) {
     titleId = _ref.titleId,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-    width: 65,
+    width: 64,
     height: 64,
-    viewBox: "0 0 65 64",
+    viewBox: "0 0 64 64",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg",
     "aria-labelledby": titleId
   }, props), title ? /*#__PURE__*/React__namespace.createElement("title", {
     id: titleId
   }, title) : null, _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M32.5 0c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32-17.673 0-32-14.327-32-32 0-17.673 14.327-32 32-32Zm10.325 34.635a.89.89 0 0 0-1.258-.016l-1.8 1.757a.89.89 0 0 0-.016 1.258l1.758 1.801a.89.89 0 0 0 1.273-1.242l-.338-.346a7.119 7.119 0 1 1-5.245.735.89.89 0 1 0-.886-1.543 8.897 8.897 0 1 0 6.321-.975l.176-.171a.89.89 0 0 0 .015-1.258ZM17.5 43.489c0 3.59 5.218 6.569 12.068 7.149a12.395 12.395 0 0 1-1.391-5.72c0-.594.041-1.179.122-1.751-4.569-.656-8.44-2.499-10.79-5-.01 1.5-.009 3.262-.009 5.322Zm.01-17.409c-.01 1.485-.01 3.246-.01 5.321 0 3.65 5.392 6.67 12.411 7.177 2.17-3.66 6.158-6.115 10.72-6.115 1.858 0 3.618.41 5.201 1.138.441-.694.68-1.433.68-2.2 0-2.225 0-3.953-.045-5.283-2.971 3.133-8.337 5.224-14.461 5.224-6.149 0-11.532-2.109-14.495-5.262ZM32.007 12C23.995 12 17.5 15.247 17.5 19.253s6.494 7.253 14.506 7.253c8.011 0 14.507-3.247 14.507-7.253S40.017 12 32.006 12Z",
-    fill: "#0A0B0C"
+    d: "M32 0c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32C14.327 64 0 49.673 0 32 0 14.327 14.327 0 32 0Zm10.325 34.635a.89.89 0 0 0-1.258-.016l-1.8 1.757a.89.89 0 0 0-.016 1.258l1.758 1.801a.89.89 0 0 0 1.273-1.242l-.338-.346a7.119 7.119 0 1 1-5.245.735.89.89 0 1 0-.886-1.543 8.897 8.897 0 1 0 6.321-.975l.176-.171a.89.89 0 0 0 .015-1.258ZM19.95 15A4.95 4.95 0 0 0 15 19.95v23.1A4.95 4.95 0 0 0 19.95 48h8.11a12.481 12.481 0 0 1-.383-3.081c0-6.002 4.245-11.014 9.897-12.193a2.47 2.47 0 0 1 2.183-.257A12.405 12.405 0 0 1 48 35.262V26.55a4.95 4.95 0 0 0-4.95-4.95h-23.1a1.65 1.65 0 1 1 0-3.3h19.8a1.65 1.65 0 1 0 0-3.3h-19.8Z",
+    fill: "#4779FF"
   })));
 };
 

package/src/lib/shared/assets/backup-waas.js

@@ -11,17 +11,17 @@ var SvgBackupWaas = function SvgBackupWaas(_ref) {
     titleId = _ref.titleId,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement("svg", _extends({
-    width: 65,
+    width: 64,
     height: 64,
-    viewBox: "0 0 65 64",
+    viewBox: "0 0 64 64",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg",
     "aria-labelledby": titleId
   }, props), title ? /*#__PURE__*/React.createElement("title", {
     id: titleId
   }, title) : null, _path || (_path = /*#__PURE__*/React.createElement("path", {
-    d: "M32.5 0c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32-17.673 0-32-14.327-32-32 0-17.673 14.327-32 32-32Zm10.325 34.635a.89.89 0 0 0-1.258-.016l-1.8 1.757a.89.89 0 0 0-.016 1.258l1.758 1.801a.89.89 0 0 0 1.273-1.242l-.338-.346a7.119 7.119 0 1 1-5.245.735.89.89 0 1 0-.886-1.543 8.897 8.897 0 1 0 6.321-.975l.176-.171a.89.89 0 0 0 .015-1.258ZM17.5 43.489c0 3.59 5.218 6.569 12.068 7.149a12.395 12.395 0 0 1-1.391-5.72c0-.594.041-1.179.122-1.751-4.569-.656-8.44-2.499-10.79-5-.01 1.5-.009 3.262-.009 5.322Zm.01-17.409c-.01 1.485-.01 3.246-.01 5.321 0 3.65 5.392 6.67 12.411 7.177 2.17-3.66 6.158-6.115 10.72-6.115 1.858 0 3.618.41 5.201 1.138.441-.694.68-1.433.68-2.2 0-2.225 0-3.953-.045-5.283-2.971 3.133-8.337 5.224-14.461 5.224-6.149 0-11.532-2.109-14.495-5.262ZM32.007 12C23.995 12 17.5 15.247 17.5 19.253s6.494 7.253 14.506 7.253c8.011 0 14.507-3.247 14.507-7.253S40.017 12 32.006 12Z",
-    fill: "#0A0B0C"
+    d: "M32 0c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32C14.327 64 0 49.673 0 32 0 14.327 14.327 0 32 0Zm10.325 34.635a.89.89 0 0 0-1.258-.016l-1.8 1.757a.89.89 0 0 0-.016 1.258l1.758 1.801a.89.89 0 0 0 1.273-1.242l-.338-.346a7.119 7.119 0 1 1-5.245.735.89.89 0 1 0-.886-1.543 8.897 8.897 0 1 0 6.321-.975l.176-.171a.89.89 0 0 0 .015-1.258ZM19.95 15A4.95 4.95 0 0 0 15 19.95v23.1A4.95 4.95 0 0 0 19.95 48h8.11a12.481 12.481 0 0 1-.383-3.081c0-6.002 4.245-11.014 9.897-12.193a2.47 2.47 0 0 1 2.183-.257A12.405 12.405 0 0 1 48 35.262V26.55a4.95 4.95 0 0 0-4.95-4.95h-23.1a1.65 1.65 0 1 1 0-3.3h19.8a1.65 1.65 0 1 0 0-3.3h-19.8Z",
+    fill: "#4779FF"
   })));
 };
 

package/src/lib/shared/types/dynamicEventsCallbacks.d.ts

@@ -17,6 +17,10 @@ export type DynamicEventsCallbacks = {
     onLogout?: (user: UserProfile | undefined) => void;
     onUserProfileUpdate?: (user: UserProfile) => void;
     onEmbeddedWalletCreated?: OnEmbeddedWalletCreated;
+    /** Called when a user successfully reveals their embedded wallet private key or recovery phrase */
+    onEmbeddedWalletRevealSuccess?: (wallet: Wallet) => void;
+    /** Called when revealing an embedded wallet private key or recovery phrase fails */
+    onEmbeddedWalletRevealFailure?: (error: unknown) => void;
     onWalletAdded?: OnWalletAdded;
     onWalletRemoved?: OnWalletRemoved;
     onWalletConnectionFailed?: (walletConnector: WalletConnector, error: unknown) => void;