fix: Add back showMethodCall and keep prop drilling it

safe-global · Sep 18, 2024 · 20c52f2 · 20c52f2
1 parent 388d600
commit 20c52f2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/components/tx-flow/flows/ConfirmTx/ConfirmProposedTx.tsx b/src/components/tx-flow/flows/ConfirmTx/ConfirmProposedTx.tsx
@@ -39,7 +39,7 @@ const ConfirmProposedTx = ({ txSummary }: ConfirmProposedTxProps): ReactElement
   const text = canSign ? (canExecute ? SIGN_EXECUTE_TEXT : SIGN_TEXT) : EXECUTE_TEXT
 
   return (
-    <SignOrExecuteForm txId={txId} isExecutable={canExecute} onlyExecute={!canSign}>
+    <SignOrExecuteForm txId={txId} isExecutable={canExecute} onlyExecute={!canSign} showMethodCall>
       <Typography mb={1}>{text}</Typography>
     </SignOrExecuteForm>
   )

diff --git a/src/components/tx-flow/flows/SafeAppsTx/ReviewSafeAppsTx.tsx b/src/components/tx-flow/flows/SafeAppsTx/ReviewSafeAppsTx.tsx
@@ -66,7 +66,7 @@ const ReviewSafeAppsTx = ({
   const error = !isTxValid(txs)
 
   return (
-    <SignOrExecuteForm onSubmit={handleSubmit} origin={origin}>
+    <SignOrExecuteForm onSubmit={handleSubmit} origin={origin} showMethodCall>
       {error ? (
         <ErrorMessage error={safeTxError}>
           This Safe App initiated a transaction which cannot be processed. Please get in touch with the developer of

diff --git a/src/components/tx/DecodedTx/index.tsx b/src/components/tx/DecodedTx/index.tsx
@@ -1,5 +1,5 @@
 import { type SyntheticEvent, type ReactElement, memo } from 'react'
-import { isCustomTxInfo } from '@/utils/transaction-guards'
+import { isCustomTxInfo, isNativeTokenTransfer, isTransferTxInfo } from '@/utils/transaction-guards'
 import { Accordion, AccordionDetails, AccordionSummary, Box, Stack } from '@mui/material'
 import { OperationType, type SafeTransaction } from '@safe-global/safe-core-sdk-types'
 import type { DecodedDataResponse, TransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
@@ -37,7 +37,7 @@ const DecodedTx = ({
   showMultisend = true,
   showMethodCall = false,
 }: DecodedTxProps): ReactElement => {
-  const isMultisend = decodedData?.parameters
+  const isMultisend = !!decodedData?.parameters[0]?.valueDecoded
   const isMethodCallInAdvanced = !showMethodCall || (isMultisend && showMultisend)
 
   const onChangeExpand = (_: SyntheticEvent, expanded: boolean) => {
@@ -86,7 +86,10 @@ const DecodedTx = ({
             <HelpToolTip />
             <Box flexGrow={1} />
             {isMethodCallInAdvanced && decodedData?.method}
-            {!showMethodCall && !decodedData?.method && Number(tx?.data.value) > 0 && 'native transfer'}
+            {txDetails &&
+              isTransferTxInfo(txDetails.txInfo) &&
+              isNativeTokenTransfer(txDetails.txInfo.transferInfo) &&
+              'native transfer'}
           </AccordionSummary>
           <AccordionDetails data-testid="decoded-tx-details">
             {showDecodedData && (

diff --git a/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx b/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx
@@ -49,6 +49,7 @@ export type SignOrExecuteProps = {
   onlyExecute?: boolean
   disableSubmit?: boolean
   origin?: string
+  showMethodCall?: boolean
 }
 
 const trackTxEvents = (
@@ -141,7 +142,13 @@ export const SignOrExecuteForm = ({
           </ErrorBoundary>
         )}
 
-        <ConfirmationView isCreation={isCreation} txDetails={props.txDetails} safeTx={safeTx} />
+        <ConfirmationView
+          isCreation={isCreation}
+          txDetails={props.txDetails}
+          safeTx={safeTx}
+          isBatch={props.isBatch}
+          showMethodCall={props.showMethodCall}
+        />
 
         {!isCounterfactualSafe && !props.isRejection && <BlockaidBalanceChanges />}
       </TxCard>

diff --git a/src/components/tx/confirmation-views/index.tsx b/src/components/tx/confirmation-views/index.tsx
@@ -16,6 +16,7 @@ type ConfirmationViewProps = {
   isBatch?: boolean
   isApproval?: boolean
   isCreation?: boolean
+  showMethodCall?: boolean
 }
 
 const getConfirmationViewComponent = (txType: TransactionInfoType, props: NarrowConfirmationViewProps) => {
@@ -54,7 +55,11 @@ const ConfirmationView = (props: ConfirmationViewProps) => {
         decodedData={decodedData}
         showMultisend={!props.isBatch}
         showMethodCall={
-          !ConfirmationViewComponent && !showTxDetails && !props.isApproval && isGenericConfirmation(decodedData)
+          props.showMethodCall &&
+          !showTxDetails &&
+          !props.isApproval &&
+          isGenericConfirmation(decodedData) &&
+          !ConfirmationViewComponent
         }
       />
     </>