Merge pull request #4266 from brave/bsc-remove-welcome-theme

Remove left-over "Theme" content from welcome screen

browser/ui/webui/brave_webui_source.cc

@@ -238,13 +238,6 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "chooseSearchEngine", IDS_BRAVE_WELCOME_PAGE_SEARCH_DESC },
         { "selectSearchEngine", IDS_BRAVE_WELCOME_PAGE_SEARCH_SELECT },
         { "privateExperience", IDS_BRAVE_WELCOME_PAGE_PRIVATE_EXPERIENCE_DESC },
-        { "findToolbarTheme", IDS_BRAVE_WELCOME_PAGE_THEME_TITLE },
-        { "chooseTheme", IDS_BRAVE_WELCOME_PAGE_THEME_DESC },
-        { "selectTheme", IDS_BRAVE_WELCOME_PAGE_SELECT_THEME_DESC },
-        { "confirmTheme", IDS_BRAVE_WELCOME_PAGE_CONFIRM_THEME_BUTTON },
-        { "light", IDS_BRAVE_WELCOME_PAGE_LIGHT_THEME_DESC },
-        { "dark", IDS_BRAVE_WELCOME_PAGE_DARK_THEME_DESC },
-        { "systemTheme", IDS_BRAVE_WELCOME_PAGE_SYSTEM_THEME_DESC },
         { "skipWelcomeTour", IDS_BRAVE_WELCOME_PAGE_SKIP_BUTTON },
         { "next", IDS_BRAVE_WELCOME_PAGE_NEXT_BUTTON },
         { "done", IDS_BRAVE_WELCOME_PAGE_DONE_BUTTON },

components/brave_welcome_ui/actions/welcome_actions.ts

@@ -25,16 +25,10 @@ export const getSearchEngineProvidersSuccess = (searchProviders: Array<Welcome.S
 
 export const getBrowserProfilesSuccess = (browserProfiles: Array<Welcome.BrowserProfile>) => action(types.IMPORT_BROWSER_PROFILES_SUCCESS, browserProfiles)
 
-export const getBrowserThemesSuccess = (browserThemes: Array<Welcome.BrowserTheme>) => action(types.IMPORT_BROWSER_THEMES_SUCCESS, browserThemes)
-
 export const getSearchEngineProviders = () => welcomeUtils.getSearchEngineProviders()
 
 export const getBrowserProfiles = () => welcomeUtils.getBrowserProfiles()
 
-export const getBrowserThemes = () => welcomeUtils.getBrowserThemes()
-
-export const setTheme = (browserTheme: Welcome.BrowserTheme) => action(types.SET_BROWSER_THEME, browserTheme)
-
 export const recordP3A = (details: any) => action(types.RECORD_P3A, {
   details
 })

components/brave_welcome_ui/brave_welcome.tsx

@@ -25,7 +25,6 @@ window.cr.define('brave_welcome', function () {
     const actions = bindActionCreators(welcomeActions, store.dispatch.bind(store))
     actions.getSearchEngineProviders()
     actions.getBrowserProfiles()
-    actions.getBrowserThemes()
   }
 
   function initialize () {

components/brave_welcome_ui/constants/welcome_types.ts

@@ -9,7 +9,5 @@ export const enum types {
   CHANGE_DEFAULT_SEARCH_PROVIDER = '@@welcome/CHANGE_DEFAULT_SEARCH',
   IMPORT_DEFAULT_SEARCH_PROVIDERS_SUCCESS = '@@welcome/IMPORT_DEFAULT_SEARCH_PROVIDERS_SUCCESS',
   IMPORT_BROWSER_PROFILES_SUCCESS = '@@welcome/IMPORT_BROWSER_PROFILES_SUCCESS',
-  IMPORT_BROWSER_THEMES_SUCCESS = '@@welcome/IMPORT_BROWSER_THEMES_SUCCESS',
-  SET_BROWSER_THEME = '@@welcome/SET_BROWSER_THEME',
   RECORD_P3A = '@welcome/RECORD_P3A'
 }

components/brave_welcome_ui/reducers/welcome_reducer.ts

@@ -19,12 +19,6 @@ const welcomeReducer: Reducer<Welcome.State | undefined> = (state: Welcome.State
   const payload = action.payload
   const startingState = state
   switch (action.type) {
-    case types.IMPORT_BROWSER_THEMES_SUCCESS:
-      state = { ...state, browserThemes: payload }
-      break
-    case types.SET_BROWSER_THEME:
-      chrome.braveTheme.setBraveThemeType(payload)
-      break
     case types.IMPORT_BROWSER_DATA_REQUESTED:
       chrome.send('importData', [payload])
       break

components/brave_welcome_ui/storage.ts

@@ -9,8 +9,7 @@ const keyName = 'welcome-data'
 
 export const defaultState = {
   searchProviders: [],
-  browserProfiles: [],
-  browserThemes: []
+  browserProfiles: []
 }
 
 const cleanData = (state: Welcome.State) => {

components/brave_welcome_ui/stories/page/fakeLocale.ts

@@ -24,13 +24,6 @@ const locale = {
   fakeSearchProvider1: 'DuckDuckGo',
   fakeSearchProvider2: 'Google (default)',
   // fourth screen
-  chooseYourTheme: 'Choose your color theme',
-  selectTheme: 'Select a theme',
-  findToolbarTheme: 'Set the color of your toolbar by selecting the light or dark option from the settings panel.',
-  themeOption1: 'Light',
-  themeOption2: 'Dark',
-  themeOption3: 'System theme (default)',
-  // fifth screen
   // protectYourPrivacy: 'Manage your shields',
   // adjustProtectionLevel: 'Protect against privacy-invading ads and trackers while browsing with Brave Shields. Set Shields to "down" if a site doesn’t seem to be working properly.',
   // showMeWhere: 'Show Shields',
@@ -39,7 +32,7 @@ const locale = {
   p3aSettings: 'Settings',
   p3aLink1: '#',
   p3aLink2: '#',
-  // sixth screen
+  // fifth screen
   enableBraveRewards: 'Enable Brave Rewards',
   setupBraveRewards: 'Your attention is valuable. Earn by viewing privacy-respecting ads while you browse, and pay it forward to support content creators you love.',
   getStarted: 'Enable Rewards',

components/brave_welcome_ui/welcomeUtils.ts

@@ -5,8 +5,7 @@
 import { Dispatch } from 'redux'
 import {
   getSearchEngineProvidersSuccess,
-  getBrowserProfilesSuccess,
-  getBrowserThemesSuccess
+  getBrowserProfilesSuccess
 } from './actions/welcome_actions'
 import { State as ImportBoxState } from './containers/screens/importBox'
 
@@ -54,17 +53,3 @@ export const getSourceBrowserProfileIndex = (state: ImportBoxState): number => {
 
 export const isValidBrowserProfiles = (browserProfiles: Array<Welcome.BrowserProfile>) =>
   browserProfiles && Array.isArray(browserProfiles) && browserProfiles.length > 0
-
-// Theme box
-
-export const getBrowserThemes = () => {
-  return (dispatch: Dispatch) => {
-    new Promise(resolve => chrome.braveTheme.getBraveThemeList(resolve))
-      .then((response: string) => {
-        dispatch(getBrowserThemesSuccess(JSON.parse(response)))
-      })
-      .catch((error: any) => {
-        console.error('Could not load browser themes', error)
-      })
-  }
-}

components/definitions/welcome.d.ts

@@ -3,11 +3,6 @@ declare namespace Welcome {
     welcomeData: State | undefined
   }
 
-  export interface BrowserTheme {
-    name: string
-    index: string
-  }
-
   export interface BrowserProfile {
     autofillFormData: boolean,
     cookies: boolean,
@@ -47,6 +42,5 @@ declare namespace Welcome {
   export interface State {
     searchProviders: Array<SearchEngineEntry>
     browserProfiles: Array<BrowserProfile>
-    browserThemes: Array<BrowserTheme>
   }
 }

components/resources/brave_components_strings.grd

@@ -203,13 +203,6 @@
       <message name="IDS_BRAVE_WELCOME_PAGE_SEARCH_DESC" desc="Explainer text about search engines in Brave">Choose the search engine you would like to use by default when searching the web from the address bar.</message>
       <message name="IDS_BRAVE_WELCOME_PAGE_SEARCH_TITLE" desc="Welcome message title for search engines">Set default search engine</message>
       <message name="IDS_BRAVE_WELCOME_PAGE_PRIVATE_EXPERIENCE_DESC" desc="Explainer text about a more private search option">For a more private search experience, try DuckDuckGo.</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_THEME_TITLE" desc="Welcome message title for theming">Choose your color theme</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_THEME_DESC" desc="Explainer text about theming in Brave">Set the color of your toolbar by selecting the light or dark option from the settings panel.</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_SELECT_THEME_DESC" desc="Dropdown option text prompting user to select a theme">Select a theme</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_CONFIRM_THEME_BUTTON" desc="Button to confirm the theme">Confirm</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_SYSTEM_THEME_DESC" desc="Dropdown option text for default system theme ">System theme (default)</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_LIGHT_THEME_DESC" desc="Dropdown option text for light theme ">Light</message>
-      <message name="IDS_BRAVE_WELCOME_PAGE_DARK_THEME_DESC" desc="Dropdown option text for dark theme ">Dark</message>
       <message name="IDS_BRAVE_WELCOME_PAGE_SKIP_BUTTON" desc="Button to skip the welcome tour and go to the new tab page">Skip welcome tour</message>
       <message name="IDS_BRAVE_WELCOME_PAGE_NEXT_BUTTON" desc="Button to move to the next slide of the welcome tour">Next</message>
       <message name="IDS_BRAVE_WELCOME_PAGE_DONE_BUTTON" desc="Button that ends the welcome tour and moves the user to the new tab page">Done</message>

components/test/brave_welcome_ui/actions/welcome_actions_test.ts

@@ -53,19 +53,4 @@ describe('welcome_actions', () => {
       payload: mockPayload
     })
   })
-
-  it('getBrowserThemesSuccess', () => {
-    const mockPayload = []
-    expect(actions.getBrowserThemesSuccess(mockPayload)).toEqual({
-      type: types.IMPORT_BROWSER_THEMES_SUCCESS,
-      payload: mockPayload
-    })
-  })
-
-  it('setTheme', () => {
-    expect(actions.setTheme('Dark')).toEqual({
-      type: types.SET_BROWSER_THEME,
-      payload: 'Dark'
-    })
-  })
 })

components/test/brave_welcome_ui/components/app_test.tsx

@@ -12,8 +12,7 @@ describe('welcomePage component', () => {
       expect(mapStateToProps(welcomeInitialState)).toEqual({
         welcomeData: {
           searchProviders: [],
-          browserProfiles: [],
-          browserThemes: []
+          browserProfiles: []
         }
       })
     })

components/test/brave_welcome_ui/reducers/welcome_reducer_test.ts

@@ -12,7 +12,7 @@ window.open = jest.fn()
 window.close = jest.fn()
 
 describe('welcomeReducer', () => {
-  describe('Handlle initial state', () => {
+  describe('Handle initial state', () => {
     let spy: jest.SpyInstance
     beforeEach(() => {
       spy = jest.spyOn(storage, 'load')
@@ -24,8 +24,7 @@ describe('welcomeReducer', () => {
       const assertion = welcomeReducer(undefined, actions.closeTabRequested())
       expect(assertion).toEqual({
         searchProviders: [],
-        browserProfiles: [],
-        browserThemes: []
+        browserProfiles: []
       })
       expect(spy).toBeCalled()
       expect(spy.mock.calls[0][1]).toBe(undefined)
@@ -105,33 +104,11 @@ describe('welcomeReducer', () => {
     })
   })
 
-  describe('SET_BROWSER_THEME', () => {
-    let changeThemeStub: jest.SpyInstance
-
-    beforeEach(() => {
-      changeThemeStub = jest.spyOn(chrome.braveTheme, 'setBraveThemeType')
-    })
-
-    afterEach(() => {
-      changeThemeStub.mockRestore()
-    })
-
-    it('should call setBraveThemeType with the correct argument', () => {
-      welcomeReducer(undefined, {
-        type: types.SET_BROWSER_THEME,
-        payload: 'Dark'
-      })
-      expect(changeThemeStub).toBeCalledTimes(1)
-      expect(changeThemeStub).toBeCalledWith('Dark')
-    })
-  })
-
   describe('IMPORT_DEFAULT_SEARCH_PROVIDERS_SUCCESS', () => {
     it('should set default search provider data', () => {
       const mockState = {
         searchProviders: [],
-        browserProfiles: [],
-        browserThemes: []
+        browserProfiles: []
       }
       const result = welcomeReducer(mockState, {
         type: types.IMPORT_DEFAULT_SEARCH_PROVIDERS_SUCCESS,
@@ -149,8 +126,7 @@ describe('welcomeReducer', () => {
     it('should set import browser profile data', () => {
       const mockState = {
         searchProviders: [],
-        browserProfiles: [],
-        browserThemes: []
+        browserProfiles: []
       }
       const result = welcomeReducer(mockState, {
         type: types.IMPORT_BROWSER_PROFILES_SUCCESS,