diff --git a/src/hooks/useWalletConnection.ts b/src/hooks/useWalletConnection.ts index ef36fc1..3fc63a8 100644 --- a/src/hooks/useWalletConnection.ts +++ b/src/hooks/useWalletConnection.ts @@ -163,17 +163,20 @@ export const useWalletConnection = () => { } } } catch (error) { - throw Object.assign( - new Error([error.message, error.cause?.message].filter(Boolean).join('\n')), - { - walletConnectionType: walletConnection?.type, - } - ); + const { isErrorExpected } = parseWalletError({ error, stringGetter }); + if (!isErrorExpected) { + throw Object.assign( + new Error([error.message, error.cause?.message].filter(Boolean).join('\n')), + { + walletConnectionType: walletConnection?.type, + } + ); + } } return { walletType, - walletConnectionType: walletConnection.type, + walletConnectionType: walletConnection?.type, }; }, [isConnectedGraz, signerGraz, isConnectedWagmi, signerWagmi] diff --git a/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx b/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx index f830e43..5e03705 100644 --- a/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx +++ b/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx @@ -166,11 +166,16 @@ export const GenerateKeys = ({ setStatus(EvmDerivedAccountStatus.Derived); } catch (error) { setStatus(EvmDerivedAccountStatus.NotDerived); - const { message, walletErrorType } = parseWalletError({ error, stringGetter }); + const { message, walletErrorType, isErrorExpected } = parseWalletError({ + error, + stringGetter, + }); if (message) { setError(message); - log('GenerateKeys/deriveKeys', error, { walletErrorType }); + if (!isErrorExpected) { + log('GenerateKeys/deriveKeys', error, { walletErrorType }); + } } } };