fix: merge conflict

Author: ameliejyc

app/scripts/background.js

@@ -1800,17 +1800,29 @@ const initSidePanelBehavior = async () => {
     // Wait for controller to be initialized
     await isInitialized;
 
-    // Get user preference (default to true for side panel)
+    // Get user preference (default to false for side panel)
     const useSidePanelAsDefault =
       controller?.preferencesController?.state?.preferences
-        ?.useSidePanelAsDefault ?? true;
+        ?.useSidePanelAsDefault ?? false;
 
     // Set panel behavior based on preference
     if (browser?.sidePanel?.setPanelBehavior) {
       await browser.sidePanel.setPanelBehavior({
         openPanelOnActionClick: useSidePanelAsDefault,
       });
     }
+
+    // Setup remote feature flag listener to update sidepanel preferences
+    controller?.controllerMessenger?.subscribe(
+      'RemoteFeatureFlagController:stateChange',
+      (state) => {
+        const extensionUxSidepanel =
+          state?.remoteFeatureFlags?.extensionUxSidepanel;
+        if (extensionUxSidepanel === false) {
+          controller?.preferencesController?.setUseSidePanelAsDefault(false);
+        }
+      },
+    );
   } catch (error) {
     console.error('Error setting side panel behavior:', error);
   }
@@ -1834,7 +1846,8 @@ const setupPreferenceListener = async () => {
       'PreferencesController:stateChange',
       (state) => {
         const useSidePanelAsDefault =
-          state?.preferences?.useSidePanelAsDefault ?? true;
+          state?.preferences?.useSidePanelAsDefault ?? false;
+
         if (browser?.sidePanel?.setPanelBehavior) {
           browser.sidePanel
             .setPanelBehavior({

app/scripts/controllers/preferences-controller.test.ts

@@ -708,7 +708,7 @@ describe('preferences controller', () => {
         smartTransactionsMigrationApplied: false,
         smartTransactionsOptInStatus: true,
         useNativeCurrencyAsPrimaryCurrency: true,
-        useSidePanelAsDefault: true,
+        useSidePanelAsDefault: false,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
         skipDeepLinkInterstitial: false,
@@ -739,7 +739,7 @@ describe('preferences controller', () => {
         smartTransactionsMigrationApplied: false,
         smartTransactionsOptInStatus: true,
         useNativeCurrencyAsPrimaryCurrency: true,
-        useSidePanelAsDefault: true,
+        useSidePanelAsDefault: false,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
         skipDeepLinkInterstitial: false,
@@ -911,7 +911,7 @@ describe('preferences controller', () => {
               "sortCallback": "stringNumeric",
             },
             "useNativeCurrencyAsPrimaryCurrency": true,
-            "useSidePanelAsDefault": true,
+            "useSidePanelAsDefault": false,
           },
           "theme": "os",
           "use4ByteResolution": true,
@@ -983,7 +983,7 @@ describe('preferences controller', () => {
               "sortCallback": "stringNumeric",
             },
             "useNativeCurrencyAsPrimaryCurrency": true,
-            "useSidePanelAsDefault": true,
+            "useSidePanelAsDefault": false,
           },
           "referrals": {
             "hyperliquid": {},
@@ -1067,7 +1067,7 @@ describe('preferences controller', () => {
               "sortCallback": "stringNumeric",
             },
             "useNativeCurrencyAsPrimaryCurrency": true,
-            "useSidePanelAsDefault": true,
+            "useSidePanelAsDefault": false,
           },
           "referrals": {
             "hyperliquid": {},
@@ -1151,7 +1151,7 @@ describe('preferences controller', () => {
               "sortCallback": "stringNumeric",
             },
             "useNativeCurrencyAsPrimaryCurrency": true,
-            "useSidePanelAsDefault": true,
+            "useSidePanelAsDefault": false,
           },
           "referrals": {
             "hyperliquid": {},

app/scripts/controllers/preferences-controller.ts

@@ -223,7 +223,7 @@ export const getDefaultPreferencesControllerState =
       },
       useNativeCurrencyAsPrimaryCurrency: true,
       ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
-      useSidePanelAsDefault: true,
+      useSidePanelAsDefault: false,
       ///: END:ONLY_INCLUDE_IF
     },
     securityAlertsEnabled: true,
@@ -1016,6 +1016,12 @@ export class PreferencesController extends BaseController<
     });
   }
 
+  setUseSidePanelAsDefault(value: boolean): void {
+    this.update((state) => {
+      state.preferences.useSidePanelAsDefault = value;
+    });
+  }
+
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   setSnapsAddSnapAccountModalDismissed(value: boolean): void {
     this.update((state) => {

app/scripts/metamask-controller.js

@@ -4605,8 +4605,9 @@ export default class MetamaskController extends EventEmitter {
         const newHdEntropyIndex = this.getHDEntropyIndex();
 
         this.metaMetricsController.trackEvent({
-          event: MetaMetricsEventName.ImportSecretRecoveryPhraseCompleted,
+          event: MetaMetricsEventName.ImportSecretRecoveryPhrase,
           properties: {
+            status: 'completed',
             // eslint-disable-next-line @typescript-eslint/naming-convention
             hd_entropy_index: newHdEntropyIndex,
             // eslint-disable-next-line @typescript-eslint/naming-convention

shared/constants/metametrics.ts

@@ -719,8 +719,7 @@ export enum MetaMetricsEventName {
   EncryptionPublicKeyRequested = 'Encryption Requested',
   ErrorOccured = 'Error occured',
   ExternalLinkClicked = 'External Link Clicked',
-  ImportSecretRecoveryPhraseClicked = 'Import Secret Recovery Phrase Clicked',
-  ImportSecretRecoveryPhraseCompleted = 'Import Secret Recovery Phrase Completed',
+  ImportSecretRecoveryPhrase = 'Import Secret Recovery Phrase',
   KeyExportSelected = 'Key Export Selected',
   KeyExportRequested = 'Key Export Requested',
   KeyExportFailed = 'Key Export Failed',

test/e2e/tests/identity/account-syncing/helpers.ts

@@ -46,7 +46,14 @@ export const arrangeTestUtils = (
         const accounts = userStorageMockttpController.paths.get(
           USER_STORAGE_GROUPS_FEATURE_KEY,
         )?.response;
-        return accounts?.length === expectedNumber;
+        const currentCount = accounts?.length ?? 0;
+        if (currentCount !== expectedNumber) {
+          console.log(
+            `Current synced accounts: ${currentCount}, expected: ${expectedNumber}. Accounts:`,
+            JSON.stringify(accounts),
+          );
+        }
+        return currentCount === expectedNumber;
       },
       {
         timeout: BASE_TIMEOUT,

test/e2e/tests/identity/account-syncing/imported-accounts.spec.ts

@@ -81,6 +81,10 @@ describe('Account syncing - Unsupported Account types', function () {
           prepareEventsEmittedCounter,
           waitUntilSyncedAccountsNumberEquals,
         } = arrangeTestUtils(driver, userStorageMockttpController);
+
+        // Wait for initial account sync to complete before adding a new account
+        await waitUntilSyncedAccountsNumberEquals(1);
+
         const { waitUntilEventsEmittedNumberEquals } =
           prepareEventsEmittedCounter(
             UserStorageMockttpControllerEvents.PUT_SINGLE,
@@ -90,8 +94,9 @@ describe('Account syncing - Unsupported Account types', function () {
         await accountListPage.addMultichainAccount();
 
         // Wait for sync operation to complete
-        await waitUntilSyncedAccountsNumberEquals(2);
+        // Check event first to ensure sync was attempted, then verify state
         await waitUntilEventsEmittedNumberEquals(1);
+        await waitUntilSyncedAccountsNumberEquals(2);
 
         // Verify both regular accounts are visible
         await accountListPage.checkAccountDisplayedInAccountList(

test/e2e/tests/identity/account-syncing/multi-srp.spec.ts

@@ -79,6 +79,10 @@ describe('Account syncing - Multiple SRPs', function () {
           prepareEventsEmittedCounter,
           waitUntilSyncedAccountsNumberEquals,
         } = arrangeTestUtils(driver, userStorageMockttpController);
+
+        // Wait for initial account sync to complete before adding a new account
+        await waitUntilSyncedAccountsNumberEquals(1);
+
         const { waitUntilEventsEmittedNumberEquals } =
           prepareEventsEmittedCounter(
             UserStorageMockttpControllerEvents.PUT_SINGLE,
@@ -88,8 +92,9 @@ describe('Account syncing - Multiple SRPs', function () {
         await accountListPage.addMultichainAccount();
 
         // Wait for sync operation to complete
-        await waitUntilSyncedAccountsNumberEquals(2);
+        // Check event first to ensure sync was attempted, then verify state
         await waitUntilEventsEmittedNumberEquals(1);
+        await waitUntilSyncedAccountsNumberEquals(2);
 
         // Verify both accounts are visible
         await accountListPage.checkAccountDisplayedInAccountList(

ui/components/app/confirm/info/row/address.tsx

@@ -18,10 +18,16 @@ export type ConfirmInfoRowAddressProps = {
   address: string;
   chainId: string;
   isSnapUsingThis?: boolean;
+  showFullName?: boolean;
 };
 
 export const ConfirmInfoRowAddress = memo(
-  ({ address, chainId, isSnapUsingThis }: ConfirmInfoRowAddressProps) => {
+  ({
+    address,
+    chainId,
+    isSnapUsingThis,
+    showFullName = false,
+  }: ConfirmInfoRowAddressProps) => {
     const { displayName, hexAddress } = useFallbackDisplayName(address);
     const [isNicknamePopoverShown, setIsNicknamePopoverShown] = useState(false);
     const handleDisplayNameClick = () => setIsNicknamePopoverShown(true);
@@ -70,6 +76,7 @@ export const ConfirmInfoRowAddress = memo(
               type={NameType.ETHEREUM_ADDRESS}
               preferContractSymbol
               variation={chainId}
+              showFullName={showFullName}
             />
           )
         }

ui/components/app/name/name.tsx

@@ -45,6 +45,11 @@ export type NameProps = {
    * The fallback value to display if the name is not found or cannot be resolved.
    */
   fallbackName?: string;
+
+  /**
+   * Whether to show the full name.
+   */
+  showFullName?: boolean;
 };
 
 const Name = memo(