refactor: rename transaction props for clarity and consistency

FuelLabs · Feb 3, 2025 · f969d51 · f969d51
1 parent ca44762
commit f969d51
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/packages/app/src/systems/DApp/pages/TransactionRequest/TransactionRequest.tsx b/packages/app/src/systems/DApp/pages/TransactionRequest/TransactionRequest.tsx
@@ -73,15 +73,15 @@ export function TransactionRequest() {
         <Layout.Content css={styles.content}>
           {shouldShowTxSimulated && (
             <TxDetails
-              summary={txSummarySimulated}
-              request={proposedTxRequest}
+              tx={txSummarySimulated}
+              txRequest={proposedTxRequest}
               showDetails
               isLoading={isLoadingInfo || !defaultValues}
             />
           )}
           {shouldShowTxExecuted && (
             <TxDetails
-              summary={txSummaryExecuted}
+              tx={txSummaryExecuted}
               showDetails
               footer={
                 status('failed') && (

diff --git a/packages/app/src/systems/Transaction/components/TxDetails/TxDetails.tsx b/packages/app/src/systems/Transaction/components/TxDetails/TxDetails.tsx
@@ -17,29 +17,30 @@ import { TxHeaderSimple } from './TxHeaderSimple';
 export type TxViewVariant = 'default' | 'history';
 
 type TxDetailsProps = {
-  summary?: TransactionSummary | TransactionResult;
-  request?: TransactionRequest;
+  tx?: TransactionSummary | TransactionResult;
+  txRequest?: TransactionRequest;
   showDetails?: boolean;
   isLoading?: boolean;
   footer?: React.ReactNode;
   variant?: TxViewVariant;
 };
 
 export function TxDetails({
-  summary,
-  request,
+  tx,
+  txRequest,
   showDetails = true,
   isLoading: externalLoading,
   footer,
   variant = 'default',
 }: TxDetailsProps) {
+  // TODO: Handle errors.simulateTxErrors, isConfirm, fees
   const [isCustomFees, setIsCustomFees] = useState(false);
   const [_, setSelectedTip] = useState<BN>();
   const isHistory = variant === 'history';
 
   const { transaction, isReady } = useSimplifiedTransaction({
-    summary,
-    request,
+    tx,
+    txRequest,
   });
 
   if (!isReady || !transaction) return null;

diff --git a/packages/app/src/systems/Transaction/hooks/useSimplifiedTransaction.tsx b/packages/app/src/systems/Transaction/hooks/useSimplifiedTransaction.tsx
@@ -5,21 +5,21 @@ import type { SimplifiedTransaction } from '../types';
 import { simplifyTransaction } from '../utils/simplifyTransaction';
 
 type UseSimplifiedTransactionProps = {
-  summary?: TransactionSummary;
-  request?: TransactionRequest;
+  tx?: TransactionSummary;
+  txRequest?: TransactionRequest;
 };
 
 export function useSimplifiedTransaction({
-  summary,
-  request,
+  tx,
+  txRequest,
 }: UseSimplifiedTransactionProps) {
   const { account } = useAccounts();
 
   const transaction = useMemo<SimplifiedTransaction | undefined>(() => {
-    if (!summary) return undefined;
+    if (!tx) return undefined;
 
-    return simplifyTransaction(summary, request, account?.address);
-  }, [summary, request, account?.address]);
+    return simplifyTransaction(tx, txRequest, account?.address);
+  }, [tx, txRequest, account?.address]);
 
   return {
     transaction,

diff --git a/packages/app/src/systems/Transaction/pages/TxApprove/TxApprove.tsx b/packages/app/src/systems/Transaction/pages/TxApprove/TxApprove.tsx
@@ -31,7 +31,7 @@ export const TxApprove = () => {
       <Dialog.Description as="div" css={styles.description}>
         {ctx.shouldShowTxSimulated && (
           <TxDetails
-            summary={ctx.txSummarySimulated}
+            tx={ctx.txSummarySimulated}
             showDetails
             isLoading={!ctx.txSummarySimulated}
             variant="default"
@@ -51,7 +51,7 @@ export const TxApprove = () => {
         )}
         {ctx.shouldShowTxExecuted && (
           <TxDetails
-            summary={ctx.txSummaryExecuted}
+            tx={ctx.txSummaryExecuted}
             showDetails
             isLoading={false}
             variant="default"

diff --git a/packages/app/src/systems/Transaction/pages/TxView/TxView.tsx b/packages/app/src/systems/Transaction/pages/TxView/TxView.tsx
@@ -28,7 +28,7 @@ export function TxView() {
         )}
         {txResult && (
           <TxDetails
-            summary={txResult}
+            tx={txResult}
             showDetails={ctx.shouldShowTxFee}
             isLoading={!txResult}
             variant="history"