fix: name being out of sync in account list

ui/components/app/modals/new-account-modal/new-account-modal.component.js

@@ -26,8 +26,8 @@ export default class NewAccountModal extends Component {
     });
   };
 
-  onSubmit = () => {
-    this.props.onSave(this.state.alias).then(this.props.hideModal);
+  onSubmit = async () => {
+    await this.props.onSave(this.state.alias).then(this.props.hideModal);
   };
 
   onKeyPress = (e) => {

ui/components/app/modals/new-account-modal/new-account-modal.container.js

@@ -1,5 +1,10 @@
 import { connect } from 'react-redux';
-import * as actions from '../../../../store/actions';
+import {
+  addNewAccount,
+  setAccountLabel,
+  forceUpdateMetamaskState,
+  hideModal,
+} from '../../../../store/actions';
 import NewAccountModal from './new-account-modal.component';
 
 function mapStateToProps(state) {
@@ -10,14 +15,14 @@ function mapStateToProps(state) {
 
 function mapDispatchToProps(dispatch) {
   return {
-    hideModal: () => dispatch(actions.hideModal()),
-    createAccount: (newAccountName) => {
-      return dispatch(actions.addNewAccount()).then((newAccountAddress) => {
-        if (newAccountName) {
-          dispatch(actions.setAccountLabel(newAccountAddress, newAccountName));
-        }
-        return newAccountAddress;
-      });
+    hideModal: () => dispatch(hideModal()),
+    createAccount: async (newAccountName) => {
+      const newAccountAddress = await dispatch(addNewAccount());
+      if (newAccountName) {
+        dispatch(setAccountLabel(newAccountAddress, newAccountName));
+      }
+      await forceUpdateMetamaskState(dispatch);
+      return newAccountAddress;
     },
   };
 }
@@ -30,9 +35,9 @@ function mergeProps(stateProps, dispatchProps) {
     ...stateProps,
     ...dispatchProps,
     onSave: (newAccountName) => {
-      return createAccount(newAccountName).then((newAccountAddress) =>
-        onCreateNewAccount(newAccountAddress),
-      );
+      return createAccount(newAccountName).then((newAccountAddress) => {
+        onCreateNewAccount(newAccountAddress);
+      });
     },
   };
 }

ui/components/app/modals/new-account-modal/new-account-modal.test.tsx

@@ -0,0 +1,87 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import { waitFor, fireEvent } from '@testing-library/react';
+import configureStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../test/jest';
+import mockState from '../../../../../test/data/mock-state.json';
+import messages from '../../../../../app/_locales/en/messages.json';
+import NewAccountModal from './new-account-modal.container';
+
+const mockOnCreateNewAccount = jest.fn();
+const mockNewAccountNumber = 2;
+const mockNewMetamaskState = {
+  ...mockState.metamask,
+  currentLocale: 'en',
+};
+const mockAddress = '0x1234567890';
+
+const mockSubmitRequestToBackground = jest.fn().mockImplementation((method) => {
+  switch (method) {
+    case 'addNewAccount':
+      return mockAddress;
+    case 'setAccountLabel':
+      return {};
+    case 'getState':
+      return mockNewMetamaskState;
+    default:
+      return {};
+  }
+});
+
+jest.mock('../../../../store/background-connection', () => ({
+  ...jest.requireActual('../../../../store/background-connection'),
+  submitRequestToBackground: (method: string, args: unknown) =>
+    mockSubmitRequestToBackground(method, args),
+}));
+
+const renderModal = (
+  props = {
+    onCreateNewAccount: mockOnCreateNewAccount,
+    newAccountNumber: mockNewAccountNumber,
+  },
+) => {
+  const state = {
+    ...mockState,
+    metamask: {
+      ...mockState.metamask,
+      currentLocale: 'en',
+    },
+    appState: {
+      ...mockState.appState,
+      modal: {
+        ...mockState.appState.modal,
+        modalState: {
+          name: 'NEW_ACCOUNT',
+          props,
+        },
+      },
+    },
+  };
+  const middlewares = [thunk];
+  const mockStore = configureStore(middlewares);
+  const store = mockStore(state);
+
+  return {
+    render: renderWithProvider(<NewAccountModal />, store),
+    store,
+  };
+};
+
+describe('NewAccountModal', () => {
+  it('calls forceUpdateMetamaskState after adding account', async () => {
+    const { render } = renderModal();
+    const { getByText } = render;
+    const addAccountButton = getByText(messages.save.message);
+    expect(addAccountButton).toBeInTheDocument();
+
+    fireEvent.click(addAccountButton);
+
+    await waitFor(() => {
+      expect(mockSubmitRequestToBackground).toHaveBeenNthCalledWith(
+        2,
+        'getState',
+        undefined,
+      );
+    });
+  });
+});

ui/pages/permissions-connect/permissions-connect.test.tsx

@@ -4,6 +4,7 @@ import thunk from 'redux-thunk';
 
 import { ApprovalType } from '@metamask/controller-utils';
 import { BtcAccountType } from '@metamask/keyring-api';
+import { fireEvent } from '@testing-library/react';
 import messages from '../../../app/_locales/en/messages.json';
 import { renderWithProvider } from '../../../test/lib/render-helpers';
 import mockState from '../../../test/data/mock-state.json';
@@ -16,6 +17,7 @@ const mockPermissionRequestId = '0cbc1f26-8772-4512-8ad7-f547d6e8b72c';
 
 jest.mock('../../store/actions', () => {
   return {
+    ...jest.requireActual('../../store/actions'),
     getRequestAccountTabIds: jest.fn().mockReturnValue({
       type: 'SET_REQUEST_ACCOUNT_TABS',
       payload: {},
@@ -110,24 +112,31 @@ const render = (
   const mockStore = configureStore(middlewares);
   const store = mockStore(state);
 
-  return renderWithProvider(
-    <PermissionApprovalContainer {...props} />,
+  return {
+    render: renderWithProvider(
+      <PermissionApprovalContainer {...props} />,
+      store,
+      `${CONNECT_ROUTE}/${mockPermissionRequestId}`,
+    ),
     store,
-    `${CONNECT_ROUTE}/${mockPermissionRequestId}`,
-  );
+  };
 };
 
 describe('PermissionApprovalContainer', () => {
   describe('ConnectPath', () => {
     it('renders correctly', () => {
-      const { container, getByText } = render();
+      const {
+        render: { container, getByText },
+      } = render();
       expect(getByText(messages.next.message)).toBeInTheDocument();
       expect(getByText(messages.cancel.message)).toBeInTheDocument();
       expect(container).toMatchSnapshot();
     });
 
     it('renders the list without BTC accounts', async () => {
-      const { getByText, queryByText } = render();
+      const {
+        render: { getByText, queryByText },
+      } = render();
       expect(
         getByText(
           `${mockAccount.metadata.name} (${shortenAddress(
@@ -144,4 +153,26 @@ describe('PermissionApprovalContainer', () => {
       ).not.toBeInTheDocument();
     });
   });
+
+  describe('Add new account', () => {
+    it('displays the correct account number', async () => {
+      const {
+        render: { getByText },
+        store,
+      } = render();
+      fireEvent.click(getByText(messages.newAccount.message));
+
+      const dispatchedActions = store.getActions();
+
+      expect(dispatchedActions).toHaveLength(2); // first action is 'SET_REQUEST_ACCOUNT_TABS'
+      expect(dispatchedActions[1]).toStrictEqual({
+        type: 'UI_MODAL_OPEN',
+        payload: {
+          name: 'NEW_ACCOUNT',
+          onCreateNewAccount: expect.any(Function),
+          newAccountNumber: 2,
+        },
+      });
+    });
+  });
 });