chore: refactor wallet connect error handling (#2179)

* chore: improve wallet connect error handling * Update packages/shared/src/lib/auxiliary/wallet-connect/utils/getBloomError.ts Co-authored-by: Mark Nardi <[email protected]> * chore: update imports --------- Co-authored-by: Mark Nardi <[email protected]>
bloomwalletio · Mar 21, 2024 · 3596f8f · 3596f8f
1 parent 89b9440
commit 3596f8f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_signTypedData.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_signTypedData.handler.ts
@@ -2,7 +2,7 @@ import { IChain } from '@core/network'
 import { IConnectedDapp } from '../interface'
 import { CallbackParameters } from '../types'
 import { PopupId, openPopup } from '../../../../../../desktop/lib/auxiliary/popup'
-import { switchToRequiredAccount } from '../utils'
+import { getBloomError, switchToRequiredAccount } from '../utils'
 import { getSdkError } from '@walletconnect/utils'
 import { Platform } from '@core/app/classes'
 import { SignTypedDataVersion } from '@metamask/eth-sig-util'
@@ -54,7 +54,7 @@ export async function handleEthSignTypedData(
             },
         })
     } catch (err) {
-        responseCallback({ error: getSdkError(err) })
+        responseCallback(getBloomError(err))
     }
 
     return

diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_transaction.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_transaction.handler.ts
@@ -4,7 +4,7 @@ import { IConnectedDapp } from '@auxiliary/wallet-connect/interface'
 import { CallbackParameters } from '@auxiliary/wallet-connect/types'
 import { buildEvmTransactionData } from '@core/layer-2/utils'
 import { EvmTransactionData } from '@core/layer-2'
-import { switchToRequiredAccount } from '@auxiliary/wallet-connect/utils'
+import { getBloomError, switchToRequiredAccount } from '@auxiliary/wallet-connect/utils'
 import { getSdkError } from '@walletconnect/utils'
 import { Platform } from '@core/app'
 import { DappVerification, RpcMethod } from '../enums'
@@ -41,12 +41,7 @@ export async function handleEthTransaction(
             evmTransactionData.gasPrice = gasPrice
             evmTransactionData.gasLimit = gasLimit
         } catch (err) {
-            responseCallback({
-                error: {
-                    message: err.message,
-                    code: 1000,
-                },
-            })
+            responseCallback(getBloomError(err))
             return
         }
     }
@@ -68,6 +63,6 @@ export async function handleEthTransaction(
             },
         })
     } catch (err) {
-        responseCallback({ error: getSdkError(err) })
+        responseCallback(getBloomError(err))
     }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/sign_message.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/sign_message.handler.ts
@@ -3,7 +3,7 @@ import { openPopup, PopupId } from '../../../../../../desktop/lib/auxiliary/popu
 import { IConnectedDapp } from '../interface'
 import { IChain } from '@core/network'
 import { CallbackParameters } from '../types'
-import { switchToRequiredAccount } from '../utils'
+import { getBloomError, switchToRequiredAccount } from '../utils'
 import { getSdkError } from '@walletconnect/utils'
 import { Platform } from '@core/app'
 import { DappVerification, RpcMethod } from '../enums'
@@ -78,6 +78,6 @@ export async function handleSignMessage(
             })
         }
     } catch (err) {
-        responseCallback({ error: getSdkError(err) })
+        responseCallback(getBloomError(err))
     }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/getBloomError.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/getBloomError.ts
@@ -0,0 +1,17 @@
+import { CallbackParameters } from '@auxiliary/wallet-connect/types'
+import { getSdkError } from '@walletconnect/utils'
+import { IError } from '@core/error/interfaces'
+
+export function getBloomError(err: unknown): Omit<CallbackParameters, 'result'> {
+    try {
+        // @ts-expect-error the error types aren't exported from @walletconnect
+        return { error: getSdkError(err) }
+    } catch {
+        return {
+            error: {
+                message: (err as IError).message ?? 'Something went wrong',
+                code: 1000,
+            },
+        }
+    }
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,5 +1,6 @@
 export * from './disconnectAllDapps'
 export * from './getAllEvmAddresses'
+export * from './getBloomError'
 export * from './getPermissionForMethod'
 export * from './rejectSession'
 export * from './switchToRequiredAccount'