Merge branch 'main' into feat/plan-836-ledger-hid-prompt-up-issue

Author: dawnseeker8

.storybook/test-data.js

@@ -10,7 +10,10 @@ import { copyable, divider, heading, panel, text } from '@metamask/snaps-sdk';
 import { getJsxElementFromComponent } from '@metamask/snaps-utils';
 import { FirstTimeFlowType } from '../shared/constants/onboarding';
 import { ETH_EOA_METHODS } from '../shared/constants/eth-methods';
-import { mockNetworkState, mockMultichainNetworkState } from '../test/stub/networks';
+import {
+  mockNetworkState,
+  mockMultichainNetworkState,
+} from '../test/stub/networks';
 
 const state = {
   invalidCustomNetwork: {
@@ -1257,6 +1260,16 @@ const state = {
         accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
       },
     ],
+    keyringsMetadata: [
+      {
+        id: '01JN08SYECPZHFHB3K0J1NHJ4H',
+        name: '',
+      },
+      {
+        id: '01JN08T38HEXPYQX2HKP1FCRMZ',
+        name: '',
+      },
+    ],
     ...mockNetworkState(
       {
         id: 'test-networkConfigurationId-1',

app/_locales/en/messages.json

@@ -7,6 +7,7 @@ import {
   KeyringAccountType,
 } from '@metamask/keyring-api';
 import { merge } from 'lodash';
+import { KeyringTypes } from '@metamask/keyring-controller';
 import { fireEvent, waitFor } from '../../../../test/jest';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
@@ -673,4 +674,76 @@ describe('AccountListMenu', () => {
       expect(queryByText(mockBtcAccount.metadata.name)).toBeInTheDocument();
     });
   });
+
+  describe('Multi Srp', () => {
+    it('redirects to import srp component', () => {
+      const { getByTestId } = render();
+
+      const button = getByTestId(
+        'multichain-account-menu-popover-action-button',
+      );
+      button.click();
+
+      const addAccountButton = getByTestId(
+        'multichain-account-menu-popover-import-srp',
+      );
+      addAccountButton.click();
+
+      expect(getByTestId('import-srp-container')).toBeInTheDocument();
+    });
+
+    it('shows srp list if there are multiple srps when adding a new account', async () => {
+      mockNextAccountName.mockReturnValue('Next HD Account');
+
+      const accountInSecondSrp = createMockInternalAccount({
+        address: '0xb1baf6a2f4a808937bb97a2f12ccf08f1233e3d9',
+        name: 'Account in second Srp',
+      });
+      const secondHdKeyring = {
+        accounts: [accountInSecondSrp.address],
+        type: KeyringTypes.hd,
+      };
+      const secondHdKeyringMetadata = {
+        id: '01JN2RD391JM4K7Q5T4RP3JXMA',
+        name: '',
+      };
+
+      const { getByTestId } = render({
+        metamask: {
+          ...mockState.metamask,
+          accounts: {
+            [accountInSecondSrp.address]: {
+              address: accountInSecondSrp.address,
+              balance: '0x0',
+            },
+          },
+          keyrings: [...mockState.metamask.keyrings, secondHdKeyring],
+          keyringsMetadata: [
+            ...mockState.metamask.keyringsMetadata,
+            secondHdKeyringMetadata,
+          ],
+          internalAccounts: {
+            ...mockState.metamask.internalAccounts,
+            accounts: {
+              ...mockState.metamask.internalAccounts.accounts,
+              [accountInSecondSrp.id]: accountInSecondSrp,
+            },
+            selectedAccount: accountInSecondSrp.id,
+          },
+        },
+      });
+
+      const button = getByTestId(
+        'multichain-account-menu-popover-action-button',
+      );
+      await button.click();
+
+      const addAccountButton = getByTestId(
+        'multichain-account-menu-popover-add-account',
+      );
+      await addAccountButton.click();
+
+      expect(getByTestId('select-srp-container')).toBeInTheDocument();
+    });
+  });
 });

app/_locales/en_GB/messages.json

@@ -75,7 +75,12 @@ import {
   getDefaultHomeActiveTabName,
   ///: BEGIN:ONLY_INCLUDE_IF(solana)
   getIsSolanaSupportEnabled,
-  getMetaMaskKeyrings,
+  ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp,solana)
+  getMetaMaskHdKeyrings,
+  ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+  getHdKeyringOfSelectedAccountOrPrimaryKeyring,
   ///: END:ONLY_INCLUDE_IF
 } from '../../../selectors';
 import { setSelectedAccount } from '../../../store/actions';
@@ -135,6 +140,7 @@ import {
 ///: END:ONLY_INCLUDE_IF
 ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
 import { ImportSrp } from '../multi-srp/import-srp';
+import { SrpList } from '../multi-srp/srp-list';
 ///: END:ONLY_INCLUDE_IF
 import { HiddenAccountList } from './hidden-account-list';
 
@@ -156,7 +162,9 @@ const ACTION_MODES = {
   // Displays the import account form controls
   IMPORT: 'import',
   ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+  CREATE_SRP: 'create-srp',
   IMPORT_SRP: 'import-srp',
+  SELECT_SRP: 'select-srp',
   ///: END:ONLY_INCLUDE_IF
 };
 
@@ -185,8 +193,12 @@ export const getActionTitle = (
     case ACTION_MODES.IMPORT:
       return t('importPrivateKey');
     ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+    case ACTION_MODES.CREATE_SRP:
+      return t('createSecretRecoveryPhrase');
     case ACTION_MODES.IMPORT_SRP:
       return t('importSecretRecoveryPhrase');
+    case ACTION_MODES.SELECT_SRP:
+      return t('addAccount');
     ///: END:ONLY_INCLUDE_IF
     default:
       return t('selectAnAccount');
@@ -240,9 +252,6 @@ export const AccountListMenu = ({
   ///: END:ONLY_INCLUDE_IF
   const [searchQuery, setSearchQuery] = useState('');
   const [actionMode, setActionMode] = useState(ACTION_MODES.LIST);
-  ///: BEGIN:ONLY_INCLUDE_IF(solana)
-  const [primaryKeyring] = useSelector(getMetaMaskKeyrings);
-  ///: END:ONLY_INCLUDE_IF
   const hiddenAddresses = useSelector(getHiddenAccountsList);
   const updatedAccountsList = useSelector(getUpdatedAndSortedAccounts);
   const filteredUpdatedAccountList = useMemo(
@@ -311,6 +320,18 @@ export const AccountListMenu = ({
     WalletClientType.Solana,
   );
   ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp,solana)
+  const [primaryKeyring] = useSelector(getMetaMaskHdKeyrings);
+  ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+
+  // Here we are getting the keyring of the last selected account
+  // if it is not an hd keyring, we will use the primary keyring
+  const hdKeyring = useSelector(getHdKeyringOfSelectedAccountOrPrimaryKeyring);
+  const [selectedKeyringId, setSelectedKeyringId] = useState(
+    hdKeyring.metadata.id,
+  );
+  ///: END:ONLY_INCLUDE_IF
 
   let searchResults: MergedInternalAccount[] = filteredUpdatedAccountList;
   if (searchQuery) {
@@ -336,6 +357,10 @@ export const AccountListMenu = ({
   if (actionMode !== ACTION_MODES.LIST) {
     if (actionMode === ACTION_MODES.MENU) {
       onBack = () => setActionMode(ACTION_MODES.LIST);
+      ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+    } else if (actionMode === ACTION_MODES.SELECT_SRP) {
+      onBack = () => setActionMode(ACTION_MODES.ADD);
+      ///: END:ONLY_INCLUDE_IF
     } else {
       onBack = () => setActionMode(ACTION_MODES.MENU);
     }
@@ -393,6 +418,10 @@ export const AccountListMenu = ({
                   setActionMode(ACTION_MODES.LIST);
                 }
               }}
+              ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+              selectedKeyringId={selectedKeyringId}
+              onSelectSrp={() => setActionMode(ACTION_MODES.SELECT_SRP)}
+              ///: END:ONLY_INCLUDE_IF(multi-srp)
             />
           </Box>
         ) : null}
@@ -437,6 +466,19 @@ export const AccountListMenu = ({
           )
           ///: END:ONLY_INCLUDE_IF
         }
+        {
+          ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+          actionMode === ACTION_MODES.SELECT_SRP && (
+            <SrpList
+              onActionComplete={(keyringId: string) => {
+                setSelectedKeyringId(keyringId);
+                setActionMode(ACTION_MODES.ADD);
+              }}
+            />
+          )
+          ///: END:ONLY_INCLUDE_IF
+        }
+
         {/* Add / Import / Hardware Menu */}
         {actionMode === ACTION_MODES.MENU ? (
           <Box padding={4}>