Merge branch 'main' into dapp_shield_ui_fixes

Author: jpuri

app/scripts/controller-init/messengers/accounts/snap-keyring-builder-messenger.ts

@@ -49,6 +49,7 @@ export function getSnapKeyringBuilderMessenger(
       'SnapController:get',
       'SnapController:isMinimumPlatformVersion',
       'PreferencesController:getState',
+      'RemoteFeatureFlagController:getState',
     ],
   });
   return keyringMessenger;

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

@@ -6,6 +6,7 @@ import {
 } from '@metamask/keyring-api';
 import { InternalAccount } from '@metamask/keyring-internal-api';
 import { SnapId } from '@metamask/snaps-sdk';
+import { RemoteFeatureFlagControllerState } from '@metamask/remote-feature-flag-controller';
 import { getRootMessenger } from '../messenger';
 import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app';
 import {
@@ -43,6 +44,7 @@ const mockLocale = 'en';
 const mockPreferencesControllerGetState = jest.fn();
 const mockSnapControllerGet = jest.fn();
 const mockSnapControllerHandleRequest = jest.fn();
+const mockRemoteFeatureFlagsGetStateRequest = jest.fn();
 
 const mockFlowId = '123';
 const address = '0x2a4d4b667D5f12C3F9Bf8F14a7B9f8D8d9b8c8fA';
@@ -114,6 +116,7 @@ const createControllerMessenger = ({
       'PreferencesController:getState',
       'SnapController:get',
       'SnapController:handleRequest',
+      'RemoteFeatureFlagController:getState',
     ],
   });
 
@@ -171,6 +174,9 @@ const createControllerMessenger = ({
       case 'SnapController:handleRequest':
         return mockSnapControllerHandleRequest(params);
 
+      case 'RemoteFeatureFlagController:getState':
+        return mockRemoteFeatureFlagsGetStateRequest(params);
+
       default:
         throw new Error(
           `MOCK_FAIL - unsupported messenger call: ${actionType}`,
@@ -191,6 +197,11 @@ const createSnapKeyringBuilder = ({
   jest.mocked(isSnapPreinstalled).mockReturnValue(snapPreinstalled);
   jest.mocked(getSnapName).mockReturnValue(snapName);
 
+  // Needed now to know if state 2 is enabled or not.
+  mockRemoteFeatureFlagsGetStateRequest.mockReturnValue({
+    remoteFeatureFlags: {},
+  } as RemoteFeatureFlagControllerState);
+
   return snapKeyringBuilder(createControllerMessenger(), {
     persistKeyringHelper: mockPersistKeyringHelper,
     removeAccountHelper: mockRemoveAccountHelper,

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

@@ -21,6 +21,11 @@ import MetaMetricsController from '../../controllers/metametrics-controller';
 import { getUniqueAccountName } from '../../../../shared/lib/accounts';
 import { isSnapPreinstalled } from '../../../../shared/lib/snaps/snaps';
 import { getSnapName } from '../../../../shared/lib/accounts/snaps';
+import {
+  FEATURE_VERSION_2,
+  isMultichainAccountsFeatureEnabled,
+  MultichainAccountsFeatureFlag,
+} from '../../../../shared/lib/multichain-accounts/remote-feature-flag';
 import { SnapKeyringBuilderMessenger } from './types';
 import { isBlockedUrl } from './utils/isBlockedUrl';
 import { showError, showSuccess } from './utils/showResult';
@@ -299,14 +304,24 @@ class SnapKeyringImpl implements SnapKeyringCallbacks {
     });
   }
 
+  #isMultichainAccountsFeatureState2Enabled() {
+    const state = this.#messenger.call('RemoteFeatureFlagController:getState');
+
+    const featureFlag = state?.remoteFeatureFlags
+      ?.enableMultichainAccountsState2 as
+      | MultichainAccountsFeatureFlag
+      | undefined;
+    return isMultichainAccountsFeatureEnabled(featureFlag, FEATURE_VERSION_2);
+  }
+
   async #addAccountFinalize({
     address,
     snapId,
     skipConfirmationDialog,
     skipSetSelectedAccountStep,
     skipApprovalFlow,
-    accountName,
     onceSaved,
+    accountName,
     defaultAccountNameChosen,
   }: {
     address: string;
@@ -364,12 +379,19 @@ class SnapKeyringImpl implements SnapKeyringCallbacks {
           );
         }
 
-        if (accountName) {
-          this.#messenger.call(
-            'AccountsController:setAccountName',
-            accountId,
-            accountName,
-          );
+        // HACK: In state 2, account creations can run in parallel, thus, `accountName`
+        // sometimes conflict with other concurrent renaming. Since we don't rely on those
+        // account names anymore, we just omit this part and make this race-free.
+        // FIXME: We still rely on the old behavior in some e2e, so we cannot remove this
+        // entirely.
+        if (!this.#isMultichainAccountsFeatureState2Enabled()) {
+          if (accountName) {
+            this.#messenger.call(
+              'AccountsController:setAccountName',
+              accountId,
+              accountName,
+            );
+          }
         }
 
         if (!skipConfirmationDialog) {

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

@@ -23,6 +23,7 @@ import {
   IsMinimumPlatformVersion,
 } from '@metamask/snaps-controllers';
 import { SnapKeyring } from '@metamask/eth-snap-keyring';
+import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
 import { PreferencesControllerGetStateAction } from '../../controllers/preferences-controller';
 
 export type SnapKeyringBuilderAllowActions =
@@ -44,7 +45,8 @@ export type SnapKeyringBuilderAllowActions =
   | HandleSnapRequest
   | GetSnap
   | PreferencesControllerGetStateAction
-  | IsMinimumPlatformVersion;
+  | IsMinimumPlatformVersion
+  | RemoteFeatureFlagControllerGetStateAction;
 
 export type SnapKeyringBuilderMessenger = Messenger<
   'SnapKeyring',

app/scripts/metamask-controller.js

@@ -5215,6 +5215,15 @@ export default class MetamaskController extends EventEmitter {
       await this.getSnapKeyring(),
       this.accountTreeController.getSelectedAccountGroup(),
     );
+
+    if (this.isMultichainAccountsFeatureState2Enabled()) {
+      // This allows to create missing accounts if new account providers have been added.
+      // FIXME: We might wanna run discovery + alignment asynchronously here, like we do
+      // for mobile, but for now, this easy fix should cover new provider accounts.
+      // NOTE: We run this asynchronously on purpose, see FIXME^.
+      // eslint-disable-next-line no-void
+      void this.multichainAccountService.alignWallets();
+    }
   }
 
   async _loginUser(password) {