Resolving conflicts

MetaMask · Jan 11, 2023 · 53df20e · 53df20e
1 parent 0c93b4b
commit 53df20e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/...ontainer/confirm-page-container-navigation/confirm-page-container-navigation.component.js b/...ontainer/confirm-page-container-navigation/confirm-page-container-navigation.component.js
@@ -33,9 +33,9 @@ const ConfirmPageContainerNavigation = () => {
     )
     .reduce((acc, key) => ({ ...acc, [key]: unapprovedTxs[key] }), {});
 
-    const enumUnapprovedTxs = Object.keys(
-      isUnapprovedTxsEmpty ? unconfirmedMessages : currentNetworkUnapprovedTxs,
-    );
+  const enumUnapprovedTxs = Object.keys(
+    isUnapprovedTxsEmpty ? unconfirmedMessages : currentNetworkUnapprovedTxs,
+  );
 
   const currentPosition = enumUnapprovedTxs.indexOf(id);
 

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
@@ -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
@@ -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
@@ -212,7 +212,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
@@ -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}