Skip to content

chore: move backup and sync and experimental tabs from legacy settings #41966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ameliejyc merged 3 commits into from
Apr 21, 2026
Merged

chore: move backup and sync and experimental tabs from legacy settings #41966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
306ae9d
chore: move backup and sync tab
ameliejyc Apr 20, 2026
4fe307f
chore: move experimental tab
ameliejyc Apr 20, 2026
00ad86e
Merge branch 'main' into CEUX-996-clean-up-settings-v-1-files-4
ameliejyc Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test/jest/console-baseline-unit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -1573,21 +1581,13 @@
"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
},
"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
},
Expand Down
0 ...and-sync-tab/backup-and-sync-tab.test.tsx → ...and-sync-tab/backup-and-sync-tab.test.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ckup-and-sync-tab/backup-and-sync-tab.tsx → ...ckup-and-sync-tab/backup-and-sync-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
0 ...ges/settings/backup-and-sync-tab/index.ts → .../settings-v2/backup-and-sync-tab/index.ts
View file
Open in desktop
File renamed without changes.
0 ...xperimental-tab/experimental-tab.test.tsx → ...xperimental-tab/experimental-tab.test.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ngs/experimental-tab/experimental-tab.tsx → ...-v2/experimental-tab/experimental-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
0 ui/pages/settings/experimental-tab/index.ts → ...ges/settings-v2/experimental-tab/index.ts
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions ui/pages/settings-v2/settings-registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
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,
Expand Down Expand Up @@ -274,9 +274,7 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
[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,
},
Expand Down
Loading