diff --git a/components/brave_new_tab_ui/components/newTab/index.tsx b/components/brave_new_tab_ui/components/newTab/index.tsx index b58e66b8a91e..245d583470dd 100644 --- a/components/brave_new_tab_ui/components/newTab/index.tsx +++ b/components/brave_new_tab_ui/components/newTab/index.tsx @@ -82,8 +82,8 @@ class NewTabPage extends React.Component { } return ( - - + + {newTabData.showBackgroundImage && }
@@ -118,7 +118,7 @@ class NewTabPage extends React.Component {
{ - newTabData.showSettingsMenu && + newTabData.showSettings && { diff --git a/components/brave_new_tab_ui/reducers/new_tab_reducer.tsx b/components/brave_new_tab_ui/reducers/new_tab_reducer.tsx index e271d7ac0f90..1e2ebd015479 100644 --- a/components/brave_new_tab_ui/reducers/new_tab_reducer.tsx +++ b/components/brave_new_tab_ui/reducers/new_tab_reducer.tsx @@ -26,6 +26,18 @@ export const newTabReducer: Reducer = (state: NewTab.S const startingState = state const payload = action.payload switch (action.type) { + case types.NEW_TAB_SHOW_SETTINGS_MENU: + state = { ...state, showSettings: true } + break + + case types.NEW_TAB_CLOSE_SETTINGS_MENU: + state = { ...state, showSettings: false } + break + + case types.NEW_TAB_TOGGLE_SHOW_BACKGROUND_IMAGE: + state = { ...state, showBackgroundImage: !state.showBackgroundImage } + break + case types.BOOKMARK_ADDED: const topSite: NewTab.Site | undefined = state.topSites.find((site) => site.url === payload.url) if (topSite) { @@ -145,18 +157,6 @@ export const newTabReducer: Reducer = (state: NewTab.S state = { ...state, useAlternativePrivateSearchEngine: payload.shouldUse } break - case types.NEW_TAB_SHOW_SETTINGS_MENU: - state = { ...state, showSettings: true } - break - - case types.NEW_TAB_CLOSE_SETTINGS_MENU: - state = { ...state, showSettings: false } - break - - case types.NEW_TAB_TOGGLE_SHOW_BACKGROUND_IMAGE: - state = { ...state, showBackgroundImage: !state.showBackgroundImage } - break - default: break } diff --git a/package-lock.json b/package-lock.json index 8d5ec0899aca..a9822a777367 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1597,8 +1597,8 @@ } }, "brave-ui": { - "version": "github:brave/brave-ui#624be474ee7d3e4dc3409712ac9ec56e33ef9b04", - "from": "github:brave/brave-ui#624be474ee7d3e4dc3409712ac9ec56e33ef9b04", + "version": "github:brave/brave-ui#584973511366801f9099d28a6d35604214afa146", + "from": "github:brave/brave-ui#584973511366801f9099d28a6d35604214afa146", "dev": true, "requires": { "@ctrl/tinycolor": "^2.2.1", diff --git a/package.json b/package.json index 56c85f16c984..4eebbc0c5d35 100644 --- a/package.json +++ b/package.json @@ -277,7 +277,7 @@ "@types/react-redux": "6.0.4", "@types/redux-logger": "^3.0.7", "awesome-typescript-loader": "^5.2.1", - "brave-ui": "github:brave/brave-ui#624be474ee7d3e4dc3409712ac9ec56e33ef9b04", + "brave-ui": "github:brave/brave-ui#584973511366801f9099d28a6d35604214afa146", "css-loader": "^2.1.1", "csstype": "^2.5.5", "deep-freeze-node": "^1.1.3",