From 2c924a0c550804a8931a7ee6216482ff74fca7ed Mon Sep 17 00:00:00 2001
From: VSaric <vladimir.saric@consensys.net>
Date: Wed, 11 Jan 2023 16:52:34 +0100
Subject: [PATCH] Resolving conflicts

---
 .../confirm-page-container.component.js                       | 4 +---
 .../signature-request-original.component.js                   | 3 +--
 .../app/signature-request/signature-request.component.js      | 2 +-
 ui/pages/token-allowance/token-allowance.js                   | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index c5f1721d225e..369028fa0997 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -84,7 +84,6 @@ export default class ConfirmPageContainer extends Component {
     origin: PropTypes.string.isRequired,
     ethGasPriceWarning: PropTypes.string,
     networkIdentifier: PropTypes.string,
-    txData: PropTypes.object,
     // Footer
     onCancelAll: PropTypes.func,
     onCancel: PropTypes.func,
@@ -168,7 +167,6 @@ export default class ConfirmPageContainer extends Component {
       accountBalance,
       assetStandard,
       isApprovalOrRejection,
-      txData,
     } = this.props;
 
     const shouldDisplayWarning =
@@ -193,7 +191,7 @@ export default class ConfirmPageContainer extends Component {
     return (
       <GasFeeContextProvider transaction={currentTransaction}>
         <div className="page-container" data-testid="page-container">
-          <ConfirmPageContainerNavigation txData={txData} />
+          <ConfirmPageContainerNavigation />
           {assetStandard === ERC20 ||
           assetStandard === ERC721 ||
           assetStandard === ERC1155 ? (
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
index 4d55ed3bef87..ef0c8529b19d 100644
--- a/ui/components/app/signature-request-original/signature-request-original.component.js
+++ b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -279,7 +279,6 @@ export default class SignatureRequestOriginal extends Component {
       conversionRate,
       nativeCurrency,
       fromAccount: { address, balance, name },
-      txData,
     } = this.props;
     const { showSignatureRequestWarning } = this.state;
     const { t } = this.context;
@@ -298,7 +297,7 @@ export default class SignatureRequestOriginal extends Component {
     return (
       <div className="request-signature__container">
         <div className="request-signature__navigation">
-          <ConfirmPageContainerNavigation txData={txData} />
+          <ConfirmPageContainerNavigation />
         </div>
         <div className="request-signature__account">
           <NetworkAccountBalanceHeader
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index b0bff71407ed..e72a68ffaf26 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -213,7 +213,7 @@ export default class SignatureRequest extends PureComponent {
 
     return (
       <div className="signature-request">
-        <ConfirmPageContainerNavigation txData={txData} />
+        <ConfirmPageContainerNavigation />
         <div className="request-signature__account">
           <NetworkAccountBalanceHeader
             networkName={currentNetwork}
diff --git a/ui/pages/token-allowance/token-allowance.js b/ui/pages/token-allowance/token-allowance.js
index 995160ba3fc6..55aaa6270720 100644
--- a/ui/pages/token-allowance/token-allowance.js
+++ b/ui/pages/token-allowance/token-allowance.js
@@ -238,7 +238,7 @@ export default function TokenAllowance({
   return (
     <Box className="token-allowance-container page-container">
       <Box>
-        <ConfirmPageContainerNavigation txData={fullTxData} />
+        <ConfirmPageContainerNavigation />
       </Box>
       <Box
         paddingLeft={4}