feat(account-tree-controller): resolve group names conflicts in b&s operations

Author: mathieuartu

packages/account-tree-controller/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Set the `setAccountGroupName`'s option `autoHandleConflict` to `true` for all backup & sync operations ([#]())
 - Add new group naming for non-HD keyring accounts ([#6679](https://github.com/MetaMask/core/pull/6679))
   - Hardware-wallet account groups are now named: "Ledger|Trezor|QR|Lattice|OneKey Account N".
   - Private key account groups are now named: "Imported Account N".

packages/account-tree-controller/src/backup-and-sync/syncing/group.test.ts

@@ -278,6 +278,7 @@ describe('BackupAndSync - Syncing - Group', () => {
         expect(mockContext.controller.setAccountGroupName).toHaveBeenCalledWith(
           mockLocalGroup.id,
           'New Name',
+          true,
         );
       }
       /* eslint-enable jest/no-conditional-in-test */
@@ -600,6 +601,7 @@ describe('BackupAndSync - Syncing - Group', () => {
       expect(testContext.controller.setAccountGroupName).toHaveBeenCalledWith(
         mockLocalGroup.id,
         testGroupName,
+        true,
       );
     });
   });

packages/account-tree-controller/src/backup-and-sync/syncing/group.ts

@@ -145,7 +145,7 @@ async function syncGroupMetadataAndCheckIfPushNeeded(
     validateUserStorageValue: (value) =>
       UserStorageSyncedWalletGroupSchema.schema.name.schema.value.is(value),
     applyLocalUpdate: (name: string) => {
-      context.controller.setAccountGroupName(localGroup.id, name);
+      context.controller.setAccountGroupName(localGroup.id, name, true);
     },
     analytics: {
       action: BackupAndSyncAnalyticsEvent.GroupRenamed,

packages/account-tree-controller/src/backup-and-sync/syncing/legacy.test.ts

@@ -174,10 +174,12 @@ describe('BackupAndSync - Syncing - Legacy', () => {
       expect(mockContext.controller.setAccountGroupName).toHaveBeenCalledWith(
         'entropy:test-entropy/0',
         'Legacy Account 1',
+        true,
       );
       expect(mockContext.controller.setAccountGroupName).toHaveBeenCalledWith(
         'entropy:test-entropy/1',
         'Legacy Account 2',
+        true,
       );
     });
 
@@ -302,14 +304,17 @@ describe('BackupAndSync - Syncing - Legacy', () => {
       expect(mockContext.controller.setAccountGroupName).toHaveBeenCalledWith(
         'entropy:test-entropy/0',
         'Main Account',
+        true,
       );
       expect(mockContext.controller.setAccountGroupName).toHaveBeenCalledWith(
         'entropy:test-entropy/1',
         'Trading Account',
+        true,
       );
       expect(mockContext.controller.setAccountGroupName).toHaveBeenCalledWith(
         'entropy:test-entropy/2',
         'Savings Account',
+        true,
       );
 
       expect(mockContext.emitAnalyticsEventFn).toHaveBeenCalledWith({

packages/account-tree-controller/src/backup-and-sync/syncing/legacy.ts

@@ -88,7 +88,7 @@ export const performLegacyAccountSyncing = async (
         group.accounts.includes(localAccountId),
       );
       if (localGroup) {
-        context.controller.setAccountGroupName(localGroup.id, n);
+        context.controller.setAccountGroupName(localGroup.id, n, true);
 
         context.emitAnalyticsEventFn({
           action: BackupAndSyncAnalyticsEvent.LegacyGroupRenamed,