diff --git a/test/jest/console-baseline-unit.json b/test/jest/console-baseline-unit.json index 524aeb4234bf..016840545cab 100644 --- a/test/jest/console-baseline-unit.json +++ b/test/jest/console-baseline-unit.json @@ -1516,9 +1516,17 @@ "ui/pages/settings-v2/assets-tab/assets-tab.test.tsx": { "React: componentWill* lifecycle deprecations": 1 }, + "ui/pages/settings-v2/backup-and-sync-tab/backup-and-sync-tab.test.tsx": { + "MetaMask: Background connection not initialized": 1, + "React: componentWill* lifecycle deprecations": 1, + "Reselect: Input stability warnings": 1 + }, "ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.test.tsx": { "React: componentWill* lifecycle deprecations": 1 }, + "ui/pages/settings-v2/experimental-tab/experimental-tab.test.tsx": { + "React: componentWill* lifecycle deprecations": 1 + }, "ui/pages/settings-v2/preferences-and-display-tab/account-identicon-item.test.tsx": { "React: Act warnings (component updates not wrapped)": 4 }, @@ -1573,11 +1581,6 @@ "Reselect: Identity function warnings": 1, "error: Warning: Received `true` for a": 1 }, - "ui/pages/settings/backup-and-sync-tab/backup-and-sync-tab.test.tsx": { - "MetaMask: Background connection not initialized": 1, - "React: componentWill* lifecycle deprecations": 1, - "Reselect: Input stability warnings": 1 - }, "ui/pages/settings/developer-options-tab/developer-options-tab.test.tsx": { "React: Act warnings (component updates not wrapped)": 11, "React: componentWill* lifecycle deprecations": 1 @@ -1585,9 +1588,6 @@ "ui/pages/settings/developer-options-tab/developer-options-toggle-row-component.test.tsx": { "React: componentWill* lifecycle deprecations": 1 }, - "ui/pages/settings/experimental-tab/experimental-tab.test.tsx": { - "React: componentWill* lifecycle deprecations": 1 - }, "ui/pages/settings/info-tab/info-tab.test.tsx": { "React: Act warnings (component updates not wrapped)": 1 }, diff --git a/ui/pages/settings/backup-and-sync-tab/backup-and-sync-tab.test.tsx b/ui/pages/settings-v2/backup-and-sync-tab/backup-and-sync-tab.test.tsx similarity index 100% rename from ui/pages/settings/backup-and-sync-tab/backup-and-sync-tab.test.tsx rename to ui/pages/settings-v2/backup-and-sync-tab/backup-and-sync-tab.test.tsx diff --git a/ui/pages/settings/backup-and-sync-tab/backup-and-sync-tab.tsx b/ui/pages/settings-v2/backup-and-sync-tab/backup-and-sync-tab.tsx similarity index 90% rename from ui/pages/settings/backup-and-sync-tab/backup-and-sync-tab.tsx rename to ui/pages/settings-v2/backup-and-sync-tab/backup-and-sync-tab.tsx index 3ff7bd5c574b..c72f552cca4d 100644 --- a/ui/pages/settings/backup-and-sync-tab/backup-and-sync-tab.tsx +++ b/ui/pages/settings-v2/backup-and-sync-tab/backup-and-sync-tab.tsx @@ -3,8 +3,8 @@ import { useSelector } from 'react-redux'; import { BackupAndSyncFeaturesToggles } from '../../../components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles'; import { BackupAndSyncToggle } from '../../../components/app/identity/backup-and-sync-toggle/backup-and-sync-toggle'; import { selectIsBackupAndSyncEnabled } from '../../../selectors/identity/backup-and-sync'; -import { SettingItemConfig } from '../../settings-v2/types'; -import { SettingsTab } from '../../settings-v2/shared'; +import { SettingItemConfig } from '../types'; +import { SettingsTab } from '../shared'; const BackupAndSyncTab = () => { const isBackupAndSyncEnabled = useSelector(selectIsBackupAndSyncEnabled); diff --git a/ui/pages/settings/backup-and-sync-tab/index.ts b/ui/pages/settings-v2/backup-and-sync-tab/index.ts similarity index 100% rename from ui/pages/settings/backup-and-sync-tab/index.ts rename to ui/pages/settings-v2/backup-and-sync-tab/index.ts diff --git a/ui/pages/settings/experimental-tab/experimental-tab.test.tsx b/ui/pages/settings-v2/experimental-tab/experimental-tab.test.tsx similarity index 100% rename from ui/pages/settings/experimental-tab/experimental-tab.test.tsx rename to ui/pages/settings-v2/experimental-tab/experimental-tab.test.tsx diff --git a/ui/pages/settings/experimental-tab/experimental-tab.tsx b/ui/pages/settings-v2/experimental-tab/experimental-tab.tsx similarity index 92% rename from ui/pages/settings/experimental-tab/experimental-tab.tsx rename to ui/pages/settings-v2/experimental-tab/experimental-tab.tsx index 46d788484148..74df2b48a324 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.tsx +++ b/ui/pages/settings-v2/experimental-tab/experimental-tab.tsx @@ -11,9 +11,9 @@ import { setFeatureNotificationsEnabled, setWatchEthereumAccountEnabled, } from '../../../store/actions'; -import { SettingItemConfig } from '../../settings-v2/types'; -import { SettingsTab, createToggleItem } from '../../settings-v2/shared'; -import { EXPERIMENTAL_ITEMS } from '../../settings-v2/search-config'; +import { SettingItemConfig } from '../types'; +import { SettingsTab, createToggleItem } from '../shared'; +import { EXPERIMENTAL_ITEMS } from '../search-config'; const NotificationsItem = createToggleItem({ name: 'NotificationsItem', diff --git a/ui/pages/settings/experimental-tab/index.ts b/ui/pages/settings-v2/experimental-tab/index.ts similarity index 100% rename from ui/pages/settings/experimental-tab/index.ts rename to ui/pages/settings-v2/experimental-tab/index.ts diff --git a/ui/pages/settings-v2/settings-registry.ts b/ui/pages/settings-v2/settings-registry.ts index 82fb08d3ee6b..798871378224 100644 --- a/ui/pages/settings-v2/settings-registry.ts +++ b/ui/pages/settings-v2/settings-registry.ts @@ -189,7 +189,7 @@ export const SETTINGS_V2_ROUTES: Record = { labelKey: 'backupAndSync', parentPath: SETTINGS_V2_ROUTE, component: mmLazy( - () => import('../settings/backup-and-sync-tab/backup-and-sync-tab.tsx'), + () => import('./backup-and-sync-tab/backup-and-sync-tab.tsx'), ), isTab: true, iconName: IconName.SecurityTime, @@ -274,9 +274,7 @@ export const SETTINGS_V2_ROUTES: Record = { [EXPERIMENTAL_ROUTE]: { labelKey: 'experimental', parentPath: SETTINGS_V2_ROUTE, - component: mmLazy( - () => import('../settings/experimental-tab/experimental-tab.tsx'), - ), + component: mmLazy(() => import('./experimental-tab/experimental-tab.tsx')), isTab: true, iconName: IconName.Flask, },