chore: Update TransactionController to v13 and ApprovalController to v3.5.2

app/components/Nav/Main/RootRPCMethodsUI.js

@@ -106,7 +106,7 @@ const RootRPCMethodsUI = (props) => {
         const receipt = await query(
           TransactionController.ethQuery,
           'getTransactionReceipt',
-          [transactionMeta.transactionHash],
+          [transactionMeta.hash],
         );
 
         const currentBlock = await query(
@@ -115,18 +115,18 @@ const RootRPCMethodsUI = (props) => {
           [receipt.blockHash, false],
         );
         let approvalReceipt;
-        if (approvalTransaction?.transactionHash) {
+        if (approvalTransaction?.hash) {
           approvalReceipt = await query(
             TransactionController.ethQuery,
             'getTransactionReceipt',
-            [approvalTransaction.transactionHash],
+            [approvalTransaction.hash],
           );
         }
         const tokensReceived = swapsUtils.getSwapsTokensReceived(
           receipt,
           approvalReceipt,
-          transactionMeta?.transaction,
-          approvalTransaction?.transaction,
+          transactionMeta?.txParams,
+          approvalTransaction?.txParams,
           swapTransaction.destinationToken,
           ethAccountBalance,
           ethBalance,
@@ -161,7 +161,7 @@ const RootRPCMethodsUI = (props) => {
 
         const analyticsParams = {
           ...swapTransaction.analytics,
-          account_type: getAddressAccountType(transactionMeta.transaction.from),
+          account_type: getAddressAccountType(transactionMeta.txParams.from),
         };
         delete newSwapsTransactions[transactionMeta.id].analytics;
         delete newSwapsTransactions[transactionMeta.id].paramsForAnalytics;
@@ -200,7 +200,7 @@ const RootRPCMethodsUI = (props) => {
             if (transactionMeta.status === 'submitted') {
               NotificationManager.watchSubmittedTransaction({
                 ...transactionMeta,
-                assetType: transactionMeta.transaction.assetType,
+                assetType: transactionMeta.txParams.assetType,
               });
             } else {
               if (props.swapsTransactions[transactionMeta.id]?.analytics) {
@@ -221,7 +221,7 @@ const RootRPCMethodsUI = (props) => {
         await KeyringController.resetQRKeyringState();
 
         const isLedgerAccount = isHardwareAccount(
-          transactionMeta.transaction.from,
+          transactionMeta.txParams.from,
           [ExtendedKeyringTypes.ledger],
         );
 
@@ -261,18 +261,18 @@ const RootRPCMethodsUI = (props) => {
     async (transactionMeta) => {
       if (transactionMeta.origin === TransactionTypes.MMM) return;
 
-      const to = transactionMeta.transaction.to?.toLowerCase();
-      const { data } = transactionMeta.transaction;
+      const to = transactionMeta.txParams.to?.toLowerCase();
+      const { data } = transactionMeta.txParams;
 
       if (isSwapTransaction(data, transactionMeta.origin, to, props.chainId)) {
         autoSign(transactionMeta);
       } else {
         const {
-          transaction: { value, gas, gasPrice, data },
+          txParams: { value, gas, gasPrice, data },
         } = transactionMeta;
         const { AssetsContractController } = Engine.context;
-        transactionMeta.transaction.gas = hexToBN(gas);
-        transactionMeta.transaction.gasPrice = gasPrice && hexToBN(gasPrice);
+        transactionMeta.txParams.gas = hexToBN(gas);
+        transactionMeta.txParams.gasPrice = gasPrice && hexToBN(gasPrice);
 
         if (
           (value === '0x0' || !value) &&
@@ -311,31 +311,31 @@ const RootRPCMethodsUI = (props) => {
           const tokenAmount =
             tokenData && calcTokenAmount(tokenValue, asset.decimals).toFixed();
 
-          transactionMeta.transaction.value = hexToBN(
+          transactionMeta.txParams.value = hexToBN(
             getTokenValueParamAsHex(tokenData),
           );
-          transactionMeta.transaction.readableValue = tokenAmount;
-          transactionMeta.transaction.to = toAddress;
+          transactionMeta.txParams.readableValue = tokenAmount;
+          transactionMeta.txParams.to = toAddress;
 
           setTransactionObject({
             type: 'INDIVIDUAL_TOKEN_TRANSACTION',
             selectedAsset: asset,
             id: transactionMeta.id,
             origin: transactionMeta.origin,
             securityAlertResponse: transactionMeta.securityAlertResponse,
-            ...transactionMeta.transaction,
+            ...transactionMeta.txParams,
           });
         } else {
-          transactionMeta.transaction.value = hexToBN(value);
-          transactionMeta.transaction.readableValue = fromWei(
-            transactionMeta.transaction.value,
+          transactionMeta.txParams.value = hexToBN(value);
+          transactionMeta.txParams.readableValue = fromWei(
+            transactionMeta.txParams.value,
           );
 
           setEtherTransaction({
             id: transactionMeta.id,
             origin: transactionMeta.origin,
             securityAlertResponse: transactionMeta.securityAlertResponse,
-            ...transactionMeta.transaction,
+            ...transactionMeta.txParams,
           });
         }
 

app/components/UI/Notification/TransactionNotification/index.js

@@ -249,9 +249,7 @@ function TransactionNotification(props) {
         swapsTransactions,
         swapsTokens,
       });
-      const existingGasPrice = new BigNumber(
-        tx?.transaction?.gasPrice || '0x0',
-      );
+      const existingGasPrice = new BigNumber(tx?.txParams?.gasPrice || '0x0');
       const gasFeeValue = fastSplit(
         existingGasPrice
           .times(
@@ -289,7 +287,7 @@ function TransactionNotification(props) {
           <BaseNotification
             status={currentNotification.status}
             data={{
-              ...tx?.transaction,
+              ...tx?.txParams,
               ...currentNotification.transaction,
               title: transactionElement?.notificationKey,
             }}

app/components/UI/TransactionElement/TransactionDetails/index.js

@@ -113,7 +113,6 @@ class TransactionDetails extends PureComponent {
      */
     showSpeedUpModal: PropTypes.func,
     showCancelModal: PropTypes.func,
-    transaction: PropTypes.object,
     selectedAddress: PropTypes.string,
     transactions: PropTypes.array,
     ticker: PropTypes.string,
@@ -161,11 +160,11 @@ class TransactionDetails extends PureComponent {
       transactions,
     } = this.props;
     const multiLayerFeeNetwork = isMultiLayerFeeNetwork(chainId);
-    const transactionHash = transactionDetails?.transactionHash;
+    const transactionHash = transactionDetails?.hash;
     if (
       !multiLayerFeeNetwork ||
       !transactionHash ||
-      !transactionObject.transaction
+      !transactionObject.txParams
     ) {
       this.setState({ updatedTransactionDetails: transactionDetails });
       return;
@@ -177,7 +176,7 @@ class TransactionDetails extends PureComponent {
       if (!multiLayerL1FeeTotal) {
         multiLayerL1FeeTotal = '0x0'; // Sets it to 0 if it's not available in a txReceipt yet.
       }
-      transactionObject.transaction.multiLayerL1FeeTotal = multiLayerL1FeeTotal;
+      transactionObject.txParams.multiLayerL1FeeTotal = multiLayerL1FeeTotal;
       const decodedTx = await decodeTransaction({
         tx: transactionObject,
         selectedAddress,
@@ -218,15 +217,15 @@ class TransactionDetails extends PureComponent {
     const {
       navigation,
       transactionObject: { networkID },
-      transactionDetails: { transactionHash },
+      transactionDetails: { hash },
       providerConfig: { type },
       close,
     } = this.props;
     const { rpcBlockExplorer } = this.state;
     try {
       const { url, title } = getBlockExplorerTxUrl(
         type,
-        transactionHash,
+        hash,
         rpcBlockExplorer,
       );
       navigation.push('Webview', {
@@ -300,7 +299,7 @@ class TransactionDetails extends PureComponent {
   render = () => {
     const {
       chainId,
-      transactionObject: { status, time, transaction },
+      transactionObject: { status, time, txParams },
     } = this.props;
     const { updatedTransactionDetails } = this.state;
     const styles = this.getStyles();
@@ -332,7 +331,7 @@ class TransactionDetails extends PureComponent {
             </Text>
           </DetailsModal.Column>
         </DetailsModal.Section>
-        <DetailsModal.Section borderBottom={!!transaction?.nonce}>
+        <DetailsModal.Section borderBottom={!!txParams?.nonce}>
           <DetailsModal.Column>
             <DetailsModal.SectionTitle>
               {strings('transactions.from')}
@@ -361,9 +360,9 @@ class TransactionDetails extends PureComponent {
             <DetailsModal.SectionTitle upper>
               {strings('transactions.nonce')}
             </DetailsModal.SectionTitle>
-            {!!transaction?.nonce && (
+            {!!txParams?.nonce && (
               <Text small primary>{`#${parseInt(
-                transaction.nonce.replace(regex.transactionNonce, ''),
+                txParams.nonce.replace(regex.transactionNonce, ''),
                 16,
               )}`}</Text>
             )}
@@ -372,7 +371,7 @@ class TransactionDetails extends PureComponent {
         <View
           style={[
             styles.summaryWrapper,
-            !transaction?.nonce && styles.touchableViewOnEtherscan,
+            !txParams?.nonce && styles.touchableViewOnEtherscan,
           ]}
         >
           <TransactionSummary
@@ -390,7 +389,7 @@ class TransactionDetails extends PureComponent {
           />
         </View>
 
-        {updatedTransactionDetails.transactionHash &&
+        {updatedTransactionDetails.hash &&
           status !== 'cancelled' &&
           rpcBlockExplorer !== NO_RPC_BLOCK_EXPLORER && (
             <TouchableOpacity

app/components/UI/TransactionElement/index.js

@@ -219,14 +219,12 @@ class TransactionElement extends PureComponent {
 
   renderTxTime = () => {
     const { tx, selectedAddress } = this.props;
-    const incoming =
-      safeToChecksumAddress(tx.transaction.to) === selectedAddress;
+    const incoming = safeToChecksumAddress(tx.txParams.to) === selectedAddress;
     const selfSent =
-      incoming &&
-      safeToChecksumAddress(tx.transaction.from) === selectedAddress;
+      incoming && safeToChecksumAddress(tx.txParams.from) === selectedAddress;
     return `${
       (!incoming || selfSent) && tx.deviceConfirmedOn === WalletDevice.MM_MOBILE
-        ? `#${parseInt(tx.transaction.nonce, 16)} - ${toDateFormat(
+        ? `#${parseInt(tx.txParams.nonce, 16)} - ${toDateFormat(
             tx.time,
           )} ${strings(
             'transactions.from_device_label',
@@ -402,7 +400,7 @@ class TransactionElement extends PureComponent {
     const { tx } = this.props;
 
     let existingGas = {};
-    const transaction = tx?.transaction;
+    const transaction = tx?.txParams;
     if (transaction) {
       if (isEIP1559Transaction(transaction)) {
         existingGas = {
@@ -413,9 +411,7 @@ class TransactionElement extends PureComponent {
           ),
         };
       } else {
-        const existingGasPrice = tx.transaction
-          ? tx.transaction.gasPrice
-          : '0x0';
+        const existingGasPrice = tx.txParams ? tx.txParams.gasPrice : '0x0';
         const existingGasPriceDecimal = parseInt(
           existingGasPrice === undefined ? '0x0' : existingGasPrice,
           16,