diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc index 4c5442654e09..4fb066f2def6 100644 --- a/browser/ui/webui/brave_webui_source.cc +++ b/browser/ui/webui/brave_webui_source.cc @@ -454,7 +454,9 @@ void CustomizeWebUIHTMLSource(const std::string &name, content::WebUIDataSource* { "addedOn", IDS_BRAVE_SYNC_ENABLED_TABLE_ADDED_ON_TITLE }, { "addDevice", IDS_BRAVE_SYNC_ENABLED_ADD_DEVICE_BUTTON }, { "viewSyncCode", IDS_BRAVE_SYNC_ENABLED_VIEW_CODE_BUTTON }, - { "dataToSync", IDS_BRAVE_SYNC_ENABLED_DATA_TITLE }, + { "settingsTitle", IDS_BRAVE_SYNC_ENABLED_SETTINGS_TITLE }, + { "settingsDescription", IDS_BRAVE_SYNC_ENABLED_SETTINGS_DESCRIPTION }, + { "settings", IDS_BRAVE_SYNC_ENABLED_TABLE_SETTINGS }, { "bookmarks", IDS_BRAVE_SYNC_ENABLED_BOOKMARKS_LABEL }, { "savedSiteSettings", IDS_BRAVE_SYNC_ENABLED_SITE_SETTINGS_LABEL }, { "browsingHistory", IDS_BRAVE_SYNC_ENABLED_HISTORY_LABEL }, diff --git a/components/brave_sync/ui/components/enabledContent.tsx b/components/brave_sync/ui/components/enabledContent.tsx index 18ff3f871ce0..070ec5ddb3c4 100644 --- a/components/brave_sync/ui/components/enabledContent.tsx +++ b/components/brave_sync/ui/components/enabledContent.tsx @@ -6,6 +6,7 @@ import * as React from 'react' // Components import { Button, AlertBox } from 'brave-ui' +import { CloseCircleIcon } from 'brave-ui/components/icons' import Table, { Cell, Row } from 'brave-ui/components/dataTables/table' import { Toggle } from 'brave-ui/features/shields' @@ -13,15 +14,17 @@ import { Toggle } from 'brave-ui/features/shields' import { Main, Title, - SettingsToggleGrid, - SwitchLabel, + Paragraph, SectionBlock, SubTitle, TableRowDevice, TableRowRemove, TableRowRemoveButton, + TableRowToggleButton, TableGrid, - TableButtonGrid + TableButtonGrid, + EnabledContent, + SyncCard } from 'brave-ui/features/sync' // Modals @@ -60,7 +63,7 @@ export default class SyncEnabledContent extends React.PureComponent { + getDevicesRows = (devices?: any): Row[] | undefined => { if (!devices) { return } @@ -81,7 +84,7 @@ export default class SyncEnabledContent extends React.PureComponent - × + ) } @@ -91,7 +94,7 @@ export default class SyncEnabledContent extends React.PureComponent{getLocale('deviceName')} }, { content: getLocale('addedOn') }, @@ -99,6 +102,33 @@ export default class SyncEnabledContent extends React.PureComponent{getLocale('settings')} }, + { content: '' } + ] + } + + get settingsRows (): Row[] { + return [ + { + content: [ + { content: getLocale('bookmarks') }, + { content: ( + + + + ) } + ] + } + ] + } + onClickRemoveDeviceButton = (event: React.MouseEvent) => { if (!event || !event.currentTarget || !event.currentTarget.dataset) { return @@ -147,98 +177,95 @@ export default class SyncEnabledContent extends React.PureComponent - { - syncData.error === 'ERR_SYNC_NO_INTERNET' - ? - {getLocale('errorNoInternetTitle')} - {getLocale('errorNoInternetDescription')} - - : null - } - { - syncData.error === 'ERR_SYNC_INIT_FAILED' - ? - {getLocale('errorSyncInitFailedTitle')} - {getLocale('errorSyncInitFailedDescription')} - - : null - } - { - removeDevice - ? ( - - ) - : null - } - { - viewSyncCode - ? - : null - } - { - addDevice - ? + +
+ { + syncData.error === 'ERR_SYNC_NO_INTERNET' + ? + {getLocale('errorNoInternetTitle')} + {getLocale('errorNoInternetDescription')} + : null - } - { - resetSync - ? + } + { + syncData.error === 'ERR_SYNC_INIT_FAILED' + ? + {getLocale('errorSyncInitFailedTitle')} + {getLocale('errorSyncInitFailedDescription')} + : null - } - {getLocale('braveSync')} - - {getLocale('syncChainDevices')} - - - Device list is empty -
- -