Merge branch 'main' of github.com:safe-global/safe-wallet-web into dev

safe-global · Nov 28, 2024 · 9f5ab1e · 9f5ab1e
2 parents 6a16d5c + e477fd8
commit 9f5ab1e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "safe-wallet-web",
   "homepage": "https://github.com/safe-global/safe-wallet-web",
   "license": "GPL-3.0",
-  "version": "1.47.1",
+  "version": "1.47.2",
   "type": "module",
   "scripts": {
     "dev": "next dev",

diff --git a/src/components/transactions/TxDetails/Summary/index.tsx b/src/components/transactions/TxDetails/Summary/index.tsx
@@ -13,6 +13,7 @@ import DecodedData from '../TxData/DecodedData'
 import { calculateSafeTransactionHash } from '@safe-global/protocol-kit/dist/src/utils'
 import useSafeInfo from '@/hooks/useSafeInfo'
 import { SafeTxHashDataRow } from './SafeTxHashDataRow'
+import { logError, Errors } from '@/services/exceptions'
 
 interface Props {
   txDetails: TransactionDetails
@@ -147,7 +148,12 @@ export const PartialSummary = ({ safeTx }: { safeTx: SafeTransaction }) => {
   const txData = safeTx.data
   const { safeAddress, safe } = useSafeInfo()
   const safeTxHash = useMemo(() => {
-    return safe.version && calculateSafeTransactionHash(safeAddress, safeTx.data, safe.version, BigInt(safe.chainId))
+    if (!safe.version) return
+    try {
+      return calculateSafeTransactionHash(safeAddress, safeTx.data, safe.version, BigInt(safe.chainId))
+    } catch (e) {
+      logError(Errors._809, e)
+    }
   }, [safe.chainId, safe.version, safeAddress, safeTx.data])
   return (
     <>

diff --git a/src/components/tx/DecodedTx/index.tsx b/src/components/tx/DecodedTx/index.tsx
@@ -1,4 +1,5 @@
 import { type SyntheticEvent, type ReactElement, memo } from 'react'
+import { ErrorBoundary } from '@sentry/react'
 import {
   isCustomTxInfo,
   isMultisigDetailedExecutionInfo,
@@ -130,7 +131,11 @@ const DecodedTx = ({
                   hideDecodedData={isMethodCallInAdvanced && !!decodedData?.method}
                 />
               ) : (
-                tx && <PartialSummary safeTx={tx} />
+                tx && (
+                  <ErrorBoundary>
+                    <PartialSummary safeTx={tx} />
+                  </ErrorBoundary>
+                )
               )}
             </AccordionDetails>
           </Accordion>