From 44766f05a7c6211f962082959bc915aa22d90f38 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Mon, 23 Mar 2020 16:45:59 -0700 Subject: [PATCH] Merge pull request #5018 from brave/fix_import_crash_from_welcome_ui Fixed crash while importing from welcome ui --- .../brave_welcome_ui/reducers/welcome_reducer.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/components/brave_welcome_ui/reducers/welcome_reducer.ts b/components/brave_welcome_ui/reducers/welcome_reducer.ts index 644c2fff31d5..9b35db78a1f2 100644 --- a/components/brave_welcome_ui/reducers/welcome_reducer.ts +++ b/components/brave_welcome_ui/reducers/welcome_reducer.ts @@ -20,7 +20,20 @@ const welcomeReducer: Reducer = (state: Welcome.State const startingState = state switch (action.type) { case types.IMPORT_BROWSER_DATA_REQUESTED: - chrome.send('importData', [payload]) + const importTypes = { + import_dialog_autofill_form_data: true, + import_dialog_bookmarks: true, + import_dialog_history: true, + import_dialog_saved_passwords: true, + import_dialog_search_engine: true, + // TODO(simonhong): Remove below import types when we stop supporting + // import from muon. + import_dialog_cookies: false, + import_dialog_stats: false, + import_dialog_ledger: false, + import_dialog_windows: false + } + chrome.send('importData', [payload, importTypes]) break case types.GO_TO_TAB_REQUESTED: window.open(payload.url, payload.target)