From 3358ac2c1f125af2f32600395d308f3c92b0c387 Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Fri, 3 Sep 2021 10:52:37 -0500
Subject: [PATCH] send user to account page upon adding a custom network
 (#11945)

---
 test/e2e/tests/custom-rpc-history.spec.js              |  2 +-
 .../network-form/network-form.component.js             | 10 +++++-----
 .../settings/networks-tab/networks-tab.component.js    |  6 +++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js
index 792bfa980..08a2bdd31 100644
--- a/test/e2e/tests/custom-rpc-history.spec.js
+++ b/test/e2e/tests/custom-rpc-history.spec.js
@@ -49,7 +49,7 @@ describe('Stores custom RPC history', function () {
         await chainIdInput.sendKeys(chainId.toString());
 
         await driver.clickElement('.network-form__footer .btn-secondary');
-        await driver.findElement({ text: networkName, tag: 'div' });
+        await driver.findElement({ text: networkName, tag: 'span' });
       },
     );
   });
diff --git a/ui/pages/settings/networks-tab/network-form/network-form.component.js b/ui/pages/settings/networks-tab/network-form/network-form.component.js
index 3e5913081..e2968001d 100644
--- a/ui/pages/settings/networks-tab/network-form/network-form.component.js
+++ b/ui/pages/settings/networks-tab/network-form/network-form.component.js
@@ -41,7 +41,7 @@ export default class NetworkForm extends PureComponent {
     blockExplorerUrl: PropTypes.string,
     rpcPrefs: PropTypes.object,
     networksToRender: PropTypes.array,
-    isFullScreen: PropTypes.bool,
+    onAddNetwork: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -165,7 +165,7 @@ export default class NetworkForm extends PureComponent {
         rpcUrl: propsRpcUrl,
         editRpc,
         rpcPrefs = {},
-        onClear,
+        onAddNetwork,
         networksTabIsInAddMode,
       } = this.props;
       const {
@@ -200,7 +200,7 @@ export default class NetworkForm extends PureComponent {
       }
 
       if (networksTabIsInAddMode) {
-        onClear();
+        onAddNetwork();
       }
     } catch (error) {
       this.setState({
@@ -211,9 +211,9 @@ export default class NetworkForm extends PureComponent {
   };
 
   onCancel = () => {
-    const { isFullScreen, networksTabIsInAddMode, onClear } = this.props;
+    const { networksTabIsInAddMode, onClear } = this.props;
 
-    if (networksTabIsInAddMode || !isFullScreen) {
+    if (networksTabIsInAddMode) {
       onClear();
     } else {
       this.resetForm();
diff --git a/ui/pages/settings/networks-tab/networks-tab.component.js b/ui/pages/settings/networks-tab/networks-tab.component.js
index 34419f04a..f42591dd6 100644
--- a/ui/pages/settings/networks-tab/networks-tab.component.js
+++ b/ui/pages/settings/networks-tab/networks-tab.component.js
@@ -7,6 +7,7 @@ import LockIcon from '../../../components/ui/lock-icon';
 import {
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
+  DEFAULT_ROUTE,
 } from '../../../helpers/constants/routes';
 import ColorIndicator from '../../../components/ui/color-indicator';
 import { COLORS, SIZES } from '../../../helpers/constants/design-system';
@@ -212,10 +213,13 @@ export default class NetworksTab extends PureComponent {
             onClear={(shouldUpdateHistory = true) => {
               setNetworksTabAddMode(false);
               setSelectedSettingsRpcUrl('');
-              if (shouldUpdateHistory && !isFullScreen) {
+              if (shouldUpdateHistory) {
                 history.push(NETWORKS_ROUTE);
               }
             }}
+            onAddNetwork={() => {
+              history.push(DEFAULT_ROUTE);
+            }}
             showConfirmDeleteNetworkModal={showConfirmDeleteNetworkModal}
             viewOnly={viewOnly}
             isCurrentRpcTarget={providerUrl === rpcUrl}