Merge branch 'develop' into fix/use-counter-pending-transactions

Author: Prithpal-Sooriya

app/scripts/lib/snap-keyring/snap-keyring.test.ts

@@ -171,7 +171,6 @@ describe('Snap Keyring Methods', () => {
 
         await showAccountNameSuggestionDialog(
           mockSnapId,
-          mockAccount.address,
           controllerMessenger,
           accountNameSuggestion,
         );
@@ -182,7 +181,6 @@ describe('Snap Keyring Methods', () => {
             origin: mockSnapId,
             type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
             requestData: {
-              address: mockAccount.address,
               snapSuggestedAccountName: accountNameSuggestion,
             },
           },
@@ -229,7 +227,6 @@ describe('Snap Keyring Methods', () => {
           origin: mockSnapId,
           type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
           requestData: {
-            address: mockInternalAccount.address.toLowerCase(),
             snapSuggestedAccountName: '',
           },
         },
@@ -294,7 +291,6 @@ describe('Snap Keyring Methods', () => {
           origin: mockSnapId,
           type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
           requestData: {
-            address: mockInternalAccount.address.toLowerCase(),
             // No user defined name
             snapSuggestedAccountName: '',
           },
@@ -355,7 +351,6 @@ describe('Snap Keyring Methods', () => {
           origin: mockSnapId,
           type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
           requestData: {
-            address: mockInternalAccount.address.toLowerCase(),
             snapSuggestedAccountName: mockNameSuggestion,
           },
         },
@@ -428,7 +423,6 @@ describe('Snap Keyring Methods', () => {
           origin: mockSnapId,
           type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
           requestData: {
-            address: mockInternalAccount.address.toLowerCase(),
             snapSuggestedAccountName: mockNameSuggestion,
           },
         },
@@ -492,7 +486,6 @@ describe('Snap Keyring Methods', () => {
           origin: mockSnapId,
           type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
           requestData: {
-            address: mockInternalAccount.address.toLowerCase(),
             snapSuggestedAccountName: mockNameSuggestion,
           },
         },

app/scripts/lib/snap-keyring/snap-keyring.ts

@@ -65,14 +65,12 @@ export async function showAccountCreationDialog(
  * Show the account name suggestion confirmation dialog for a given Snap.
  *
  * @param snapId - Snap ID to show the account name suggestion dialog for.
- * @param address - The address of the new account.
  * @param controllerMessenger - The controller messenger instance.
  * @param accountNameSuggestion - Suggested name for the new account.
  * @returns The user's confirmation result.
  */
 export async function showAccountNameSuggestionDialog(
   snapId: string,
-  address: string,
   controllerMessenger: SnapKeyringBuilderMessenger,
   accountNameSuggestion: string,
 ): Promise<{ success: boolean; name?: string }> {
@@ -83,7 +81,6 @@ export async function showAccountNameSuggestionDialog(
         origin: snapId,
         type: SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showNameSnapAccount,
         requestData: {
-          address,
           snapSuggestedAccountName: accountNameSuggestion,
         },
       },
@@ -227,7 +224,6 @@ export const snapKeyringBuilder = (
           const accountNameConfirmationResult =
             await showAccountNameSuggestionDialog(
               snapId,
-              address,
               controllerMessenger,
               accountNameSuggestion,
             );

ui/components/multichain/create-btc-account/create-btc-account.stories.js

@@ -4,18 +4,12 @@ import { fireEvent, renderWithProvider, waitFor } from '../../../../test/jest';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
 import messages from '../../../../app/_locales/en/messages.json';
-import { createMockInternalAccount } from '../../../../test/jest/mocks';
 import { ETH_EOA_METHODS } from '../../../../shared/constants/eth-methods';
 import {
   CreateNamedSnapAccount,
   CreateNamedSnapAccountProps,
 } from './create-named-snap-account';
 
-const mockAddress = '0x3f9658179a5c053bb2faaf7badbb95f6c9be0fa7';
-const mockAccount = createMockInternalAccount({
-  address: mockAddress,
-  name: 'New account',
-});
 const mockSnapSuggestedAccountName = 'Suggested Account Name';
 
 jest.mock('../../../store/actions', () => ({
@@ -61,7 +55,6 @@ const mockSnapAccount2 = {
 const render = (
   props: CreateNamedSnapAccountProps = {
     onActionComplete: jest.fn().mockResolvedValue({ success: true }),
-    address: mockAccount.address,
     snapSuggestedAccountName: mockSnapSuggestedAccountName,
   },
 ) => {
@@ -105,7 +98,6 @@ describe('CreateNamedSnapAccount', () => {
     const onActionComplete = jest.fn();
     const { getByText, getByPlaceholderText } = render({
       onActionComplete,
-      address: mockAccount.address,
       snapSuggestedAccountName: mockSnapSuggestedAccountName,
     });
 
@@ -150,7 +142,6 @@ describe('CreateNamedSnapAccount', () => {
     const onActionComplete = jest.fn();
     const { getByText, getByPlaceholderText } = render({
       onActionComplete,
-      address: mockAccount.address,
     });
 
     fireEvent.click(getByText(messages.addAccount.message));
@@ -170,7 +161,6 @@ describe('CreateNamedSnapAccount', () => {
     const onActionComplete = jest.fn();
     const { getByText } = render({
       onActionComplete,
-      address: mockAccount.address,
       snapSuggestedAccountName: mockSnapSuggestedAccountName,
     });
 

ui/components/multichain/create-btc-account/create-btc-account.test.tsx

@@ -1,16 +1,12 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { InternalAccount } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
-import { CreateAccount, CreateBtcAccount } from '..';
+import { CreateAccount } from '..';
 import { Box, ModalHeader } from '../../component-library';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
-import {
-  isBtcMainnetAddress,
-  isBtcTestnetAddress,
-} from '../../../../shared/lib/multichain';
 import { getNextAvailableAccountName } from '../../../store/actions';
 
 export type CreateNamedSnapAccountProps = {
@@ -22,11 +18,6 @@ export type CreateNamedSnapAccountProps = {
     reject?: boolean,
   ) => Promise<void>;
 
-  /**
-   * Address of the account to create
-   */
-  address: string;
-
   /**
    * Suggested account name from the snap
    */
@@ -35,17 +26,12 @@ export type CreateNamedSnapAccountProps = {
 
 export const CreateNamedSnapAccount: React.FC<CreateNamedSnapAccountProps> = ({
   onActionComplete,
-  address,
   snapSuggestedAccountName,
 }) => {
   const t = useI18nContext();
   const history = useHistory();
 
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
-  const isBtcAccount = useMemo(
-    () => isBtcMainnetAddress(address) || isBtcTestnetAddress(address),
-    [address],
-  );
 
   const rejectAction = useCallback(async (completed: boolean) => {
     await onActionComplete({ success: completed });
@@ -81,23 +67,13 @@ export const CreateNamedSnapAccount: React.FC<CreateNamedSnapAccountProps> = ({
       <ModalHeader padding={4} onClose={onClose}>
         {t('addAccountToMetaMask')}
       </ModalHeader>
-      {isBtcAccount ? (
-        <CreateBtcAccount
-          // onActionComplete is called when a user rejects the action
-          // onCreateAccount will call onActionComplete if a user confirms the action
-          onActionComplete={rejectAction}
-          onCreateAccount={onCreateAccount}
-          address={address}
-        />
-      ) : (
-        <CreateAccount
-          // onActionComplete is called when a user rejects the action
-          // onCreateAccount will call onActionComplete if a user confirms the action
-          onActionComplete={rejectAction}
-          onCreateAccount={onCreateAccount}
-          getNextAvailableAccountName={getNextAccountName}
-        />
-      )}
+      <CreateAccount
+        // onActionComplete is called when a user rejects the action
+        // onCreateAccount will call onActionComplete if a user confirms the action
+        onActionComplete={rejectAction}
+        onCreateAccount={onCreateAccount}
+        getNextAvailableAccountName={getNextAccountName}
+      />
     </Box>
   );
 };