responding to Monte's review

ui/pages/create-account/import-account/index.js

@@ -33,7 +33,9 @@ export default function NewAccountImportForm() {
   const [type, setType] = useState(menuItems[0]);
 
   function importAccount(strategy, importArgs) {
-    dispatch(actions.importNewAccount(strategy, importArgs))
+    const loadingMessage = getLoadingMessage(strategy);
+
+    dispatch(actions.importNewAccount(strategy, importArgs, loadingMessage))
       .then(({ selectedAddress }) => {
         if (selectedAddress) {
           trackImportEvent(strategy, true);
@@ -67,6 +69,22 @@ export default function NewAccountImportForm() {
     });
   }
 
+  function getLoadingMessage(strategy) {
+    if (strategy === 'JSON File') {
+      return (
+        <Text width={BLOCK_SIZES.THREE_FOURTHS} fontWeight={FONT_WEIGHT.BOLD}>
+          <br />
+          {t('importAccountJsonLoading1')}
+          <br />
+          <br />
+          {t('importAccountJsonLoading2')}
+        </Text>
+      );
+    }
+
+    return '';
+  }
+
   /**
    * @param {string} message - an Error/Warning message caught in importAccount()
    * This function receives a message that is a string like:
@@ -92,9 +110,8 @@ export default function NewAccountImportForm() {
       case menuItems[0]:
         return <PrivateKeyImportView importAccountFunc={importAccount} />;
       case menuItems[1]:
-        return <JsonImportView importAccountFunc={importAccount} />;
       default:
-        return null;
+        return <JsonImportView importAccountFunc={importAccount} />;
     }
   }
 
@@ -141,19 +158,3 @@ export function moreInfoLink() {
     url: ZENDESK_URLS.IMPORTED_ACCOUNTS,
   });
 }
-
-export function getLoadingMessage(strategy) {
-  if (strategy === 'JSON File') {
-    return (
-      <Text width={BLOCK_SIZES.THREE_FOURTHS} fontWeight={FONT_WEIGHT.BOLD}>
-        <br />
-        Expect this JSON import to take a few minutes and freeze MetaMask.
-        <br />
-        <br />
-        We apologize, and we will make it faster in the future.
-      </Text>
-    );
-  }
-
-  return '';
-}

ui/store/actions.test.js

@@ -350,9 +350,11 @@ describe('Actions', () => {
       _setBackgroundConnection(background);
 
       await store.dispatch(
-        actions.importNewAccount('Private Key', [
-          'c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3',
-        ]),
+        actions.importNewAccount(
+          'Private Key',
+          ['c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3'],
+          '',
+        ),
       );
       expect(importAccountWithStrategy.callCount).toStrictEqual(1);
     });
@@ -369,7 +371,7 @@ describe('Actions', () => {
       const expectedActions = [
         {
           type: 'SHOW_LOADING_INDICATION',
-          payload: '',
+          payload: undefined,
         },
         { type: 'HIDE_LOADING_INDICATION' },
       ];

ui/store/actions.ts

@@ -92,7 +92,6 @@ import { TransactionMeta } from '../../app/scripts/controllers/incoming-transact
 import { TxParams } from '../../app/scripts/controllers/transactions/tx-state-manager';
 import { CustomGasSettings } from '../../app/scripts/controllers/transactions';
 import { ThemeType } from '../../shared/constants/preferences';
-import { getLoadingMessage } from '../pages/create-account/import-account';
 import * as actionConstants from './actionConstants';
 import {
   generateActionId,
@@ -405,6 +404,7 @@ export function removeAccount(
 export function importNewAccount(
   strategy: string,
   args: any[],
+  loadingMessage: ReactFragment,
 ): ThunkAction<
   Promise<MetaMaskReduxState['metamask']>,
   MetaMaskReduxState,
@@ -414,7 +414,7 @@ export function importNewAccount(
   return async (dispatch: MetaMaskReduxDispatch) => {
     let newState;
 
-    dispatch(showLoadingIndication(getLoadingMessage(strategy)));
+    dispatch(showLoadingIndication(loadingMessage));
 
     try {
       log.debug(`background.importAccountWithStrategy`);