From 409bb00748a7d4c3eb83f7b0ae16dc4d2f451af2 Mon Sep 17 00:00:00 2001
From: "Akintayo A. Olusegun" <akintayo.segun@gmail.com>
Date: Wed, 8 Sep 2021 01:12:56 +0400
Subject: [PATCH] Separate container from component as per
 https://github.com/MetaMask/metamask-extension/pull/12019#discussion_r703804969

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>
---
 .../confirm-page-container.component.js       | 44 +------------------
 .../confirm-page-container.container.js       | 43 ++++++++++++++++++
 .../app/confirm-page-container/index.js       |  2 +-
 3 files changed, 45 insertions(+), 44 deletions(-)
 create mode 100644 ui/components/app/confirm-page-container/confirm-page-container.container.js

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 c23c9b74e..852cfeee9 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
@@ -1,12 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import SenderToRecipient from '../../ui/sender-to-recipient';
 import { PageContainerFooter } from '../../ui/page-container';
 import EditGasPopover from '../edit-gas-popover';
 import { EDIT_GAS_MODES } from '../../../../shared/constants/gas';
-import { getAddressBookEntry } from '../../../selectors';
-import * as actions from '../../../store/actions';
 import Dialog from '../../ui/dialog';
 import {
   ConfirmPageContainerHeader,
@@ -14,7 +11,7 @@ import {
   ConfirmPageContainerNavigation,
 } from '.';
 
-class ConfirmPageContainer extends Component {
+export default class ConfirmPageContainer extends Component {
   static contextTypes = {
     t: PropTypes.func,
   };
@@ -229,42 +226,3 @@ class ConfirmPageContainer extends Component {
     );
   }
 }
-
-function mapStateToProps(state, ownProps) {
-  const to = ownProps.toAddress;
-
-  const contact = getAddressBookEntry(state, to);
-  return {
-    contact,
-    toName: contact && contact.name ? contact.name : ownProps.toName,
-    to,
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    showAddToAddressBookModal: (recipient) =>
-      dispatch(
-        actions.showModal({
-          name: 'ADD_TO_ADDRESSBOOK',
-          recipient,
-        }),
-      ),
-  };
-}
-
-function mergeProps(stateProps, dispatchProps, ownProps) {
-  const { to, ...restStateProps } = stateProps;
-  return {
-    ...ownProps,
-    ...restStateProps,
-    showAddToAddressBookModal: () =>
-      dispatchProps.showAddToAddressBookModal(to),
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-)(ConfirmPageContainer);
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.container.js b/ui/components/app/confirm-page-container/confirm-page-container.container.js
new file mode 100644
index 000000000..fb0e42b78
--- /dev/null
+++ b/ui/components/app/confirm-page-container/confirm-page-container.container.js
@@ -0,0 +1,43 @@
+import { connect } from 'react-redux';
+import { getAddressBookEntry } from '../../../selectors';
+import * as actions from '../../../store/actions';
+import ConfirmPageContainer from './confirm-page-container.component';
+
+function mapStateToProps(state, ownProps) {
+  const to = ownProps.toAddress;
+
+  const contact = getAddressBookEntry(state, to);
+  return {
+    contact,
+    toName: contact && contact.name ? contact.name : ownProps.toName,
+    to,
+  };
+}
+
+function mapDispatchToProps(dispatch) {
+  return {
+    showAddToAddressBookModal: (recipient) =>
+      dispatch(
+        actions.showModal({
+          name: 'ADD_TO_ADDRESSBOOK',
+          recipient,
+        }),
+      ),
+  };
+}
+
+function mergeProps(stateProps, dispatchProps, ownProps) {
+  const { to, ...restStateProps } = stateProps;
+  return {
+    ...ownProps,
+    ...restStateProps,
+    showAddToAddressBookModal: () =>
+      dispatchProps.showAddToAddressBookModal(to),
+  };
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps,
+  mergeProps,
+)(ConfirmPageContainer);
diff --git a/ui/components/app/confirm-page-container/index.js b/ui/components/app/confirm-page-container/index.js
index d9bc6f5a8..955ef1bb8 100644
--- a/ui/components/app/confirm-page-container/index.js
+++ b/ui/components/app/confirm-page-container/index.js
@@ -1,4 +1,4 @@
-export { default } from './confirm-page-container.component';
+export { default } from './confirm-page-container.container';
 export { default as ConfirmPageContainerHeader } from './confirm-page-container-header';
 export { default as ConfirmDetailRow } from './confirm-detail-row';
 export { default as ConfirmPageContainerNavigation } from './confirm-page-container-navigation';