Fix: nested tx preview (#4851)

safe-global · Jan 29, 2025 · 9d5a370 · 9d5a370
1 parent 3567039
commit 9d5a370
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.../src/components/transactions/TxDetails/TxData/NestedTransaction/ExecTransaction/index.tsx b/.../src/components/transactions/TxDetails/TxData/NestedTransaction/ExecTransaction/index.tsx
@@ -58,7 +58,7 @@ export const ExecTransaction = ({
   const [txPreview, error] = useTxPreview(
     childSafeTx
       ? {
-          operation: childSafeTx.data.operation,
+          operation: Number(childSafeTx.data.operation),
           data: childSafeTx.data.data,
           to: childSafeTx.data.to,
           value: childSafeTx.data.value.toString(),

diff --git a/...b/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap b/...b/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`SignOrExecute should display a confirmation screen 1`] = `
   >
     <div
       class="MuiCardContent-root cardContent css-1lt5qva-MuiCardContent-root"
+      data-testid="card-content"
     >
       <div
         class="MuiStack-root css-1sazv7p-MuiStack-root"
@@ -172,6 +173,7 @@ exports[`SignOrExecute should display a confirmation screen 1`] = `
   >
     <div
       class="MuiCardContent-root cardContent css-1lt5qva-MuiCardContent-root"
+      data-testid="card-content"
     >
       <div
         class="wrapper"
@@ -279,6 +281,7 @@ exports[`SignOrExecute should display a loading component 1`] = `
   >
     <div
       class="MuiCardContent-root cardContent css-1lt5qva-MuiCardContent-root"
+      data-testid="card-content"
     >
       <div
         class="MuiBox-root css-17luq05"
@@ -343,6 +346,7 @@ exports[`SignOrExecute should display an error screen 1`] = `
   >
     <div
       class="MuiCardContent-root cardContent css-1lt5qva-MuiCardContent-root"
+      data-testid="card-content"
     >
       <div
         class="MuiStack-root css-1sazv7p-MuiStack-root"
@@ -507,6 +511,7 @@ exports[`SignOrExecute should display an error screen 1`] = `
   >
     <div
       class="MuiCardContent-root cardContent css-1lt5qva-MuiCardContent-root"
+      data-testid="card-content"
     >
       <div
         class="wrapper"

diff --git a/apps/web/src/components/tx/confirmation-views/useTxPreview.ts b/apps/web/src/components/tx/confirmation-views/useTxPreview.ts
@@ -13,17 +13,18 @@ const useTxPreview = (
   customSafeAddress?: string,
   txId?: string,
 ) => {
+  const skip = !!txId || !safeTxData
   const {
     safe: { chainId },
     safeAddress,
   } = useSafeInfo()
   const address = customSafeAddress ?? safeAddress
+  const { operation = Operation.CALL, data = '', to, value } = safeTxData ?? {}
 
   return useAsync(() => {
-    if (txId || !safeTxData?.data) return
-    const { operation = Operation.CALL, data = '', to, value } = safeTxData || {}
+    if (skip) return
     return getTxPreview(chainId, address, operation, data, to, value)
-  }, [txId, chainId, address, safeTxData])
+  }, [skip, chainId, address, operation, data, to, value])
 }
 
 export default useTxPreview